forge/pve-kernel-thunderx
1
0
Fork 0
Code Issues 3 Pull requests Projects Releases Packages 16 Wiki Activity Actions

Add Linux 5.7-rc6

Browse source 
This change updates the kernel to Linux 5.7-rc6 based on Ubuntu 5.7.0-3.4.
This commit is contained in:
Fabian Mastenbroek 2020-05-24 22:20:17 +02:00
parent cc2870bd81
commit cbbfb46835
No known key found for this signature in database
GPG key ID: 405FC6F81F0A7B85
8 changed files with 156242 additions and 153948 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Makefile
View file

@ -1,12 +1,12 @@
# also bump pve-kernel-meta if either of MAJ.MIN, PATCHLEVEL or KREL change # also bump pve-kernel-meta if either of MAJ.MIN, PATCHLEVEL or KREL change
KERNEL_MAJ=5 KERNEL_MAJ=5
KERNEL_MIN=6 KERNEL_MIN=7
KERNEL_PATCHLEVEL=14 KERNEL_PATCHLEVEL=0
# increment KREL if the ABI changes (abicheck target in debian/rules) # increment KREL if the ABI changes (abicheck target in debian/rules)
# rebuild packages with new KREL and run 'make abiupdate' # rebuild packages with new KREL and run 'make abiupdate'
KREL=1 KREL=0rc6
PKGREL=1 PKGREL=0rc6
KERNEL_MAJMIN=$(KERNEL_MAJ).$(KERNEL_MIN) KERNEL_MAJMIN=$(KERNEL_MAJ).$(KERNEL_MIN)
KERNEL_VER=$(KERNEL_MAJMIN).$(KERNEL_PATCHLEVEL) KERNEL_VER=$(KERNEL_MAJMIN).$(KERNEL_PATCHLEVEL)

6
debian/changelog vendored
View file

@ -1,3 +1,9 @@
pve-edge-kernel (5.7.0-0rc6) edge; urgency=medium
* update to Linux 5.7-rc6 based on Ubuntu 5.7.0-3.4
-- Fabian Mastenbroek <mail.fabianm@gmail.com> Sun, 24 May 2020 22:17:13 +0200
pve-edge-kernel (5.6.14-1) edge; urgency=medium pve-edge-kernel (5.6.14-1) edge; urgency=medium
* update to Linux 5.6.14-1 based on Ubuntu 5.6.0-7.7 * update to Linux 5.6.14-1 based on Ubuntu 5.6.0-7.7

309688
patches/ubuntu/0001-base-packaging.patch
View file

File diff suppressed because it is too large Load diff

6
patches/ubuntu/0002-UBUNTU-SAUCE-add-vmlinux.strip-to-BOOT_TARGETS1-on-p.patch
View file

@ -1,4 +1,4 @@
From 6dbe2103c375cbcb9458504b7e4fa11574b2492c Mon Sep 17 00:00:00 2001 From 46a74276e359f9a182b1ba515879d5352ef2c1eb Mon Sep 17 00:00:00 2001
From: Andy Whitcroft <apw@canonical.com> From: Andy Whitcroft <apw@canonical.com>
Date: Fri, 9 Sep 2016 14:02:29 +0100 Date: Fri, 9 Sep 2016 14:02:29 +0100
Subject: [PATCH 2/5] UBUNTU: SAUCE: add vmlinux.strip to BOOT_TARGETS1 on Subject: [PATCH 2/5] UBUNTU: SAUCE: add vmlinux.strip to BOOT_TARGETS1 on
@ -10,10 +10,10 @@ Signed-off-by: Andy Whitcroft <apw@canonical.com>
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile
index f357305..fbda4b5 100644 index f310c32..a028b3b 100644
--- a/arch/powerpc/Makefile --- a/arch/powerpc/Makefile
+++ b/arch/powerpc/Makefile +++ b/arch/powerpc/Makefile
@@ -285,7 +285,7 @@ drivers-$(CONFIG_OPROFILE) += arch/powerpc/oprofile/ @@ -283,7 +283,7 @@ drivers-$(CONFIG_OPROFILE) += arch/powerpc/oprofile/
all: zImage all: zImage
# With make 3.82 we cannot mix normal and wildcard targets # With make 3.82 we cannot mix normal and wildcard targets

4
patches/ubuntu/0003-UBUNTU-SAUCE-tools-hv-lsvmbus-add-manual-page.patch
View file

@ -1,4 +1,4 @@
From dfc279950258378c695f3e23f1af5434dc73979a Mon Sep 17 00:00:00 2001 From 567c8c6a3747ad6255d5546cbaec072c2ea7b83a Mon Sep 17 00:00:00 2001
From: Andy Whitcroft <apw@canonical.com> From: Andy Whitcroft <apw@canonical.com>
Date: Fri, 27 May 2016 13:52:22 +0100 Date: Fri, 27 May 2016 13:52:22 +0100
Subject: [PATCH 3/5] UBUNTU: SAUCE: tools/hv/lsvmbus -- add manual page Subject: [PATCH 3/5] UBUNTU: SAUCE: tools/hv/lsvmbus -- add manual page
@ -16,7 +16,7 @@ Signed-off-by: Kamal Mostafa <kamal@canonical.com>
diff --git a/tools/hv/lsvmbus.8 b/tools/hv/lsvmbus.8 diff --git a/tools/hv/lsvmbus.8 b/tools/hv/lsvmbus.8
new file mode 100644 new file mode 100644
index 00000000..ba07d664 index 00000000..ba07d66
--- /dev/null --- /dev/null
+++ b/tools/hv/lsvmbus.8 +++ b/tools/hv/lsvmbus.8
@@ -0,0 +1,23 @@ @@ -0,0 +1,23 @@

317
patches/ubuntu/0004-debian-changelog.patch
View file

