Skip to content

Commit 482ab87

Browse files
authored
Merge pull request #2300 from flatcar/ader1990/linux_kernel_6_10
Upgrade Linux kernel from 6.6 to 6.12
2 parents 8dc37f6 + 87e5a37 commit 482ab87

20 files changed

+142
-170
lines changed
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
- Linux [6.12.20](https://lwn.net/Articles/1015185/) (includes [6.12.19](https://lwn.net/Articles/1014045/), [6.12.18](https://lwn.net/Articles/1013397/), [6.12.17](https://lwn.net/Articles/1012191/), [6.12.16](https://lwn.net/Articles/1011265/), [6.12.15](https://lwn.net/Articles/1010623/), [6.12.14](https://lwn.net/Articles/1010356/), [6.12.13](https://lwn.net/Articles/1008643/), [6.12.12](https://lwn.net/Articles/1007440/), [6.12.11](https://lwn.net/Articles/1006009/), [6.12.10](https://lwn.net/Articles/1005382/), [6.12.9](https://lwn.net/Articles/1004549/), [6.12.8](https://lwn.net/Articles/1003985/), [6.12.7](https://lwn.net/Articles/1003608/), [6.12.6](https://lwn.net/Articles/1002918/), [6.12.5](https://lwn.net/Articles/1002176/), [6.12.4](https://lwn.net/Articles/1001437/), [6.12.3](https://lwn.net/Articles/1001203/), [6.12.2](https://lwn.net/Articles/1000872/), [6.12.1](https://lwn.net/Articles/999108/), [6.12](https://lwn.net/Articles/998490/))
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
[Unit]
2+
Description=Hyper-V FCOPY UIO daemon
3+
ConditionPathExists=/sys/bus/vmbus/devices/eb765408-105f-49b6-b4aa-c123b64d17d4/uio
4+
5+
[Service]
6+
ExecStart=/usr/bin/hv_fcopy_uio_daemon --no-daemon
7+
8+
[Install]
9+
WantedBy=multi-user.target

sdk_container/src/third_party/coreos-overlay/app-emulation/hv-daemons/hv-daemons-9999.ebuild

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,19 @@ if [[ "${PV}" == 9999 ]]; then
1313
fi
1414

1515
src_compile() {
16-
# Build hv_vss_daemon, hv_kvp_daemon, hv_fcopy_daemon
16+
# Build hv_vss_daemon, hv_kvp_daemon, hv_fcopy_daemon
1717
kmake tools/hv
1818
}
1919

2020
src_install() {
21-
dobin "${S}/build/tools/hv/hv_fcopy_daemon"
22-
dobin "${S}/build/tools/hv/hv_kvp_daemon"
23-
dobin "${S}/build/tools/hv/hv_vss_daemon"
24-
25-
systemd_dounit "${FILESDIR}/hv_fcopy_daemon.service"
26-
systemd_dounit "${FILESDIR}/hv_kvp_daemon.service"
27-
systemd_dounit "${FILESDIR}/hv_vss_daemon.service"
28-
29-
systemd_enable_service "multi-user.target" "hv_fcopy_daemon.service"
30-
systemd_enable_service "multi-user.target" "hv_kvp_daemon.service"
31-
systemd_enable_service "multi-user.target" "hv_vss_daemon.service"
21+
local -a HV_DAEMONS=(hv_vss_daemon hv_kvp_daemon hv_fcopy_daemon hv_fcopy_uio_daemon)
22+
local HV_DAEMON
23+
for HV_DAEMON in "$HV_DAEMONS[@]"
24+
do
25+
if [ -f "${S}/build/tools/hv/${HV_DAEMON}" ]; then
26+
dobin "${S}/build/tools/hv/${HV_DAEMON}"
27+
systemd_dounit "${FILESDIR}/${HV_DAEMON}.service"
28+
systemd_enable_service "multi-user.target" "${HV_DAEMON}.service"
29+
fi
30+
done
3231
}

sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/amd64_defconfig-6.6 renamed to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/amd64_defconfig-6.12

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ CONFIG_ACPI_IPMI=m
1212
CONFIG_ACPI_PCI_SLOT=y
1313
CONFIG_ACPI_PROCESSOR_AGGREGATOR=y
1414
CONFIG_AMD_IOMMU=y
15-
CONFIG_AMD_IOMMU_V2=m
1615
CONFIG_AQTION=m
1716
CONFIG_ARCH_MEMORY_PROBE=y
1817
CONFIG_AUTOFS_FS=y

sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-6.6 renamed to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-6.12

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ CONFIG_CRYPTO_SHA1_ARM64_CE=y
3232
CONFIG_CRYPTO_SHA2_ARM64_CE=y
3333
# CONFIG_DEBUG_PREEMPT is not set
3434
CONFIG_DM_DEBUG=y
35-
CONFIG_FB_ARMCLCD=y
3635
CONFIG_GPIO_PL061=y
3736
CONFIG_GPIO_XGENE=y
3837
CONFIG_GPIO_XGENE_SB=y

sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-6.6 renamed to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-6.12

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,7 @@ CONFIG_DNS_RESOLVER=y
171171
CONFIG_DRM=m
172172
CONFIG_DRM_VIRTIO_GPU=m
173173
CONFIG_DST_CACHE=y
174+
# CONFIG_DRM_FBDEV_EMULATION is not set
174175
CONFIG_DUMMY=m
175176
CONFIG_DYNAMIC_DEBUG=y
176177
CONFIG_E100=m
@@ -496,6 +497,7 @@ CONFIG_MMC_BLOCK_MINORS=16
496497
CONFIG_MMC_SDHCI=m
497498
CONFIG_MMC_SDHCI_PCI=m
498499
CONFIG_MODULES=y
500+
CONFIG_MODULE_COMPRESS=y
499501
CONFIG_MODULE_COMPRESS_XZ=y
500502
CONFIG_MODULE_SIG=y
501503
CONFIG_MODULE_SIG_KEY="${MODULE_SIGNING_KEY_DIR}/certs/modules.pem"
@@ -600,7 +602,6 @@ CONFIG_NET_ACT_CTINFO=m
600602
CONFIG_NET_ACT_GACT=m
601603
CONFIG_NET_ACT_GATE=m
602604
CONFIG_NET_ACT_IFE=m
603-
CONFIG_NET_ACT_IPT=m
604605
CONFIG_NET_ACT_MIRRED=m
605606
CONFIG_NET_ACT_MPLS=m
606607
CONFIG_NET_ACT_NAT=m
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
DIST linux-6.6.tar.xz 140064536 BLAKE2B 5f02fd8696d42f7ec8c5fbadec8e7270bdcfcb1f9844a6c4db3e1fd461c93ce1ccda650ca72dceb4890ebcbbf768ba8fba0bce91efc49fbd2c307b04e95665f2 SHA512 458b2c34d46206f9b4ccbac54cc57aeca1eaecaf831bc441e59701bac6eadffc17f6ce24af6eadd0454964e843186539ac0d63295ad2cc32d112b60360c39a35
2-
DIST patch-6.6.89.xz 4243548 BLAKE2B a4cf3341e453548a9369ed19fbe07deca183bd5786790161e68bb28340925b351d9046bd8db6fe85836ddff5b82facc85c4fc4fab0e73d2e5837c35672b982f7 SHA512 0642eb456df63bd4f3ab501ca93792e80e6807eef5e8b4dae8bd8a75c3e58397104828c8320994244ab03a62b7f46fa3c476ca8ac42ed7d8f6c8290b5ec6c560
1+
DIST linux-6.12.tar.xz 147906904 BLAKE2B b2ec2fc69218cacabbbe49f78384a5d259ca581b717617c12b000b16f4a4c59ee348ea886b37147f5f70fb9a7a01c1e2c8f19021078f6b23f5bc62d1c48d5e5e SHA512 a37b1823df7b4f72542f689b65882634740ba0401a42fdcf6601d9efd2e132e5a7650e70450ba76f6cd1f13ca31180f2ccee9d54fe4df89bc0000ade4380a548
2+
DIST patch-6.12.20.xz 1432116 BLAKE2B cc42fce6584baa82dcf513e62433a61b8d90562648f64d7795e58ec3de0c5449b3685e05a0cb0f9c46b08faa7edf6d6b7edd3520fbc1fabbbb5b8fba2d528299 SHA512 a1568d4233d900f95fa4394147acdc37498582b050fd6a111506f680636b50b6725bf99d76f4f3613d5af5e50d3e46929d718dae3a59f2174ff53477bef83825

0 commit comments

Comments
 (0)