Add Linux 5.6.19
This change updates the kernel to Linux 5.6.19 based on Ubuntu-5.7.0-10.11.
This commit is contained in:
parent
919c62f72e
commit
e0ab3fe2e3
11 changed files with 13 additions and 257977 deletions
3
.gitmodules
vendored
3
.gitmodules
vendored
|
@ -5,3 +5,6 @@
|
|||
[submodule "submodules/linux-stable"]
|
||||
path = submodules/linux-stable
|
||||
url = git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
|
||||
[submodule "submodules/ubuntu-mainline"]
|
||||
path = submodules/ubuntu-mainline
|
||||
url = git://git.launchpad.net/~ubuntu-kernel-test/ubuntu/+source/linux/+git/mainline-crack
|
||||
|
|
7
Makefile
7
Makefile
|
@ -1,7 +1,7 @@
|
|||
# also bump pve-kernel-meta if either of MAJ.MIN, PATCHLEVEL or KREL change
|
||||
KERNEL_MAJ=5
|
||||
KERNEL_MIN=6
|
||||
KERNEL_PATCHLEVEL=14
|
||||
KERNEL_PATCHLEVEL=19
|
||||
# increment KREL if the ABI changes (abicheck target in debian/rules)
|
||||
# rebuild packages with new KREL and run 'make abiupdate'
|
||||
KREL=1
|
||||
|
@ -47,7 +47,7 @@ SKIPABI=0
|
|||
|
||||
BUILD_DIR=build
|
||||
|
||||
KERNEL_SRC=linux-stable
|
||||
KERNEL_SRC=ubuntu-mainline
|
||||
KERNEL_SRC_SUBMODULE=submodules/$(KERNEL_SRC)
|
||||
KERNEL_CFG_ORG=config-${KERNEL_VER}.org
|
||||
|
||||
|
@ -110,7 +110,6 @@ ${KERNEL_SRC}.prepared: ${KERNEL_SRC_SUBMODULE}
|
|||
rm -rf ${BUILD_DIR}/${KERNEL_SRC} $@
|
||||
mkdir -p ${BUILD_DIR}
|
||||
cp -a ${KERNEL_SRC_SUBMODULE} ${BUILD_DIR}/${KERNEL_SRC}
|
||||
set -e; cd ${BUILD_DIR}/${KERNEL_SRC}; for patch in ../../patches/ubuntu/*.patch; do echo "applying Ubuntu patch '$$patch'" && patch -p1 < $${patch}; done
|
||||
# TODO: split for archs, track and diff in our repository?
|
||||
cat ${BUILD_DIR}/${KERNEL_SRC}/debian.master/config/config.common.ubuntu ${BUILD_DIR}/${KERNEL_SRC}/debian.master/config/${ARCH}/config.common.${ARCH} ${BUILD_DIR}/${KERNEL_SRC}/debian.master/config/${ARCH}/config.flavour.generic > ${KERNEL_CFG_ORG}
|
||||
cp ${KERNEL_CFG_ORG} ${BUILD_DIR}/${KERNEL_SRC}/.config
|
||||
|
@ -126,7 +125,7 @@ ${ZFSDIR}.prepared: ${ZFSONLINUX_SUBMODULE}
|
|||
rm -rf ${BUILD_DIR}/${MODULES}/${ZFSDIR} ${BUILD_DIR}/${MODULES}/tmp $@
|
||||
mkdir -p ${BUILD_DIR}/${MODULES}/tmp
|
||||
cp -a ${ZFSONLINUX_SUBMODULE}/* ${BUILD_DIR}/${MODULES}/tmp
|
||||
set -e; cd ${BUILD_DIR}/${MODULES}/tmp/upstream; for patch in ../../../../patches/zfsonlinux/*.patch; do echo "applying patch '$$patch'" && patch -p1 < $${patch}; done
|
||||
#set -e; cd ${BUILD_DIR}/${MODULES}/tmp/upstream; for patch in ../../../../patches/zfsonlinux/*.patch; do echo "applying patch '$$patch'" && patch -p1 < $${patch}; done
|
||||
cd ${BUILD_DIR}/${MODULES}/tmp; make kernel
|
||||
rm -rf ${BUILD_DIR}/${MODULES}/tmp
|
||||
touch ${ZFSDIR}.prepared
|
||||
|
|
6
debian/changelog
vendored
6
debian/changelog
vendored
|
@ -1,3 +1,9 @@
|
|||
pve-edge-kernel (5.6.19-1) edge; urgency=medium
|
||||
|
||||
* update to Linux 5.6.19-1 based on Ubuntu 5.7.0-10.11.
|
||||
|
||||
-- Fabian Mastenbroek <mail.fabianm@gmail.com> Tue, 7 Jul 2020 14:33:31 +0200
|
||||
|
||||
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
|
||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -1,27 +0,0 @@
|
|||
From 6dbe2103c375cbcb9458504b7e4fa11574b2492c Mon Sep 17 00:00:00 2001
|
||||
From: Andy Whitcroft <apw@canonical.com>
|
||||
Date: Fri, 9 Sep 2016 14:02:29 +0100
|
||||
Subject: [PATCH 2/5] UBUNTU: SAUCE: add vmlinux.strip to BOOT_TARGETS1 on
|
||||
powerpc
|
||||
|
||||
Signed-off-by: Andy Whitcroft <apw@canonical.com>
|
||||
---
|
||||
arch/powerpc/Makefile | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile
|
||||
index f357305..fbda4b5 100644
|
||||
--- a/arch/powerpc/Makefile
|
||||
+++ b/arch/powerpc/Makefile
|
||||
@@ -285,7 +285,7 @@ drivers-$(CONFIG_OPROFILE) += arch/powerpc/oprofile/
|
||||
all: zImage
|
||||
|
||||
# With make 3.82 we cannot mix normal and wildcard targets
|
||||
-BOOT_TARGETS1 := zImage zImage.initrd uImage
|
||||
+BOOT_TARGETS1 := zImage zImage.initrd uImage vmlinux.strip
|
||||
BOOT_TARGETS2 := zImage% dtbImage% treeImage.% cuImage.% simpleImage.% uImage.%
|
||||
|
||||
PHONY += $(BOOT_TARGETS1) $(BOOT_TARGETS2)
|
||||
--
|
||||
2.7.4
|
||||
|
|
@ -1,48 +0,0 @@
|
|||
From dfc279950258378c695f3e23f1af5434dc73979a Mon Sep 17 00:00:00 2001
|
||||
From: Andy Whitcroft <apw@canonical.com>
|
||||
Date: Fri, 27 May 2016 13:52:22 +0100
|
||||
Subject: [PATCH 3/5] UBUNTU: SAUCE: tools/hv/lsvmbus -- add manual page
|
||||
|
||||
BugLink: http://bugs.launchpad.net/bugs/1585311
|
||||
|
||||
Signed-off-by: Andy Whitcroft <apw@canonical.com>
|
||||
Acked-by: Tim Gardner <tim.gardner@canonical.com>
|
||||
Acked-by: Brad Figg <brad.figg@canonical.com>
|
||||
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
|
||||
---
|
||||
tools/hv/lsvmbus.8 | 23 +++++++++++++++++++++++
|
||||
1 file changed, 23 insertions(+)
|
||||
create mode 100644 tools/hv/lsvmbus.8
|
||||
|
||||
diff --git a/tools/hv/lsvmbus.8 b/tools/hv/lsvmbus.8
|
||||
new file mode 100644
|
||||
index 00000000..ba07d664
|
||||
--- /dev/null
|
||||
+++ b/tools/hv/lsvmbus.8
|
||||
@@ -0,0 +1,23 @@
|
||||
+.\" This page Copyright (C) 2016 Andy Whitcroft <apw@canonical.com>
|
||||
+.\" Distributed under the GPL v2 or later.
|
||||
+.TH LSVMBUS 8
|
||||
+.SH NAME
|
||||
+lsvmbus \- List Hyper-V VMBus devices
|
||||
+.SH SYNOPSIS
|
||||
+.ft B
|
||||
+.B lsvmbus [-vv]
|
||||
+.br
|
||||
+.SH DESCRIPTION
|
||||
+\fBlsvmbus\fP
|
||||
+displays devices attached to the Hyper-V VMBus.
|
||||
+.SH OPTIONS
|
||||
+.\"
|
||||
+.TP
|
||||
+.B -v
|
||||
+With -v more information is printed including the VMBus Rel_ID, class ID,
|
||||
+Rel_ID, and which channel is bound to which virtual processor. Use -vv
|
||||
+for additional detail including the Device_ID and the sysfs path.
|
||||
+.\"
|
||||
+.SH AUTHORS
|
||||
+.nf
|
||||
+Written by Dexuan Cui <decui@microsoft.com>
|
||||
--
|
||||
2.7.4
|
||||
|
File diff suppressed because it is too large
Load diff
|
@ -1,263 +0,0 @@
|
|||
From 6a36a80309a4935b5febf43c7e25047fb2910b5a Mon Sep 17 00:00:00 2001
|
||||
From: "Kernel Builder (sita)" <ubuntu-kernel-bot@canonical.com>
|
||||
Date: Thu, 23 Apr 2020 09:33:59 +0000
|
||||
Subject: [PATCH 5/5] configs (based on Ubuntu-5.6.0-7.7)
|
||||
|
||||
---
|
||||
debian.master/config/amd64/config.common.amd64 | 1 -
|
||||
.../config/amd64/config.flavour.generic | 1 -
|
||||
.../config/amd64/config.flavour.lowlatency | 1 -
|
||||
debian.master/config/arm64/config.common.arm64 | 4 +---
|
||||
debian.master/config/armhf/config.common.armhf | 2 --
|
||||
debian.master/config/config.common.ubuntu | 17 +++--------------
|
||||
debian.master/config/i386/config.common.i386 | 1 -
|
||||
.../config/i386/config.flavour.generic | 1 -
|
||||
.../config/i386/config.flavour.lowlatency | 1 -
|
||||
.../config/ppc64el/config.common.ppc64el | 2 --
|
||||
debian.master/config/s390x/config.common.s390x | 1 -
|
||||
11 files changed, 4 insertions(+), 28 deletions(-)
|
||||
|
||||
diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
|
||||
index a473a9a03a7f..d0098d1ed9c1 100644
|
||||
--- a/debian.master/config/amd64/config.common.amd64
|
||||
+++ b/debian.master/config/amd64/config.common.amd64
|
||||
@@ -183,7 +183,6 @@ CONFIG_HFSPLUS_FS=m
|
||||
CONFIG_HFS_FS=m
|
||||
CONFIG_HIBERNATION=y
|
||||
CONFIG_HID=m
|
||||
-CONFIG_HIO=m
|
||||
CONFIG_HMC6352=m
|
||||
CONFIG_HOTPLUG_PCI=y
|
||||
CONFIG_HOTPLUG_PCI_SHPC=y
|
||||
diff --git a/debian.master/config/amd64/config.flavour.generic b/debian.master/config/amd64/config.flavour.generic
|
||||
index d1662374ea94..5938d9ba3f6c 100644
|
||||
--- a/debian.master/config/amd64/config.flavour.generic
|
||||
+++ b/debian.master/config/amd64/config.flavour.generic
|
||||
@@ -4,7 +4,6 @@
|
||||
CONFIG_HZ=250
|
||||
# CONFIG_HZ_1000 is not set
|
||||
CONFIG_HZ_250=y
|
||||
-# CONFIG_IRQ_FORCED_THREADING_DEFAULT is not set
|
||||
# CONFIG_LATENCYTOP is not set
|
||||
# CONFIG_PREEMPT is not set
|
||||
CONFIG_PREEMPT_VOLUNTARY=y
|
||||
diff --git a/debian.master/config/amd64/config.flavour.lowlatency b/debian.master/config/amd64/config.flavour.lowlatency
|
||||
index 814348dc984b..42de09fb0bff 100644
|
||||
--- a/debian.master/config/amd64/config.flavour.lowlatency
|
||||
+++ b/debian.master/config/amd64/config.flavour.lowlatency
|
||||
@@ -4,7 +4,6 @@
|
||||
CONFIG_HZ=1000
|
||||
CONFIG_HZ_1000=y
|
||||
# CONFIG_HZ_250 is not set
|
||||
-CONFIG_IRQ_FORCED_THREADING_DEFAULT=y
|
||||
CONFIG_LATENCYTOP=y
|
||||
CONFIG_PREEMPT=y
|
||||
# CONFIG_PREEMPT_VOLUNTARY is not set
|
||||
diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
|
||||
index dfe622def83c..69180578ddf4 100644
|
||||
--- a/debian.master/config/arm64/config.common.arm64
|
||||
+++ b/debian.master/config/arm64/config.common.arm64
|
||||
@@ -165,7 +165,7 @@ CONFIG_FEALNX=m
|
||||
CONFIG_FIREWIRE=m
|
||||
CONFIG_FIREWIRE_NOSY=m
|
||||
CONFIG_FIXED_PHY=y
|
||||
-CONFIG_FORCE_MAX_ZONEORDER=13
|
||||
+CONFIG_FORCE_MAX_ZONEORDER=11
|
||||
CONFIG_FPGA_BRIDGE=m
|
||||
CONFIG_FPGA_DFL=m
|
||||
CONFIG_FRAME_WARN=1024
|
||||
@@ -195,7 +195,6 @@ CONFIG_HFSPLUS_FS=m
|
||||
CONFIG_HFS_FS=m
|
||||
# CONFIG_HIBERNATION is not set
|
||||
CONFIG_HID=m
|
||||
-# CONFIG_HIO is not set
|
||||
CONFIG_HMC6352=m
|
||||
CONFIG_HOTPLUG_PCI=y
|
||||
CONFIG_HOTPLUG_PCI_SHPC=y
|
||||
@@ -283,7 +282,6 @@ CONFIG_IPMI_HANDLER=m
|
||||
# CONFIG_IPMMU_VMSA is not set
|
||||
# CONFIG_IP_DCCP_CCID3 is not set
|
||||
CONFIG_IRQ_BYPASS_MANAGER=y
|
||||
-# CONFIG_IRQ_FORCED_THREADING_DEFAULT is not set
|
||||
CONFIG_ISL29003=m
|
||||
CONFIG_ISL29020=m
|
||||
CONFIG_JFS_FS=m
|
||||
diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
|
||||
index 5407bc1cd66b..97651f0e6512 100644
|
||||
--- a/debian.master/config/armhf/config.common.armhf
|
||||
+++ b/debian.master/config/armhf/config.common.armhf
|
||||
@@ -184,7 +184,6 @@ CONFIG_HFSPLUS_FS=m
|
||||
CONFIG_HFS_FS=m
|
||||
CONFIG_HIBERNATION=y
|
||||
CONFIG_HID=m
|
||||
-# CONFIG_HIO is not set
|
||||
CONFIG_HMC6352=m
|
||||
# CONFIG_HOTPLUG_PCI is not set
|
||||
CONFIG_HPFS_FS=m
|
||||
@@ -267,7 +266,6 @@ CONFIG_IPACK_BUS=m
|
||||
CONFIG_IPMI_HANDLER=m
|
||||
CONFIG_IPMMU_VMSA=y
|
||||
# CONFIG_IP_DCCP_CCID3 is not set
|
||||
-# CONFIG_IRQ_FORCED_THREADING_DEFAULT is not set
|
||||
CONFIG_ISL29003=m
|
||||
CONFIG_ISL29020=m
|
||||
CONFIG_JFS_FS=m
|
||||
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
|
||||
index b63878493c30..c26dcf10c136 100644
|
||||
--- a/debian.master/config/config.common.ubuntu
|
||||
+++ b/debian.master/config/config.common.ubuntu
|
||||
@@ -281,10 +281,7 @@ CONFIG_AMD_XGBE_DCB=y
|
||||
CONFIG_AMD_XGBE_HAVE_ECC=y
|
||||
CONFIG_AMILO_RFKILL=m
|
||||
CONFIG_AMLOGIC_THERMAL=m
|
||||
-CONFIG_ANDROID_BINDERFS=m
|
||||
-CONFIG_ANDROID_BINDER_DEVICES=""
|
||||
-CONFIG_ANDROID_BINDER_IPC=m
|
||||
-# CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set
|
||||
+# CONFIG_ANDROID_BINDER_IPC is not set
|
||||
CONFIG_APB_TIMER=y
|
||||
CONFIG_APDS9300=m
|
||||
CONFIG_APDS9960=m
|
||||
@@ -767,7 +764,7 @@ CONFIG_ARM_TI_CPUFREQ=y
|
||||
CONFIG_ARM_VEXPRESS_SPC_CPUFREQ=m
|
||||
CONFIG_ARM_VIRT_EXT=y
|
||||
CONFIG_AS3935=m
|
||||
-CONFIG_ASHMEM=m
|
||||
+# CONFIG_ASHMEM is not set
|
||||
CONFIG_ASN1=y
|
||||
CONFIG_ASPEED_ADC=m
|
||||
CONFIG_ASPEED_BT_IPMI_BMC=m
|
||||
@@ -2436,7 +2433,6 @@ CONFIG_DELL_SMBIOS=m
|
||||
CONFIG_DELL_SMBIOS_SMM=y
|
||||
CONFIG_DELL_SMBIOS_WMI=y
|
||||
CONFIG_DELL_SMO8800=m
|
||||
-CONFIG_DELL_UART_BACKLIGHT=m
|
||||
CONFIG_DELL_WMI=m
|
||||
CONFIG_DELL_WMI_AIO=m
|
||||
CONFIG_DELL_WMI_DESCRIPTOR=m
|
||||
@@ -3546,7 +3542,7 @@ CONFIG_GAMEPORT_L4=m
|
||||
CONFIG_GAMEPORT_NS558=m
|
||||
CONFIG_GARP=m
|
||||
CONFIG_GART_IOMMU=y
|
||||
-CONFIG_GCC_VERSION=90201
|
||||
+CONFIG_GCC_VERSION=90300
|
||||
# CONFIG_GCOV_KERNEL is not set
|
||||
CONFIG_GDB_SCRIPTS=y
|
||||
CONFIG_GEMINI_ETHERNET=m
|
||||
@@ -5338,7 +5334,6 @@ CONFIG_LOCKDEP_SUPPORT=y
|
||||
CONFIG_LOCKD_V4=y
|
||||
CONFIG_LOCKUP_DETECTOR=y
|
||||
CONFIG_LOCK_DEBUGGING_SUPPORT=y
|
||||
-CONFIG_LOCK_DOWN_IN_SECURE_BOOT=y
|
||||
# CONFIG_LOCK_DOWN_KERNEL_FORCE_CONFIDENTIALITY is not set
|
||||
# CONFIG_LOCK_DOWN_KERNEL_FORCE_INTEGRITY is not set
|
||||
CONFIG_LOCK_DOWN_KERNEL_FORCE_NONE=y
|
||||
@@ -8451,14 +8446,12 @@ CONFIG_RTLWIFI_USB=m
|
||||
CONFIG_RTL_CARDS=m
|
||||
CONFIG_RTS5208=m
|
||||
CONFIG_RTW88=m
|
||||
-CONFIG_RTW88_8723DE=y
|
||||
CONFIG_RTW88_8822BE=y
|
||||
CONFIG_RTW88_8822CE=y
|
||||
CONFIG_RTW88_CORE=m
|
||||
CONFIG_RTW88_DEBUG=y
|
||||
CONFIG_RTW88_DEBUGFS=y
|
||||
CONFIG_RTW88_PCI=m
|
||||
-# CONFIG_RTW88_REGD_USER_REG_HINTS is not set
|
||||
# CONFIG_RT_GROUP_SCHED is not set
|
||||
CONFIG_RT_MUTEXES=y
|
||||
CONFIG_RUNTIME_TESTING_MENU=y
|
||||
@@ -9046,8 +9039,6 @@ CONFIG_SGI_XP=m
|
||||
CONFIG_SGL_ALLOC=y
|
||||
CONFIG_SG_POOL=y
|
||||
CONFIG_SG_SPLIT=y
|
||||
-CONFIG_SHIFT_FS=m
|
||||
-CONFIG_SHIFT_FS_POSIX_ACL=y
|
||||
CONFIG_SHMEM=y
|
||||
CONFIG_SHUFFLE_PAGE_ALLOCATOR=y
|
||||
CONFIG_SH_ETH=m
|
||||
@@ -11143,7 +11134,6 @@ CONFIG_VCNL4035=m
|
||||
CONFIG_VDSO=y
|
||||
CONFIG_VEML6030=m
|
||||
CONFIG_VEML6070=m
|
||||
-CONFIG_VERSION_SIGNATURE=""
|
||||
CONFIG_VETH=m
|
||||
CONFIG_VEXPRESS_CONFIG=y
|
||||
CONFIG_VEXPRESS_SYSCFG=y
|
||||
@@ -11577,7 +11567,6 @@ CONFIG_WATCHDOG_RTAS=m
|
||||
CONFIG_WATCHDOG_SYSFS=y
|
||||
CONFIG_WCN36XX=m
|
||||
# CONFIG_WCN36XX_DEBUGFS is not set
|
||||
-# CONFIG_WCN36XX_SNAPDRAGON_HACKS is not set
|
||||
CONFIG_WD80x3=m
|
||||
CONFIG_WDAT_WDT=m
|
||||
CONFIG_WDT=m
|
||||
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
|
||||
index 52b30381e1b2..0268d7a4c6da 100644
|
||||
--- a/debian.master/config/i386/config.common.i386
|
||||
+++ b/debian.master/config/i386/config.common.i386
|
||||
@@ -180,7 +180,6 @@ CONFIG_HFSPLUS_FS=m
|
||||
CONFIG_HFS_FS=m
|
||||
CONFIG_HIBERNATION=y
|
||||
CONFIG_HID=m
|
||||
-CONFIG_HIO=m
|
||||
CONFIG_HMC6352=m
|
||||
CONFIG_HOTPLUG_PCI=y
|
||||
CONFIG_HOTPLUG_PCI_SHPC=y
|
||||
diff --git a/debian.master/config/i386/config.flavour.generic b/debian.master/config/i386/config.flavour.generic
|
||||
index 5c2e4e1d3a9f..965113b110ce 100644
|
||||
--- a/debian.master/config/i386/config.flavour.generic
|
||||
+++ b/debian.master/config/i386/config.flavour.generic
|
||||
@@ -4,6 +4,5 @@
|
||||
CONFIG_HZ=250
|
||||
# CONFIG_HZ_1000 is not set
|
||||
CONFIG_HZ_250=y
|
||||
-# CONFIG_IRQ_FORCED_THREADING_DEFAULT is not set
|
||||
# CONFIG_PREEMPT is not set
|
||||
CONFIG_PREEMPT_VOLUNTARY=y
|
||||
diff --git a/debian.master/config/i386/config.flavour.lowlatency b/debian.master/config/i386/config.flavour.lowlatency
|
||||
index 6b121e3f433b..0af82e00adce 100644
|
||||
--- a/debian.master/config/i386/config.flavour.lowlatency
|
||||
+++ b/debian.master/config/i386/config.flavour.lowlatency
|
||||
@@ -4,6 +4,5 @@
|
||||
CONFIG_HZ=1000
|
||||
CONFIG_HZ_1000=y
|
||||
# CONFIG_HZ_250 is not set
|
||||
-CONFIG_IRQ_FORCED_THREADING_DEFAULT=y
|
||||
CONFIG_PREEMPT=y
|
||||
# CONFIG_PREEMPT_VOLUNTARY is not set
|
||||
diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el
|
||||
index 7761c349c82c..1945b4564116 100644
|
||||
--- a/debian.master/config/ppc64el/config.common.ppc64el
|
||||
+++ b/debian.master/config/ppc64el/config.common.ppc64el
|
||||
@@ -182,7 +182,6 @@ CONFIG_HFSPLUS_FS=m
|
||||
CONFIG_HFS_FS=m
|
||||
# CONFIG_HIBERNATION is not set
|
||||
CONFIG_HID=m
|
||||
-# CONFIG_HIO is not set
|
||||
CONFIG_HMC6352=m
|
||||
CONFIG_HOTPLUG_PCI=y
|
||||
# CONFIG_HOTPLUG_PCI_SHPC is not set
|
||||
@@ -265,7 +264,6 @@ CONFIG_IPACK_BUS=m
|
||||
CONFIG_IPMI_HANDLER=m
|
||||
# CONFIG_IP_DCCP_CCID3 is not set
|
||||
CONFIG_IRQ_BYPASS_MANAGER=y
|
||||
-# CONFIG_IRQ_FORCED_THREADING_DEFAULT is not set
|
||||
CONFIG_ISL29003=m
|
||||
CONFIG_ISL29020=m
|
||||
CONFIG_JFS_FS=m
|
||||
diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x
|
||||
index 6ea96d850eae..12fbc11c1c32 100644
|
||||
--- a/debian.master/config/s390x/config.common.s390x
|
||||
+++ b/debian.master/config/s390x/config.common.s390x
|
||||
@@ -169,7 +169,6 @@ CONFIG_GPIO_GENERIC_PLATFORM=m
|
||||
# CONFIG_HFS_FS is not set
|
||||
# CONFIG_HIBERNATION is not set
|
||||
# CONFIG_HID is not set
|
||||
-# CONFIG_HIO is not set
|
||||
# CONFIG_HMC6352 is not set
|
||||
CONFIG_HOTPLUG_PCI=y
|
||||
# CONFIG_HOTPLUG_PCI_SHPC is not set
|
||||
--
|
||||
2.17.1
|
||||
|
File diff suppressed because it is too large
Load diff
|
@ -1 +0,0 @@
|
|||
Subproject commit e3ac9117b18596b7363d5b7904ab03a7d782b40c
|
1
submodules/ubuntu-mainline
Submodule
1
submodules/ubuntu-mainline
Submodule
|
@ -0,0 +1 @@
|
|||
Subproject commit f9b928bee2e01eb6c2fd309e318dd27130118131
|
Loading…
Reference in a new issue