|
|
@@ -1,7 +1,7 @@
|
|
|
-From d3b5fe8d750339adfa962a84b3d42b47a6113424 Mon Sep 17 00:00:00 2001
|
|
|
+From f15a8dcb1b760087b0b4e7298a901969cee384f7 Mon Sep 17 00:00:00 2001
|
|
|
From: "Kernel Builder (tangerine)" <[email protected]>
|
|
|
-Date: Sun, 17 May 2020 20:31:28 -0400
|
|
|
-Subject: [PATCH 5/5] configs (based on Ubuntu-5.7.0-3.4)
|
|
|
+Date: Sun, 31 May 2020 21:31:26 -0400
|
|
|
+Subject: [PATCH 5/5] configs (based on Ubuntu-5.7.0-5.6)
|
|
|
|
|
|
---
|
|
|
debian.master/config/amd64/config.common.amd64 | 1 -
|
|
|
@@ -9,16 +9,16 @@ Subject: [PATCH 5/5] configs (based on Ubuntu-5.7.0-3.4)
|
|
|
.../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 | 37 ++--------------------
|
|
|
+ debian.master/config/config.common.ubuntu | 35 ++--------------------
|
|
|
debian.master/config/i386/config.common.i386 | 1 -
|
|
|
debian.master/config/i386/config.flavour.generic | 1 -
|
|
|
.../config/i386/config.flavour.lowlatency | 1 -
|
|
|
debian.master/config/ppc64el/config.common.ppc64el | 2 --
|
|
|
debian.master/config/s390x/config.common.s390x | 1 -
|
|
|
- 11 files changed, 4 insertions(+), 48 deletions(-)
|
|
|
+ 11 files changed, 3 insertions(+), 47 deletions(-)
|
|
|
|
|
|
diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
|
|
|
-index 85ff9dc..fef3036 100644
|
|
|
+index 11d4bde..2a209f3 100644
|
|
|
--- a/debian.master/config/amd64/config.common.amd64
|
|
|
+++ b/debian.master/config/amd64/config.common.amd64
|
|
|
@@ -185,7 +185,6 @@ CONFIG_HFSPLUS_FS=m
|
|
|
@@ -54,7 +54,7 @@ index 814348d..42de09f 100644
|
|
|
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 b2f8a3c1..ab96a76 100644
|
|
|
+index 8a04a5d..b09ed523e 100644
|
|
|
--- a/debian.master/config/arm64/config.common.arm64
|
|
|
+++ b/debian.master/config/arm64/config.common.arm64
|
|
|
@@ -166,7 +166,7 @@ CONFIG_FEALNX=m
|
|
|
@@ -83,7 +83,7 @@ index b2f8a3c1..ab96a76 100644
|
|
|
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 b5a5f76..1fd6228 100644
|
|
|
+index b6521d7..413dbe0 100644
|
|
|
--- a/debian.master/config/armhf/config.common.armhf
|
|
|
+++ b/debian.master/config/armhf/config.common.armhf
|
|
|
@@ -186,7 +186,6 @@ CONFIG_HFSPLUS_FS=m
|
|
|
@@ -103,7 +103,7 @@ index b5a5f76..1fd6228 100644
|
|
|
CONFIG_ISL29020=m
|
|
|
CONFIG_JFS_FS=m
|
|
|
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
|
|
|
-index 298d45c..9650399 100644
|
|
|
+index b885530..9052767 100644
|
|
|
--- a/debian.master/config/config.common.ubuntu
|
|
|
+++ b/debian.master/config/config.common.ubuntu
|
|
|
@@ -283,10 +283,7 @@ CONFIG_AMD_XGBE_DCB=y
|
|
|
@@ -118,15 +118,7 @@ index 298d45c..9650399 100644
|
|
|
CONFIG_APB_TIMER=y
|
|
|
CONFIG_APDS9300=m
|
|
|
CONFIG_APDS9960=m
|
|
|
-@@ -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
|
|
|
+@@ -773,7 +770,7 @@ CONFIG_ARM_TI_CPUFREQ=y
|
|
|
CONFIG_ARM_VEXPRESS_SPC_CPUFREQ=m
|
|
|
CONFIG_ARM_VIRT_EXT=y
|
|
|
CONFIG_AS3935=m
|
|
|
@@ -135,7 +127,7 @@ index 298d45c..9650399 100644
|
|
|
CONFIG_ASN1=y
|
|
|
CONFIG_ASPEED_ADC=m
|
|
|
CONFIG_ASPEED_BT_IPMI_BMC=m
|
|
|
-@@ -908,25 +906,6 @@ CONFIG_AUDIT_ARCH=y
|
|
|
+@@ -909,25 +906,6 @@ CONFIG_AUDIT_ARCH=y
|
|
|
CONFIG_AUDIT_ARCH_COMPAT_GENERIC=y
|
|
|
CONFIG_AUDIT_COMPAT_GENERIC=y
|
|
|
CONFIG_AUDIT_GENERIC=y
|
|
|
@@ -161,7 +153,7 @@ index 298d45c..9650399 100644
|
|
|
CONFIG_AURORA_NB8800=m
|
|
|
CONFIG_AUTO_ZRELADDR=y
|
|
|
CONFIG_AX25=m
|
|
|
-@@ -2480,7 +2459,6 @@ CONFIG_DELL_SMBIOS=m
|
|
|
+@@ -2481,7 +2459,6 @@ CONFIG_DELL_SMBIOS=m
|
|
|
CONFIG_DELL_SMBIOS_SMM=y
|
|
|
CONFIG_DELL_SMBIOS_WMI=y
|
|
|
CONFIG_DELL_SMO8800=m
|
|
|
@@ -169,7 +161,7 @@ index 298d45c..9650399 100644
|
|
|
CONFIG_DELL_WMI=m
|
|
|
CONFIG_DELL_WMI_AIO=m
|
|
|
CONFIG_DELL_WMI_DESCRIPTOR=m
|
|
|
-@@ -5186,7 +5164,6 @@ CONFIG_KGDB_KDB=y
|
|
|
+@@ -5187,7 +5164,6 @@ CONFIG_KGDB_KDB=y
|
|
|
CONFIG_KGDB_LOW_LEVEL_TRAP=y
|
|
|
CONFIG_KGDB_SERIAL_CONSOLE=y
|
|
|
# CONFIG_KGDB_TESTS is not set
|
|
|
@@ -177,7 +169,7 @@ index 298d45c..9650399 100644
|
|
|
CONFIG_KMX61=m
|
|
|
CONFIG_KPC2000=y
|
|
|
CONFIG_KPC2000_CORE=m
|
|
|
-@@ -5414,7 +5391,6 @@ CONFIG_LOCKDEP_SUPPORT=y
|
|
|
+@@ -5415,7 +5391,6 @@ CONFIG_LOCKDEP_SUPPORT=y
|
|
|
CONFIG_LOCKD_V4=y
|
|
|
CONFIG_LOCKUP_DETECTOR=y
|
|
|
CONFIG_LOCK_DEBUGGING_SUPPORT=y
|
|
|
@@ -185,7 +177,7 @@ index 298d45c..9650399 100644
|
|
|
# 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
|
|
|
-@@ -8556,14 +8532,12 @@ CONFIG_RTLWIFI_USB=m
|
|
|
+@@ -8556,14 +8531,12 @@ CONFIG_RTLWIFI_USB=m
|
|
|
CONFIG_RTL_CARDS=m
|
|
|
CONFIG_RTS5208=m
|
|
|
CONFIG_RTW88=m
|
|
|
@@ -200,7 +192,7 @@ index 298d45c..9650399 100644
|
|
|
# CONFIG_RT_GROUP_SCHED is not set
|
|
|
CONFIG_RT_MUTEXES=y
|
|
|
CONFIG_RUNTIME_TESTING_MENU=y
|
|
|
-@@ -9156,8 +9130,6 @@ CONFIG_SGI_XP=m
|
|
|
+@@ -9156,8 +9129,6 @@ CONFIG_SGI_XP=m
|
|
|
CONFIG_SGL_ALLOC=y
|
|
|
CONFIG_SG_POOL=y
|
|
|
CONFIG_SG_SPLIT=y
|
|
|
@@ -209,15 +201,7 @@ index 298d45c..9650399 100644
|
|
|
CONFIG_SHMEM=y
|
|
|
CONFIG_SHUFFLE_PAGE_ALLOCATOR=y
|
|
|
CONFIG_SH_ETH=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
|
|
|
+@@ -11264,7 +11235,6 @@ CONFIG_VDPA_SIM=m
|
|
|
CONFIG_VDSO=y
|
|
|
CONFIG_VEML6030=m
|
|
|
CONFIG_VEML6070=m
|
|
|
@@ -225,7 +209,7 @@ index 298d45c..9650399 100644
|
|
|
CONFIG_VETH=m
|
|
|
CONFIG_VEXPRESS_CONFIG=y
|
|
|
CONFIG_VEXPRESS_SYSCFG=y
|
|
|
-@@ -11706,7 +11676,6 @@ CONFIG_WATCHDOG_RTAS=m
|
|
|
+@@ -11705,7 +11675,6 @@ CONFIG_WATCHDOG_RTAS=m
|
|
|
CONFIG_WATCHDOG_SYSFS=y
|
|
|
CONFIG_WCN36XX=m
|
|
|
# CONFIG_WCN36XX_DEBUGFS is not set
|
|
|
@@ -234,7 +218,7 @@ index 298d45c..9650399 100644
|
|
|
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 82398ce..d23088b 100644
|
|
|
+index e62994c..821f0a4 100644
|
|
|
--- a/debian.master/config/i386/config.common.i386
|
|
|
+++ b/debian.master/config/i386/config.common.i386
|
|
|
@@ -182,7 +182,6 @@ CONFIG_HFSPLUS_FS=m
|
|
|
@@ -268,7 +252,7 @@ index 6b121e3..0af82e0 100644
|
|
|
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 c0c01a8..f66726e 100644
|
|
|
+index 729f8e2..fba24cc 100644
|
|
|
--- a/debian.master/config/ppc64el/config.common.ppc64el
|
|
|
+++ b/debian.master/config/ppc64el/config.common.ppc64el
|
|
|
@@ -184,7 +184,6 @@ CONFIG_HFSPLUS_FS=m
|
|
|
@@ -288,7 +272,7 @@ index c0c01a8..f66726e 100644
|
|
|
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 1400c2a..c955443 100644
|
|
|
+index 4fdac22..5c58a16 100644
|
|
|
--- a/debian.master/config/s390x/config.common.s390x
|
|
|
+++ b/debian.master/config/s390x/config.common.s390x
|
|
|
@@ -170,7 +170,6 @@ CONFIG_GPIO_GENERIC_PLATFORM=m
|