@ -1,29 +1,320 @@
From 8e87364259ff46e436937ce830138d2c3efddab9 Mon Sep 17 00:00:00 2001 From a1a1e5c0863534bb167afacd5e266baa78bf6beb Mon Sep 17 00:00:00 2001
From: "Kernel Builder (kathleen)" <ubuntu-kernel-bot@canonical.com> From: "Kernel Builder (tangerine)" <ubuntu-kernel-bot@canonical.com>
Date: Tue, 21 Apr 2020 08:32:00 +0000 Date: Sun, 17 May 2020 20:30:37 -0400
Subject: [PATCH 4/5] debian changelog Subject: [PATCH 4/5] debian changelog
--- ---
debian.master/changelog | 9371 +---------------------------------------------- debian.master/changelog | 9662 +----------------------------------------------
1 file changed, 3 insertions(+), 9368 deletions(-) 1 file changed, 3 insertions(+), 9659 deletions(-)
diff --git a/debian.master/changelog b/debian.master/changelog diff --git a/debian.master/changelog b/debian.master/changelog
index 8657f9d..6d33b7e 100644 index b22f4d5..872f7d2 100644
--- a/debian.master/changelog --- a/debian.master/changelog
+++ b/debian.master/changelog +++ b/debian.master/changelog
@@ -1,9371 +1,6 @@ @@ -1,9662 +1,6 @@
-linux-5.6 (5.6.0-7.7) focal; urgency=medium -linux-5.7 (5.7.0-3.4) groovy; urgency=medium
+linux (5.5.19-050519.202004210831) unstable; urgency=low +linux (5.7.0-050700rc6.202005172030) unstable; urgency=low
- [ Upstream Kernel Changes ]
+ Mainline build at commit: v5.7-rc6
- * Rebase to v5.7-rc5
+ -- Mainline Build <kernel@tangerine> Sun, 17 May 2020 20:30:37 -0400
- * Packaging resync (LP: #1786013) - * Packaging resync (LP: #1786013)
- - update dkms package versions - - update dkms package versions
+ Mainline build at commit: v5.5.19 -
- * getitimer returns it_value=0 erroneously (LP: #1349028)
- - [Config] CONTEXT_TRACKING_FORCE policy should be unset
-
- * lockdown on power (LP: #1855668) // Ubuntu Kernel Support for OpenPOWER NV
- Secure & Trusted Boot (LP: #1866909)
- - [Config] Enable configs for OpenPOWER NV Secure & Trusted Boot
-
- * Miscellaneous Ubuntu changes
- - SAUCE: Import aufs driver
- - [Config] Enable aufs
- - [Config] annotations: remove SND_SOC_SOF_HDA_COMMON_HDMI_CODEC
- - [Config] Remove CONFIG_SND_HDA_INTEL_DETECT_DMIC from annotations
- - [Debian] final-checks -- Do not remove ~* from abi
- - [Config] Enable 5-level page table support for x86
- - [Config] updateconfigs after 5.7-rc5 rebase
-
- -- Paolo Pisati <paolo.pisati@canonical.com> Mon, 11 May 2020 10:25:42 +0200
-
-linux-5.7 (5.7.0-2.3) groovy; urgency=medium
-
- * Packaging resync (LP: #1786013)
- - [Packaging] update helper scripts
- - update dkms package versions
- - [Packaging] update helper scripts
-
- * ASUS T100HAN boots to a blank screen with a cursor [i965: Failed to submit
- batchbuffer: Input/output error] (LP: #1860754)
- - [Config] CONFIG_PMIC_OPREGION=y and CONFIG_GPIO_CRYSTAL_COVE=y for amd64
-
- * ubuntu/focal64 fails to mount Vagrant shared folders (LP: #1873506)
- - [Packaging] Move virtualbox modules to linux-modules
- - [Packaging] Remove vbox and zfs modules from generic.inclusion-list
-
- * built-using constraints preventing uploads (LP: #1875601)
- - temporarily drop Built-Using data
-
- * dkms artifacts may expire from the pool (LP: #1850958)
- - [Packaging] autoreconstruct -- manage executable debian files
- - [packaging] handle downloads from the librarian better
-
- * Add signed modules for the 435 NVIDIA driver (LP: #1875888)
- - [Packaging] NVIDIA -- add signed modules for the 435 NVIDIA driver
-
- * [Selftests] Apply various fixes and improvements (LP: #1870543)
- - SAUCE: selftests/seccomp -- Disable timeout for seccomp tests
-
- * [17.04 FEAT] Integrate kernel message catalogue for s390x into Ubuntu
- distribution (LP: #1628889)
- - SAUCE: s390: kernel message catalog
-
- * Overlayfs in user namespace leaks directory content of inaccessible
- directories (LP: #1793458) // CVE-2018-6559
- - SAUCE: overlayfs: ensure mounter privileges when reading directories
-
- * suspend only works once on ThinkPad X1 Carbon gen 7 (LP: #1865570)
- - SAUCE: e1000e: Disable s0ix flow for X1 Carbon 7th
-
- * [ICL] TC port in legacy/static mode can't be detected due TCCOLD
- (LP: #1868936)
- - drm/i915/display: Move out code to return the digital_port of the aux ch
- - drm/i915/display: Add intel_legacy_aux_to_power_domain()
- - drm/i915/display: Split hsw_power_well_enable() into two
- - drm/i915/tc/icl: Implement TC cold sequences
- - drm/i915/tc: Skip ref held check for TC legacy aux power wells
- - drm/i915/tc/tgl: Implement TC cold sequences
- - drm/i915/tc: Catch TC users accessing FIA registers without enable aux
- - drm/i915/tc: Do not warn when aux power well of static TC ports timeout
-
- * Touchpad doesn't work on Dell Inspiron 7000 2-in-1 (LP: #1851901)
- - Revert "UBUNTU: SAUCE: mfd: intel-lpss: add quirk for Dell XPS 13 7390
- 2-in-1"
-
- * 'Elan touchpad' not detected on 'Lenovo ThinkBook 15 IIL' (LP: #1861610)
- - SAUCE: Input: elan_i2c - add more hardware ID for Lenovo laptop
-
- * linux-image-5.0.0-35-generic breaks checkpointing of container
- (LP: #1857257)
- - SAUCE: overlayfs: use shiftfs hacks only with shiftfs as underlay
-
- * alsa/sof: kernel oops on the machine without Intel hdmi audio codec (a
- regression in the asoc machine driver) (LP: #1874359)
- - ASoC: intel/skl/hda - fix oops on systems without i915 audio codec
-
- * Add debian/rules targets to compile/run kernel selftests (LP: #1874286)
- - [Packaging] add support to compile/run selftests
-
- * 5.4.0-24.28 does not seem to apply rtprio, whereas -21 does. (LP: #1873315)
- - [Config] lowlatency: turn off RT_GROUP_SCHED
-
- * alsa/sof: external mic can't be deteced on Lenovo and HP laptops
- (LP: #1872569)
- - SAUCE: ASoC: intel/skl/hda - set autosuspend timeout for hda codecs
-
- * shiftfs: O_TMPFILE reports ESTALE (LP: #1872757)
- - SAUCE: shiftfs: fix dentry revalidation
-
- * shiftfs: broken shiftfs nesting (LP: #1872094)
- - SAUCE: shiftfs: record correct creator credentials
-
- * lockdown on power (LP: #1855668)
- - SAUCE: (lockdown) powerpc: lock down kernel in secure boot mode
-
- * Add support for Realtek 8723DE wireless adapter (LP: #1780590)
- - SAUCE: rtw88: add adaptivity support for EU/JP regulatory
- - SAUCE: rtw88: update tx descriptor of mgmt and rsvd page packets
- - SAUCE: rtw88: sar: dump sar information via debugfs
- - SAUCE: rtw88: 8723d: add IQ calibration
- - SAUCE: rtw88: 8723d: Add power tracking
- - SAUCE: rtw88: 8723d: implement flush queue
- - SAUCE: rtw88: 8723d: set ltecoex register address in chip_info
- - SAUCE: rtw88: 8723d: Add coex support
- - SAUCE: rtw88: 8723d: Add shutdown callback to disable BT USB suspend
-
- * Fix authentication fail on Realtek WiFi 8723de (LP: #1871300)
- - SAUCE: rtw88: No retry and report for auth and assoc
- - SAUCE: rtw88: fix rate for a while after being connected
- - SAUCE: rtw88: Move driver IQK to set channel before association for 11N chip
-
- * Miscellaneous Ubuntu changes
- - SAUCE: rtw88: fix 'const' mismatch in power suequence hooks
- - SAUCE: rtw88: fix 'const' mismatch in
- __priority_queue_cfg_legacy()/__priority_queue_cfg()
- - [Config] RTW88=m
- - SAUCE: (lockdown) Revert carried-forward lockdown patches
- - SAUCE: (lockdown) Add efi_status_to_str() and rework efi_status_to_err().
- - SAUCE: (lockdown) Make get_cert_list() use efi_status_to_str() to print
- error messages.
- - SAUCE: (lockdown) security: lockdown: expose a hook to lock the kernel down
- - SAUCE: (lockdown) efi: Add an EFI_SECURE_BOOT flag to indicate secure boot
- mode
- - SAUCE: (lockdown) efi: Lock down the kernel if booted in secure boot mode
- - SAUCE: (lockdown) s390: Lock down the kernel when the IPL secure flag is set
- - SAUCE: (lockdown) KEYS: Make use of platform keyring for module signature
- verify
- - SAUCE: (lockdown) arm64: Allow locking down the kernel under EFI secure boot
- - SAUCE: (lockdown) security: lockdown: Make
- CONFIG_LOCK_DOWN_IN_EFI_SECURE_BOOT more generic
- - [Config] Add back CONFIG_LOCK_DOWN_IN_SECURE_BOOT annotation for ppc64el
- - [Config] CONFIG_RT_GROUP_SCHED=y
- - [Packaging] Include modules.builtin.modinfo in linux-modules
- - SAUCE: LSM: Infrastructure management of the sock security
- - SAUCE: Fix-up af_unix mediation for sock infrastructure management
- - SAUCE: Revert "apparmor: Allow filtering based on secmark policy"
- - SAUCE: Revert "apparmor: Parse secmark policy"
- - SAUCE: Revert "apparmor: Add a wildcard secid"
- - SAUCE: Revert "apparmor: fixup secid map conversion to using IDR"
- - SAUCE: Revert "apparmor: Use an IDR to allocate apparmor secids"
- - SAUCE: Revert "apparmor: add support for mapping secids and using secctxes"
- - Update dropped.txt for restored apparmor patches
- - Remove lockdown patches from dropped.txt
- - SAUCE: powerpc/ima: require IMA module signatures only if MODULE_SIG is not
- enabled
- - SAUCE: selftests/ftrace: Use printf instead of echo in kprobe syntax error
- tests
- - SAUCE: selftests/net -- disable l2tp.sh test
- - SAUCE: selftests/net -- disable timeout
- - SAUCE: tools: hv: Update shebang to use python3 instead of python
- - Remove dropped.txt
- - [Packaging] move linux-doc and linux-libc-dev stubs to debian.master
- - [Debian] Support generating configs for riscv64
- - [Config] CONFIG_KMSG_IDS=y for s390x
- - [Packaging] add libcap-dev dependency
- - [Config] CONFIG_AD5770R=m
- - [Config] CONFIG_AL3010=m
- - [Config] CONFIG_APPLE_MFI_FASTCHARGE=m
- - [Config] CONFIG_BAREUDP=m
- - [Config] CONFIG_CRYPTO_DEV_OCTEONTX_CPT=m
- - [Config] CONFIG_CRYPTO_DEV_ZYNQMP_AES=m
- - [Config] CONFIG_DRM_DISPLAY_CONNECTOR=m
- - [Config] CONFIG_DRM_PANEL_BOE_TV101WUM_NL6=m
- - [Config] CONFIG_DRM_PANEL_ELIDA_KD35T133=m
- - [Config] CONFIG_DRM_PANEL_FEIXIN_K101_IM2BA02=m
- - [Config] CONFIG_DRM_PANEL_NOVATEK_NT35510=m
- - [Config] CONFIG_DRM_PANEL_SAMSUNG_S6E88A0_AMS452EF01=m
- - [Config] CONFIG_DRM_PARADE_PS8640=m
- - [Config] CONFIG_DRM_SIMPLE_BRIDGE=m
- - [Config] CONFIG_DRM_TIDSS=m
- - [Config] CONFIG_DRM_TI_TPD12S015=m
- - [Config] CONFIG_DRM_TOSHIBA_TC358768=m
- - [Config] CONFIG_EDAC_DMC520=m
- - [Config] CONFIG_EXFAT_FS=m
- - [Config] CONFIG_GP2AP002=m
- - [Config] CONFIG_GPIO_MLXBF2=m
- - [Config] CONFIG_HID_GLORIOUS=m
- - [Config] CONFIG_HID_MCP2221=m
- - [Config] CONFIG_HMC425=m
- - [Config] CONFIG_ICP10100=m
- - [Config] CONFIG_IMX8MM_THERMAL=m
- - [Config] CONFIG_IMX_SC_THERMAL=m
- - [Config] CONFIG_INTERCONNECT_QCOM_OSM_L3=m
- - [Config] CONFIG_INTERCONNECT_QCOM_SC7180=m
- - [Config] CONFIG_K3_RTI_WATCHDOG=m
- - [Config] CONFIG_MDIO_IPQ8064=m
- - [Config] CONFIG_MDIO_MVUSB=m
- - [Config] CONFIG_MHI_BUS=m
- - [Config] CONFIG_OCTEONTX2_VF=m
- - [Config] CONFIG_PHY_CADENCE_TORRENT=m
- - [Config] CONFIG_PHY_QCOM_USB_HS_28NM=m
- - [Config] CONFIG_PHY_QCOM_USB_SS=m
- - [Config] CONFIG_PINCTRL_DA9062=m
- - [Config] CONFIG_PINCTRL_IPQ6018=m
- - [Config] CONFIG_PTP_1588_CLOCK_IDT82P33=m
- - [Config] CONFIG_PTP_1588_CLOCK_VMW=m
- - [Config] CONFIG_QCOM_IPA=m
- - [Config] CONFIG_REGULATOR_MP5416=m
- - [Config] CONFIG_REGULATOR_MP886X=m
- - [Config] CONFIG_RN5T618_ADC=m
- - [Config] CONFIG_RTC_DRV_MT2712=m
- - [Config] CONFIG_RTC_DRV_RC5T619=m
- - [Config] CONFIG_SC_MSS_7180=m
- - [Config] CONFIG_SENSORS_AXI_FAN_CONTROL=m
- - [Config] CONFIG_SM_GCC_8250=m
- - [Config] CONFIG_SND_BCM63XX_I2S_WHISTLER=m
- - [Config] CONFIG_SND_MESON_AIU=m
- - [Config] CONFIG_SND_MESON_G12A_TOACODEC=m
- - [Config] CONFIG_SND_MESON_GX_SOUND_CARD=m
- - [Config] CONFIG_SND_SOC_AMD_RV_RT5682_MACH=m
- - [Config] CONFIG_SND_SOC_INTEL_SOF_PCM512x_MACH=m
- - [Config] CONFIG_SND_SOC_MESON_T9015=m
- - [Config] CONFIG_SND_SOC_RT5682_SDW=m
- - [Config] CONFIG_SND_SOC_TLV320ADCX140=m
- - [Config] CONFIG_SPI_FSI=m
- - [Config] CONFIG_SPI_MTK_NOR=m
- - [Config] CONFIG_SPI_MUX=m
- - [Config] CONFIG_SPRD_THERMAL=m
- - [Config] CONFIG_SURFACE_3_POWER_OPREGION=m
- - [Config] CONFIG_TINYDRM_ILI9486=m
- - [Config] CONFIG_TI_K3_AM65_CPSW_NUSS=m
- - [Config] CONFIG_TYPEC_MUX_INTEL_PMC=m
- - [Config] CONFIG_UACCE=m
- - [Config] CONFIG_UNIPHIER_XDMAC=m
- - [Config] CONFIG_USB_MAX3420_UDC=m
- - [Config] CONFIG_USB_RAW_GADGET=m
- - [Config] CONFIG_VHOST_VDPA=m
- - [Config] CONFIG_VIDEO_IMX219=m
- - [Config] CONFIG_VIDEO_SUN8I_ROTATE=m
- - [Config] CONFIG_VIRTIO_VDPA=m
- - [Config] CONFIG_MOST_COMPONENTS=m
- - [Config] CONFIG_MFD_IQS62X=m
- - packaging: getabis: switch to ckt-ppa:bootstrap/linux-5.7
-
- * Miscellaneous upstream changes
- - Revert "UBUNTU: SAUCE: rtw88: add rtw_read8_mask and rtw_read16_mask"
- - Revert "UBUNTU: SAUCE: drm/i915/fbc: disable framebuffer compression on
- IceLake"
- - Revert "UBUNTU: SAUCE: platform/x86: dell-uart-backlight: move retry block"
-
- -- Paolo Pisati <paolo.pisati@canonical.com> Mon, 04 May 2020 10:48:48 +0200
-
-linux-5.7 (5.7.0-1.2) groovy; urgency=medium
-
- * Packaging resync (LP: #1786013)
- - [Packaging] update helper scripts
-
- * Miscellaneous Ubuntu changes
- - SAUCE: hio: pass make_request ptr directly to blk_alloc_queue()
- - SAUCE: hio: locally define disk_map_sector_rcu()
- - SAUCE: hio: Revert "block: unexport disk_map_sector_rcu"
- - SAUCE: hio: include <linux/part_stat.h>
- - [Config] amd64: i386: HIO=m
- - [Config] updateconfigs after 5.7-rc3 rebase
-
- -- Paolo Pisati <paolo.pisati@canonical.com> Mon, 27 Apr 2020 11:31:38 +0200
-
-linux-5.7 (5.7.0-0.1) groovy; urgency=medium
-
- * Miscellaneous Ubuntu changes
- - [Config] updateconfigs after rebase to 5.7-rc1
-
- [ Upstream Kernel Changes ]
-
- * Rebase to v5.7-rc1
- * Rebase to v5.7-rc2
-
- -- Paolo Pisati <paolo.pisati@canonical.com> Thu, 16 Apr 2020 11:53:58 +0200
-
-linux-5.7 (5.7.0-0.0) focal; urgency=medium
-
- * Dummy entry
-
- -- Paolo Pisati <paolo.pisati@canonical.com> Thu, 16 Apr 2020 11:53:58 +0200
-
-linux-5.6 (5.6.0-7.7) focal; urgency=medium
-
- * Packaging resync (LP: #1786013)
- - update dkms package versions
-
- * Kernel Oops - general protection fault: 0000 [#1] SMP PTI after - * Kernel Oops - general protection fault: 0000 [#1] SMP PTI after
- disconnecting thunderbolt docking station (LP: #1864754) - disconnecting thunderbolt docking station (LP: #1864754)
- - SAUCE: ptp: free ptp clock properly - - SAUCE: ptp: free ptp clock properly
+ -- Mainline Build <kernel@kathleen> Tue, 21 Apr 2020 08:32:00 +0000 -
- * swap storms kills interactive use (LP: #1861359) - * swap storms kills interactive use (LP: #1861359)
- - SAUCE: mm/page_alloc.c: disable memory reclaim watermark boosting by default - - SAUCE: mm/page_alloc.c: disable memory reclaim watermark boosting by default
- -

159
patches/ubuntu/0005-configs-based-on-Ubuntu-5.6.0-7.7.patch → patches/ubuntu/0005-configs-based-on-Ubuntu-5.7.0-3.4.patch
View file

@ -1,27 +1,27 @@
From 6a36a80309a4935b5febf43c7e25047fb2910b5a Mon Sep 17 00:00:00 2001 From d3b5fe8d750339adfa962a84b3d42b47a6113424 Mon Sep 17 00:00:00 2001
From: "Kernel Builder (sita)" <ubuntu-kernel-bot@canonical.com> From: "Kernel Builder (tangerine)" <ubuntu-kernel-bot@canonical.com>
Date: Thu, 23 Apr 2020 09:33:59 +0000 Date: Sun, 17 May 2020 20:31:28 -0400
Subject: [PATCH 5/5] configs (based on Ubuntu-5.6.0-7.7) Subject: [PATCH 5/5] configs (based on Ubuntu-5.7.0-3.4)
--- ---
debian.master/config/amd64/config.common.amd64 | 1 - debian.master/config/amd64/config.common.amd64 | 1 -
.../config/amd64/config.flavour.generic | 1 - debian.master/config/amd64/config.flavour.generic | 1 -
.../config/amd64/config.flavour.lowlatency | 1 - .../config/amd64/config.flavour.lowlatency | 1 -
debian.master/config/arm64/config.common.arm64 | 4 +--- debian.master/config/arm64/config.common.arm64 | 4 +--
debian.master/config/armhf/config.common.armhf | 2 -- debian.master/config/armhf/config.common.armhf | 2 --
debian.master/config/config.common.ubuntu | 17 +++-------------- debian.master/config/config.common.ubuntu | 37 ++--------------------
debian.master/config/i386/config.common.i386 | 1 - debian.master/config/i386/config.common.i386 | 1 -
.../config/i386/config.flavour.generic | 1 - debian.master/config/i386/config.flavour.generic | 1 -
.../config/i386/config.flavour.lowlatency | 1 - .../config/i386/config.flavour.lowlatency | 1 -
.../config/ppc64el/config.common.ppc64el | 2 -- debian.master/config/ppc64el/config.common.ppc64el | 2 --
debian.master/config/s390x/config.common.s390x | 1 - debian.master/config/s390x/config.common.s390x | 1 -
11 files changed, 4 insertions(+), 28 deletions(-) 11 files changed, 4 insertions(+), 48 deletions(-)
diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index a473a9a03a7f..d0098d1ed9c1 100644 index 85ff9dc..fef3036 100644
--- a/debian.master/config/amd64/config.common.amd64 --- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64
@@ -183,7 +183,6 @@ CONFIG_HFSPLUS_FS=m @@ -185,7 +185,6 @@ CONFIG_HFSPLUS_FS=m
CONFIG_HFS_FS=m CONFIG_HFS_FS=m
CONFIG_HIBERNATION=y CONFIG_HIBERNATION=y
CONFIG_HID=m CONFIG_HID=m
@ -30,7 +30,7 @@ index a473a9a03a7f..d0098d1ed9c1 100644
CONFIG_HOTPLUG_PCI=y CONFIG_HOTPLUG_PCI=y
CONFIG_HOTPLUG_PCI_SHPC=y CONFIG_HOTPLUG_PCI_SHPC=y
diff --git a/debian.master/config/amd64/config.flavour.generic b/debian.master/config/amd64/config.flavour.generic diff --git a/debian.master/config/amd64/config.flavour.generic b/debian.master/config/amd64/config.flavour.generic
index d1662374ea94..5938d9ba3f6c 100644 index d166237..5938d9b 100644
--- a/debian.master/config/amd64/config.flavour.generic --- a/debian.master/config/amd64/config.flavour.generic
+++ b/debian.master/config/amd64/config.flavour.generic +++ b/debian.master/config/amd64/config.flavour.generic
@@ -4,7 +4,6 @@ @@ -4,7 +4,6 @@
@ -42,7 +42,7 @@ index d1662374ea94..5938d9ba3f6c 100644
# CONFIG_PREEMPT is not set # CONFIG_PREEMPT is not set
CONFIG_PREEMPT_VOLUNTARY=y CONFIG_PREEMPT_VOLUNTARY=y
diff --git a/debian.master/config/amd64/config.flavour.lowlatency b/debian.master/config/amd64/config.flavour.lowlatency diff --git a/debian.master/config/amd64/config.flavour.lowlatency b/debian.master/config/amd64/config.flavour.lowlatency
index 814348dc984b..42de09fb0bff 100644 index 814348d..42de09f 100644
--- a/debian.master/config/amd64/config.flavour.lowlatency --- a/debian.master/config/amd64/config.flavour.lowlatency
+++ b/debian.master/config/amd64/config.flavour.lowlatency +++ b/debian.master/config/amd64/config.flavour.lowlatency
@@ -4,7 +4,6 @@ @@ -4,7 +4,6 @@
@ -54,10 +54,10 @@ index 814348dc984b..42de09fb0bff 100644
CONFIG_PREEMPT=y CONFIG_PREEMPT=y
# CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT_VOLUNTARY is not set
diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64 diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
index dfe622def83c..69180578ddf4 100644 index b2f8a3c1..ab96a76 100644
--- a/debian.master/config/arm64/config.common.arm64 --- a/debian.master/config/arm64/config.common.arm64
+++ b/debian.master/config/arm64/config.common.arm64 +++ b/debian.master/config/arm64/config.common.arm64
@@ -165,7 +165,7 @@ CONFIG_FEALNX=m @@ -166,7 +166,7 @@ CONFIG_FEALNX=m
CONFIG_FIREWIRE=m CONFIG_FIREWIRE=m
CONFIG_FIREWIRE_NOSY=m CONFIG_FIREWIRE_NOSY=m
CONFIG_FIXED_PHY=y CONFIG_FIXED_PHY=y
@ -66,7 +66,7 @@ index dfe622def83c..69180578ddf4 100644
CONFIG_FPGA_BRIDGE=m CONFIG_FPGA_BRIDGE=m
CONFIG_FPGA_DFL=m CONFIG_FPGA_DFL=m
CONFIG_FRAME_WARN=1024 CONFIG_FRAME_WARN=1024
@@ -195,7 +195,6 @@ CONFIG_HFSPLUS_FS=m @@ -197,7 +197,6 @@ CONFIG_HFSPLUS_FS=m
CONFIG_HFS_FS=m CONFIG_HFS_FS=m
# CONFIG_HIBERNATION is not set # CONFIG_HIBERNATION is not set
CONFIG_HID=m CONFIG_HID=m
@ -74,7 +74,7 @@ index dfe622def83c..69180578ddf4 100644
CONFIG_HMC6352=m CONFIG_HMC6352=m
CONFIG_HOTPLUG_PCI=y CONFIG_HOTPLUG_PCI=y
CONFIG_HOTPLUG_PCI_SHPC=y CONFIG_HOTPLUG_PCI_SHPC=y
@@ -283,7 +282,6 @@ CONFIG_IPMI_HANDLER=m @@ -287,7 +286,6 @@ CONFIG_IPMI_HANDLER=m
# CONFIG_IPMMU_VMSA is not set # CONFIG_IPMMU_VMSA is not set
# CONFIG_IP_DCCP_CCID3 is not set # CONFIG_IP_DCCP_CCID3 is not set
CONFIG_IRQ_BYPASS_MANAGER=y CONFIG_IRQ_BYPASS_MANAGER=y
@ -83,10 +83,10 @@ index dfe622def83c..69180578ddf4 100644
CONFIG_ISL29020=m CONFIG_ISL29020=m
CONFIG_JFS_FS=m CONFIG_JFS_FS=m
diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index 5407bc1cd66b..97651f0e6512 100644 index b5a5f76..1fd6228 100644
--- a/debian.master/config/armhf/config.common.armhf --- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf +++ b/debian.master/config/armhf/config.common.armhf
@@ -184,7 +184,6 @@ CONFIG_HFSPLUS_FS=m @@ -186,7 +186,6 @@ CONFIG_HFSPLUS_FS=m
CONFIG_HFS_FS=m CONFIG_HFS_FS=m
CONFIG_HIBERNATION=y CONFIG_HIBERNATION=y
CONFIG_HID=m CONFIG_HID=m
@ -94,19 +94,19 @@ index 5407bc1cd66b..97651f0e6512 100644
CONFIG_HMC6352=m CONFIG_HMC6352=m
# CONFIG_HOTPLUG_PCI is not set # CONFIG_HOTPLUG_PCI is not set
CONFIG_HPFS_FS=m CONFIG_HPFS_FS=m
@@ -267,7 +266,6 @@ CONFIG_IPACK_BUS=m @@ -272,7 +271,6 @@ CONFIG_IPMI_HANDLER=m
CONFIG_IPMI_HANDLER=m
CONFIG_IPMMU_VMSA=y CONFIG_IPMMU_VMSA=y
# CONFIG_IP_DCCP_CCID3 is not set # CONFIG_IP_DCCP_CCID3 is not set
CONFIG_IRQ_BYPASS_MANAGER=m
-# CONFIG_IRQ_FORCED_THREADING_DEFAULT is not set -# CONFIG_IRQ_FORCED_THREADING_DEFAULT is not set
CONFIG_ISL29003=m CONFIG_ISL29003=m
CONFIG_ISL29020=m CONFIG_ISL29020=m
CONFIG_JFS_FS=m CONFIG_JFS_FS=m
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index b63878493c30..c26dcf10c136 100644 index 298d45c..9650399 100644
--- a/debian.master/config/config.common.ubuntu --- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu
@@ -281,10 +281,7 @@ CONFIG_AMD_XGBE_DCB=y @@ -283,10 +283,7 @@ CONFIG_AMD_XGBE_DCB=y
CONFIG_AMD_XGBE_HAVE_ECC=y CONFIG_AMD_XGBE_HAVE_ECC=y
CONFIG_AMILO_RFKILL=m CONFIG_AMILO_RFKILL=m
CONFIG_AMLOGIC_THERMAL=m CONFIG_AMLOGIC_THERMAL=m
@ -118,7 +118,15 @@ index b63878493c30..c26dcf10c136 100644
CONFIG_APB_TIMER=y CONFIG_APB_TIMER=y
CONFIG_APDS9300=m CONFIG_APDS9300=m
CONFIG_APDS9960=m CONFIG_APDS9960=m
@@ -767,7 +764,7 @@ CONFIG_ARM_TI_CPUFREQ=y @@ -368,6 +365,7 @@ CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
CONFIG_ARCH_HAS_MEMREMAP_COMPAT_ALIGN=y
CONFIG_ARCH_HAS_MEM_ENCRYPT=y
CONFIG_ARCH_HAS_MMIOWB=y
+CONFIG_ARCH_HAS_NON_OVERLAPPING_ADDRESS_SPACE=y
CONFIG_ARCH_HAS_PHYS_TO_DMA=y
CONFIG_ARCH_HAS_PKEYS=y
CONFIG_ARCH_HAS_PMEM_API=y
@@ -772,7 +770,7 @@ CONFIG_ARM_TI_CPUFREQ=y
CONFIG_ARM_VEXPRESS_SPC_CPUFREQ=m CONFIG_ARM_VEXPRESS_SPC_CPUFREQ=m
CONFIG_ARM_VIRT_EXT=y CONFIG_ARM_VIRT_EXT=y
CONFIG_AS3935=m CONFIG_AS3935=m
@ -127,7 +135,33 @@ index b63878493c30..c26dcf10c136 100644
CONFIG_ASN1=y CONFIG_ASN1=y
CONFIG_ASPEED_ADC=m CONFIG_ASPEED_ADC=m
CONFIG_ASPEED_BT_IPMI_BMC=m CONFIG_ASPEED_BT_IPMI_BMC=m
@@ -2436,7 +2433,6 @@ CONFIG_DELL_SMBIOS=m @@ -908,25 +906,6 @@ CONFIG_AUDIT_ARCH=y
CONFIG_AUDIT_ARCH_COMPAT_GENERIC=y
CONFIG_AUDIT_COMPAT_GENERIC=y
CONFIG_AUDIT_GENERIC=y
-CONFIG_AUFS_BDEV_LOOP=y
-# CONFIG_AUFS_BRANCH_MAX_1023 is not set
-CONFIG_AUFS_BRANCH_MAX_127=y
-# CONFIG_AUFS_BRANCH_MAX_32767 is not set
-# CONFIG_AUFS_BRANCH_MAX_511 is not set
-# CONFIG_AUFS_BR_FUSE is not set
-CONFIG_AUFS_BR_HFSPLUS=y
-# CONFIG_AUFS_BR_RAMFS is not set
-# CONFIG_AUFS_DEBUG is not set
-CONFIG_AUFS_DIRREN=y
-CONFIG_AUFS_EXPORT=y
-# CONFIG_AUFS_FHSM is not set
-CONFIG_AUFS_FS=m
-# CONFIG_AUFS_HNOTIFY is not set
-CONFIG_AUFS_INO_T_64=y
-# CONFIG_AUFS_RDU is not set
-CONFIG_AUFS_SBILIST=y
-# CONFIG_AUFS_SHWH is not set
-CONFIG_AUFS_XATTR=y
CONFIG_AURORA_NB8800=m
CONFIG_AUTO_ZRELADDR=y
CONFIG_AX25=m
@@ -2480,7 +2459,6 @@ CONFIG_DELL_SMBIOS=m
CONFIG_DELL_SMBIOS_SMM=y CONFIG_DELL_SMBIOS_SMM=y
CONFIG_DELL_SMBIOS_WMI=y CONFIG_DELL_SMBIOS_WMI=y
CONFIG_DELL_SMO8800=m CONFIG_DELL_SMO8800=m
@ -135,16 +169,15 @@ index b63878493c30..c26dcf10c136 100644
CONFIG_DELL_WMI=m CONFIG_DELL_WMI=m
CONFIG_DELL_WMI_AIO=m CONFIG_DELL_WMI_AIO=m
CONFIG_DELL_WMI_DESCRIPTOR=m CONFIG_DELL_WMI_DESCRIPTOR=m
@@ -3546,7 +3542,7 @@ CONFIG_GAMEPORT_L4=m @@ -5186,7 +5164,6 @@ CONFIG_KGDB_KDB=y
CONFIG_GAMEPORT_NS558=m CONFIG_KGDB_LOW_LEVEL_TRAP=y
CONFIG_GARP=m CONFIG_KGDB_SERIAL_CONSOLE=y
CONFIG_GART_IOMMU=y # CONFIG_KGDB_TESTS is not set
-CONFIG_GCC_VERSION=90201 -CONFIG_KMSG_IDS=y
+CONFIG_GCC_VERSION=90300 CONFIG_KMX61=m
# CONFIG_GCOV_KERNEL is not set CONFIG_KPC2000=y
CONFIG_GDB_SCRIPTS=y CONFIG_KPC2000_CORE=m
CONFIG_GEMINI_ETHERNET=m @@ -5414,7 +5391,6 @@ CONFIG_LOCKDEP_SUPPORT=y
@@ -5338,7 +5334,6 @@ CONFIG_LOCKDEP_SUPPORT=y
CONFIG_LOCKD_V4=y CONFIG_LOCKD_V4=y
CONFIG_LOCKUP_DETECTOR=y CONFIG_LOCKUP_DETECTOR=y
CONFIG_LOCK_DEBUGGING_SUPPORT=y CONFIG_LOCK_DEBUGGING_SUPPORT=y
@ -152,7 +185,7 @@ index b63878493c30..c26dcf10c136 100644
# CONFIG_LOCK_DOWN_KERNEL_FORCE_CONFIDENTIALITY is not set # CONFIG_LOCK_DOWN_KERNEL_FORCE_CONFIDENTIALITY is not set
# CONFIG_LOCK_DOWN_KERNEL_FORCE_INTEGRITY is not set # CONFIG_LOCK_DOWN_KERNEL_FORCE_INTEGRITY is not set
CONFIG_LOCK_DOWN_KERNEL_FORCE_NONE=y CONFIG_LOCK_DOWN_KERNEL_FORCE_NONE=y
@@ -8451,14 +8446,12 @@ CONFIG_RTLWIFI_USB=m @@ -8556,14 +8532,12 @@ CONFIG_RTLWIFI_USB=m
CONFIG_RTL_CARDS=m CONFIG_RTL_CARDS=m
CONFIG_RTS5208=m CONFIG_RTS5208=m
CONFIG_RTW88=m CONFIG_RTW88=m
@ -160,14 +193,14 @@ index b63878493c30..c26dcf10c136 100644
CONFIG_RTW88_8822BE=y CONFIG_RTW88_8822BE=y
CONFIG_RTW88_8822CE=y CONFIG_RTW88_8822CE=y
CONFIG_RTW88_CORE=m CONFIG_RTW88_CORE=m
CONFIG_RTW88_DEBUG=y # CONFIG_RTW88_DEBUG is not set
CONFIG_RTW88_DEBUGFS=y # CONFIG_RTW88_DEBUGFS is not set
CONFIG_RTW88_PCI=m CONFIG_RTW88_PCI=m
-# CONFIG_RTW88_REGD_USER_REG_HINTS is not set -# CONFIG_RTW88_REGD_USER_REG_HINTS is not set
# CONFIG_RT_GROUP_SCHED is not set # CONFIG_RT_GROUP_SCHED is not set
CONFIG_RT_MUTEXES=y CONFIG_RT_MUTEXES=y
CONFIG_RUNTIME_TESTING_MENU=y CONFIG_RUNTIME_TESTING_MENU=y
@@ -9046,8 +9039,6 @@ CONFIG_SGI_XP=m @@ -9156,8 +9130,6 @@ CONFIG_SGI_XP=m
CONFIG_SGL_ALLOC=y CONFIG_SGL_ALLOC=y
CONFIG_SG_POOL=y CONFIG_SG_POOL=y
CONFIG_SG_SPLIT=y CONFIG_SG_SPLIT=y
@ -176,7 +209,15 @@ index b63878493c30..c26dcf10c136 100644
CONFIG_SHMEM=y CONFIG_SHMEM=y
CONFIG_SHUFFLE_PAGE_ALLOCATOR=y CONFIG_SHUFFLE_PAGE_ALLOCATOR=y
CONFIG_SH_ETH=m CONFIG_SH_ETH=m
@@ -11143,7 +11134,6 @@ CONFIG_VCNL4035=m @@ -10473,7 +10445,6 @@ CONFIG_TI_CPSW=y
# CONFIG_TI_CPSW_PHY_SEL is not set
CONFIG_TI_CPSW_SWITCHDEV=m
CONFIG_TI_CPTS=y
-CONFIG_TI_CPTS_MOD=y
CONFIG_TI_DAC082S085=m
CONFIG_TI_DAC5571=m
CONFIG_TI_DAC7311=m
@@ -11265,7 +11236,6 @@ CONFIG_VDPA_SIM=m
CONFIG_VDSO=y CONFIG_VDSO=y
CONFIG_VEML6030=m CONFIG_VEML6030=m
CONFIG_VEML6070=m CONFIG_VEML6070=m
@ -184,7 +225,7 @@ index b63878493c30..c26dcf10c136 100644
CONFIG_VETH=m CONFIG_VETH=m
CONFIG_VEXPRESS_CONFIG=y CONFIG_VEXPRESS_CONFIG=y
CONFIG_VEXPRESS_SYSCFG=y CONFIG_VEXPRESS_SYSCFG=y
@@ -11577,7 +11567,6 @@ CONFIG_WATCHDOG_RTAS=m @@ -11706,7 +11676,6 @@ CONFIG_WATCHDOG_RTAS=m
CONFIG_WATCHDOG_SYSFS=y CONFIG_WATCHDOG_SYSFS=y
CONFIG_WCN36XX=m CONFIG_WCN36XX=m
# CONFIG_WCN36XX_DEBUGFS is not set # CONFIG_WCN36XX_DEBUGFS is not set
@ -193,10 +234,10 @@ index b63878493c30..c26dcf10c136 100644
CONFIG_WDAT_WDT=m CONFIG_WDAT_WDT=m
CONFIG_WDT=m CONFIG_WDT=m
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index 52b30381e1b2..0268d7a4c6da 100644 index 82398ce..d23088b 100644
--- a/debian.master/config/i386/config.common.i386 --- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386
@@ -180,7 +180,6 @@ CONFIG_HFSPLUS_FS=m @@ -182,7 +182,6 @@ CONFIG_HFSPLUS_FS=m
CONFIG_HFS_FS=m CONFIG_HFS_FS=m
CONFIG_HIBERNATION=y CONFIG_HIBERNATION=y
CONFIG_HID=m CONFIG_HID=m
@ -205,7 +246,7 @@ index 52b30381e1b2..0268d7a4c6da 100644
CONFIG_HOTPLUG_PCI=y CONFIG_HOTPLUG_PCI=y
CONFIG_HOTPLUG_PCI_SHPC=y CONFIG_HOTPLUG_PCI_SHPC=y
diff --git a/debian.master/config/i386/config.flavour.generic b/debian.master/config/i386/config.flavour.generic diff --git a/debian.master/config/i386/config.flavour.generic b/debian.master/config/i386/config.flavour.generic
index 5c2e4e1d3a9f..965113b110ce 100644 index 5c2e4e1..965113b 100644
--- a/debian.master/config/i386/config.flavour.generic --- a/debian.master/config/i386/config.flavour.generic
+++ b/debian.master/config/i386/config.flavour.generic +++ b/debian.master/config/i386/config.flavour.generic
@@ -4,6 +4,5 @@ @@ -4,6 +4,5 @@
@ -216,7 +257,7 @@ index 5c2e4e1d3a9f..965113b110ce 100644
# CONFIG_PREEMPT is not set # CONFIG_PREEMPT is not set
CONFIG_PREEMPT_VOLUNTARY=y CONFIG_PREEMPT_VOLUNTARY=y
diff --git a/debian.master/config/i386/config.flavour.lowlatency b/debian.master/config/i386/config.flavour.lowlatency diff --git a/debian.master/config/i386/config.flavour.lowlatency b/debian.master/config/i386/config.flavour.lowlatency
index 6b121e3f433b..0af82e00adce 100644 index 6b121e3..0af82e0 100644
--- a/debian.master/config/i386/config.flavour.lowlatency --- a/debian.master/config/i386/config.flavour.lowlatency
+++ b/debian.master/config/i386/config.flavour.lowlatency +++ b/debian.master/config/i386/config.flavour.lowlatency
@@ -4,6 +4,5 @@ @@ -4,6 +4,5 @@
@ -227,10 +268,10 @@ index 6b121e3f433b..0af82e00adce 100644
CONFIG_PREEMPT=y CONFIG_PREEMPT=y
# CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT_VOLUNTARY is not set
diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el
index 7761c349c82c..1945b4564116 100644 index c0c01a8..f66726e 100644
--- a/debian.master/config/ppc64el/config.common.ppc64el --- a/debian.master/config/ppc64el/config.common.ppc64el
+++ b/debian.master/config/ppc64el/config.common.ppc64el +++ b/debian.master/config/ppc64el/config.common.ppc64el
@@ -182,7 +182,6 @@ CONFIG_HFSPLUS_FS=m @@ -184,7 +184,6 @@ CONFIG_HFSPLUS_FS=m
CONFIG_HFS_FS=m CONFIG_HFS_FS=m
# CONFIG_HIBERNATION is not set # CONFIG_HIBERNATION is not set
CONFIG_HID=m CONFIG_HID=m
@ -238,7 +279,7 @@ index 7761c349c82c..1945b4564116 100644
CONFIG_HMC6352=m CONFIG_HMC6352=m
CONFIG_HOTPLUG_PCI=y CONFIG_HOTPLUG_PCI=y
# CONFIG_HOTPLUG_PCI_SHPC is not set # CONFIG_HOTPLUG_PCI_SHPC is not set
@@ -265,7 +264,6 @@ CONFIG_IPACK_BUS=m @@ -270,7 +269,6 @@ CONFIG_IPACK_BUS=m
CONFIG_IPMI_HANDLER=m CONFIG_IPMI_HANDLER=m
# CONFIG_IP_DCCP_CCID3 is not set # CONFIG_IP_DCCP_CCID3 is not set
CONFIG_IRQ_BYPASS_MANAGER=y CONFIG_IRQ_BYPASS_MANAGER=y
@ -247,17 +288,17 @@ index 7761c349c82c..1945b4564116 100644
CONFIG_ISL29020=m CONFIG_ISL29020=m
CONFIG_JFS_FS=m CONFIG_JFS_FS=m
diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x
index 6ea96d850eae..12fbc11c1c32 100644 index 1400c2a..c955443 100644
--- a/debian.master/config/s390x/config.common.s390x --- a/debian.master/config/s390x/config.common.s390x
+++ b/debian.master/config/s390x/config.common.s390x +++ b/debian.master/config/s390x/config.common.s390x
@@ -169,7 +169,6 @@ CONFIG_GPIO_GENERIC_PLATFORM=m @@ -170,7 +170,6 @@ CONFIG_GPIO_GENERIC_PLATFORM=m
# CONFIG_HFSPLUS_FS is not set
# CONFIG_HFS_FS is not set # CONFIG_HFS_FS is not set
# CONFIG_HIBERNATION is not set
# CONFIG_HID is not set # CONFIG_HID is not set
-# CONFIG_HIO is not set -# CONFIG_HIO is not set
# CONFIG_HMC6352 is not set # CONFIG_HMC6352 is not set
CONFIG_HOTPLUG_PCI=y CONFIG_HOTPLUG_PCI=y
# CONFIG_HOTPLUG_PCI_SHPC is not set # CONFIG_HOTPLUG_PCI_SHPC is not set
-- --
2.17.1 2.7.4

2
submodules/linux-stable

@ -1 +1 @@
Subproject commit e3ac9117b18596b7363d5b7904ab03a7d782b40c Subproject commit b9bbe6ed63b2b9f2c9ee5cbd0f2c946a2723f4ce