Skip to content
This repository was archived by the owner on Feb 18, 2022. It is now read-only.

Commit d6ac786

Browse files
marcosfadmarcosfad
committed
Revert "Update Ubuntu's patch 0005"
This reverts commit 1323a94
1 parent 1323a94 commit d6ac786

1 file changed

Lines changed: 53 additions & 87 deletions

File tree

patches/0005-configs-based-on-Ubuntu-5.7.0-6.7.patch renamed to patches/0005-configs-based-on-Ubuntu-5.6.0-7.7.patch

Lines changed: 53 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
1-
From c3bc0f62079428513e0fbdad1aefe029f769b603 Mon Sep 17 00:00:00 2001
1+
From 42050990dc22431d045070866b3425fa845eea22 Mon Sep 17 00:00:00 2001
22
From: "Kernel Builder (sita)" <ubuntu-kernel-bot@canonical.com>
3-
Date: Sun, 7 Jun 2020 12:31:27 +0000
4-
Subject: [PATCH 5/5] configs (based on Ubuntu-5.7.0-6.7)
3+
Date: Fri, 17 Apr 2020 16:30:43 +0000
4+
Subject: [PATCH 5/5] configs (based on Ubuntu-5.6.0-7.7)
55

66
---
7-
.../config/amd64/config.common.amd64 | 1 -
8-
.../config/amd64/config.flavour.generic | 1 -
9-
.../config/amd64/config.flavour.lowlatency | 1 -
10-
.../config/arm64/config.common.arm64 | 4 +-
11-
.../config/armhf/config.common.armhf | 2 -
12-
debian.master/config/config.common.ubuntu | 37 +------------------
13-
debian.master/config/i386/config.common.i386 | 1 -
14-
.../config/i386/config.flavour.generic | 1 -
15-
.../config/i386/config.flavour.lowlatency | 1 -
16-
.../config/ppc64el/config.common.ppc64el | 2 -
17-
.../config/s390x/config.common.s390x | 1 -
18-
11 files changed, 3 insertions(+), 49 deletions(-)
7+
debian.master/config/amd64/config.common.amd64 | 1 -
8+
.../config/amd64/config.flavour.generic | 1 -
9+
.../config/amd64/config.flavour.lowlatency | 1 -
10+
debian.master/config/arm64/config.common.arm64 | 4 +---
11+
debian.master/config/armhf/config.common.armhf | 2 --
12+
debian.master/config/config.common.ubuntu | 17 +++--------------
13+
debian.master/config/i386/config.common.i386 | 1 -
14+
.../config/i386/config.flavour.generic | 1 -
15+
.../config/i386/config.flavour.lowlatency | 1 -
16+
.../config/ppc64el/config.common.ppc64el | 2 --
17+
debian.master/config/s390x/config.common.s390x | 1 -
18+
11 files changed, 4 insertions(+), 28 deletions(-)
1919

2020
diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
21-
index 11d4bde9d612..2a209f34db83 100644
21+
index a473a9a03a7f..d0098d1ed9c1 100644
2222
--- a/debian.master/config/amd64/config.common.amd64
2323
+++ b/debian.master/config/amd64/config.common.amd64
24-
@@ -185,7 +185,6 @@ CONFIG_HFSPLUS_FS=m
24+
@@ -183,7 +183,6 @@ CONFIG_HFSPLUS_FS=m
2525
CONFIG_HFS_FS=m
2626
CONFIG_HIBERNATION=y
2727
CONFIG_HID=m
@@ -54,10 +54,10 @@ index 814348dc984b..42de09fb0bff 100644
5454
CONFIG_PREEMPT=y
5555
# CONFIG_PREEMPT_VOLUNTARY is not set
5656
diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
57-
index 8a04a5dea27c..b09ed523e18d 100644
57+
index dfe622def83c..69180578ddf4 100644
5858
--- a/debian.master/config/arm64/config.common.arm64
5959
+++ b/debian.master/config/arm64/config.common.arm64
60-
@@ -166,7 +166,7 @@ CONFIG_FEALNX=m
60+
@@ -165,7 +165,7 @@ CONFIG_FEALNX=m
6161
CONFIG_FIREWIRE=m
6262
CONFIG_FIREWIRE_NOSY=m
6363
CONFIG_FIXED_PHY=y
@@ -66,15 +66,15 @@ index 8a04a5dea27c..b09ed523e18d 100644
6666
CONFIG_FPGA_BRIDGE=m
6767
CONFIG_FPGA_DFL=m
6868
CONFIG_FRAME_WARN=1024
69-
@@ -197,7 +197,6 @@ CONFIG_HFSPLUS_FS=m
69+
@@ -195,7 +195,6 @@ CONFIG_HFSPLUS_FS=m
7070
CONFIG_HFS_FS=m
7171
# CONFIG_HIBERNATION is not set
7272
CONFIG_HID=m
7373
-# CONFIG_HIO is not set
7474
CONFIG_HMC6352=m
7575
CONFIG_HOTPLUG_PCI=y
7676
CONFIG_HOTPLUG_PCI_SHPC=y
77-
@@ -287,7 +286,6 @@ CONFIG_IPMI_HANDLER=m
77+
@@ -283,7 +282,6 @@ CONFIG_IPMI_HANDLER=m
7878
# CONFIG_IPMMU_VMSA is not set
7979
# CONFIG_IP_DCCP_CCID3 is not set
8080
CONFIG_IRQ_BYPASS_MANAGER=y
@@ -83,30 +83,30 @@ index 8a04a5dea27c..b09ed523e18d 100644
8383
CONFIG_ISL29020=m
8484
CONFIG_JFS_FS=m
8585
diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
86-
index b6521d7ec3ba..413dbe0d70ad 100644
86+
index 5407bc1cd66b..97651f0e6512 100644
8787
--- a/debian.master/config/armhf/config.common.armhf
8888
+++ b/debian.master/config/armhf/config.common.armhf
89-
@@ -186,7 +186,6 @@ CONFIG_HFSPLUS_FS=m
89+
@@ -184,7 +184,6 @@ CONFIG_HFSPLUS_FS=m
9090
CONFIG_HFS_FS=m
9191
CONFIG_HIBERNATION=y
9292
CONFIG_HID=m
9393
-# CONFIG_HIO is not set
9494
CONFIG_HMC6352=m
9595
# CONFIG_HOTPLUG_PCI is not set
9696
CONFIG_HPFS_FS=m
97-
@@ -272,7 +271,6 @@ CONFIG_IPMI_HANDLER=m
97+
@@ -267,7 +266,6 @@ CONFIG_IPACK_BUS=m
98+
CONFIG_IPMI_HANDLER=m
9899
CONFIG_IPMMU_VMSA=y
99100
# CONFIG_IP_DCCP_CCID3 is not set
100-
CONFIG_IRQ_BYPASS_MANAGER=m
101101
-# CONFIG_IRQ_FORCED_THREADING_DEFAULT is not set
102102
CONFIG_ISL29003=m
103103
CONFIG_ISL29020=m
104104
CONFIG_JFS_FS=m
105105
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
106-
index a274792c072a..12410e033315 100644
106+
index b63878493c30..c26dcf10c136 100644
107107
--- a/debian.master/config/config.common.ubuntu
108108
+++ b/debian.master/config/config.common.ubuntu
109-
@@ -283,10 +283,7 @@ CONFIG_AMD_XGBE_DCB=y
109+
@@ -281,10 +281,7 @@ CONFIG_AMD_XGBE_DCB=y
110110
CONFIG_AMD_XGBE_HAVE_ECC=y
111111
CONFIG_AMILO_RFKILL=m
112112
CONFIG_AMLOGIC_THERMAL=m
@@ -118,7 +118,7 @@ index a274792c072a..12410e033315 100644
118118
CONFIG_APB_TIMER=y
119119
CONFIG_APDS9300=m
120120
CONFIG_APDS9960=m
121-
@@ -773,7 +770,7 @@ CONFIG_ARM_TI_CPUFREQ=y
121+
@@ -767,7 +764,7 @@ CONFIG_ARM_TI_CPUFREQ=y
122122
CONFIG_ARM_VEXPRESS_SPC_CPUFREQ=m
123123
CONFIG_ARM_VIRT_EXT=y
124124
CONFIG_AS3935=m
@@ -127,72 +127,47 @@ index a274792c072a..12410e033315 100644
127127
CONFIG_ASN1=y
128128
CONFIG_ASPEED_ADC=m
129129
CONFIG_ASPEED_BT_IPMI_BMC=m
130-
@@ -909,25 +906,6 @@ CONFIG_AUDIT_ARCH=y
131-
CONFIG_AUDIT_ARCH_COMPAT_GENERIC=y
132-
CONFIG_AUDIT_COMPAT_GENERIC=y
133-
CONFIG_AUDIT_GENERIC=y
134-
-CONFIG_AUFS_BDEV_LOOP=y
135-
-# CONFIG_AUFS_BRANCH_MAX_1023 is not set
136-
-CONFIG_AUFS_BRANCH_MAX_127=y
137-
-# CONFIG_AUFS_BRANCH_MAX_32767 is not set
138-
-# CONFIG_AUFS_BRANCH_MAX_511 is not set
139-
-# CONFIG_AUFS_BR_FUSE is not set
140-
-CONFIG_AUFS_BR_HFSPLUS=y
141-
-# CONFIG_AUFS_BR_RAMFS is not set
142-
-# CONFIG_AUFS_DEBUG is not set
143-
-CONFIG_AUFS_DIRREN=y
144-
-CONFIG_AUFS_EXPORT=y
145-
-# CONFIG_AUFS_FHSM is not set
146-
-CONFIG_AUFS_FS=m
147-
-# CONFIG_AUFS_HNOTIFY is not set
148-
-CONFIG_AUFS_INO_T_64=y
149-
-# CONFIG_AUFS_RDU is not set
150-
-CONFIG_AUFS_SBILIST=y
151-
-# CONFIG_AUFS_SHWH is not set
152-
-CONFIG_AUFS_XATTR=y
153-
CONFIG_AURORA_NB8800=m
154-
CONFIG_AUTO_ZRELADDR=y
155-
CONFIG_AX25=m
156-
@@ -2481,7 +2459,6 @@ CONFIG_DELL_SMBIOS=m
130+
@@ -2436,7 +2433,6 @@ CONFIG_DELL_SMBIOS=m
157131
CONFIG_DELL_SMBIOS_SMM=y
158132
CONFIG_DELL_SMBIOS_WMI=y
159133
CONFIG_DELL_SMO8800=m
160134
-CONFIG_DELL_UART_BACKLIGHT=m
161135
CONFIG_DELL_WMI=m
162136
CONFIG_DELL_WMI_AIO=m
163137
CONFIG_DELL_WMI_DESCRIPTOR=m
164-
@@ -5187,7 +5164,6 @@ CONFIG_KGDB_KDB=y
165-
CONFIG_KGDB_LOW_LEVEL_TRAP=y
166-
CONFIG_KGDB_SERIAL_CONSOLE=y
167-
# CONFIG_KGDB_TESTS is not set
168-
-CONFIG_KMSG_IDS=y
169-
CONFIG_KMX61=m
170-
CONFIG_KPC2000=y
171-
CONFIG_KPC2000_CORE=m
172-
@@ -5415,7 +5391,6 @@ CONFIG_LOCKDEP_SUPPORT=y
138+
@@ -3546,7 +3542,7 @@ CONFIG_GAMEPORT_L4=m
139+
CONFIG_GAMEPORT_NS558=m
140+
CONFIG_GARP=m
141+
CONFIG_GART_IOMMU=y
142+
-CONFIG_GCC_VERSION=90201
143+
+CONFIG_GCC_VERSION=90300
144+
# CONFIG_GCOV_KERNEL is not set
145+
CONFIG_GDB_SCRIPTS=y
146+
CONFIG_GEMINI_ETHERNET=m
147+
@@ -5338,7 +5334,6 @@ CONFIG_LOCKDEP_SUPPORT=y
173148
CONFIG_LOCKD_V4=y
174149
CONFIG_LOCKUP_DETECTOR=y
175150
CONFIG_LOCK_DEBUGGING_SUPPORT=y
176151
-CONFIG_LOCK_DOWN_IN_SECURE_BOOT=y
177152
# CONFIG_LOCK_DOWN_KERNEL_FORCE_CONFIDENTIALITY is not set
178153
# CONFIG_LOCK_DOWN_KERNEL_FORCE_INTEGRITY is not set
179154
CONFIG_LOCK_DOWN_KERNEL_FORCE_NONE=y
180-
@@ -8556,14 +8531,12 @@ CONFIG_RTLWIFI_USB=m
155+
@@ -8451,14 +8446,12 @@ CONFIG_RTLWIFI_USB=m
181156
CONFIG_RTL_CARDS=m
182157
CONFIG_RTS5208=m
183158
CONFIG_RTW88=m
184159
-CONFIG_RTW88_8723DE=y
185160
CONFIG_RTW88_8822BE=y
186161
CONFIG_RTW88_8822CE=y
187162
CONFIG_RTW88_CORE=m
188-
# CONFIG_RTW88_DEBUG is not set
189-
# CONFIG_RTW88_DEBUGFS is not set
163+
CONFIG_RTW88_DEBUG=y
164+
CONFIG_RTW88_DEBUGFS=y
190165
CONFIG_RTW88_PCI=m
191166
-# CONFIG_RTW88_REGD_USER_REG_HINTS is not set
192167
# CONFIG_RT_GROUP_SCHED is not set
193168
CONFIG_RT_MUTEXES=y
194169
CONFIG_RUNTIME_TESTING_MENU=y
195-
@@ -9156,8 +9129,6 @@ CONFIG_SGI_XP=m
170+
@@ -9046,8 +9039,6 @@ CONFIG_SGI_XP=m
196171
CONFIG_SGL_ALLOC=y
197172
CONFIG_SG_POOL=y
198173
CONFIG_SG_SPLIT=y
@@ -201,24 +176,15 @@ index a274792c072a..12410e033315 100644
201176
CONFIG_SHMEM=y
202177
CONFIG_SHUFFLE_PAGE_ALLOCATOR=y
203178
CONFIG_SH_ETH=m
204-
@@ -9479,8 +9450,6 @@ CONFIG_SND_SOC_AMD_ACP=m
205-
CONFIG_SND_SOC_AMD_ACP3x=m
206-
CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH=m
207-
CONFIG_SND_SOC_AMD_CZ_RT5645_MACH=m
208-
-CONFIG_SND_SOC_AMD_RENOIR=m
209-
-CONFIG_SND_SOC_AMD_RENOIR_MACH=m
210-
CONFIG_SND_SOC_AMD_RV_RT5682_MACH=m
211-
CONFIG_SND_SOC_APQ8016_SBC=m
212-
CONFIG_SND_SOC_ARIZONA=m
213-
@@ -11267,7 +11236,6 @@ CONFIG_VDPA_SIM=m
179+
@@ -11143,7 +11134,6 @@ CONFIG_VCNL4035=m
214180
CONFIG_VDSO=y
215181
CONFIG_VEML6030=m
216182
CONFIG_VEML6070=m
217183
-CONFIG_VERSION_SIGNATURE=""
218184
CONFIG_VETH=m
219185
CONFIG_VEXPRESS_CONFIG=y
220186
CONFIG_VEXPRESS_SYSCFG=y
221-
@@ -11708,7 +11676,6 @@ CONFIG_WATCHDOG_RTAS=m
187+
@@ -11577,7 +11567,6 @@ CONFIG_WATCHDOG_RTAS=m
222188
CONFIG_WATCHDOG_SYSFS=y
223189
CONFIG_WCN36XX=m
224190
# CONFIG_WCN36XX_DEBUGFS is not set
@@ -227,10 +193,10 @@ index a274792c072a..12410e033315 100644
227193
CONFIG_WDAT_WDT=m
228194
CONFIG_WDT=m
229195
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
230-
index e62994cdf221..821f0a41d7cf 100644
196+
index 52b30381e1b2..0268d7a4c6da 100644
231197
--- a/debian.master/config/i386/config.common.i386
232198
+++ b/debian.master/config/i386/config.common.i386
233-
@@ -182,7 +182,6 @@ CONFIG_HFSPLUS_FS=m
199+
@@ -180,7 +180,6 @@ CONFIG_HFSPLUS_FS=m
234200
CONFIG_HFS_FS=m
235201
CONFIG_HIBERNATION=y
236202
CONFIG_HID=m
@@ -261,18 +227,18 @@ index 6b121e3f433b..0af82e00adce 100644
261227
CONFIG_PREEMPT=y
262228
# CONFIG_PREEMPT_VOLUNTARY is not set
263229
diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el
264-
index 729f8e2647f3..fba24cc25001 100644
230+
index 7761c349c82c..1945b4564116 100644
265231
--- a/debian.master/config/ppc64el/config.common.ppc64el
266232
+++ b/debian.master/config/ppc64el/config.common.ppc64el
267-
@@ -184,7 +184,6 @@ CONFIG_HFSPLUS_FS=m
233+
@@ -182,7 +182,6 @@ CONFIG_HFSPLUS_FS=m
268234
CONFIG_HFS_FS=m
269235
# CONFIG_HIBERNATION is not set
270236
CONFIG_HID=m
271237
-# CONFIG_HIO is not set
272238
CONFIG_HMC6352=m
273239
CONFIG_HOTPLUG_PCI=y
274240
# CONFIG_HOTPLUG_PCI_SHPC is not set
275-
@@ -270,7 +269,6 @@ CONFIG_IPACK_BUS=m
241+
@@ -265,7 +264,6 @@ CONFIG_IPACK_BUS=m
276242
CONFIG_IPMI_HANDLER=m
277243
# CONFIG_IP_DCCP_CCID3 is not set
278244
CONFIG_IRQ_BYPASS_MANAGER=y
@@ -281,12 +247,12 @@ index 729f8e2647f3..fba24cc25001 100644
281247
CONFIG_ISL29020=m
282248
CONFIG_JFS_FS=m
283249
diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x
284-
index 4fdac229f6a9..5c58a16b5350 100644
250+
index 6ea96d850eae..12fbc11c1c32 100644
285251
--- a/debian.master/config/s390x/config.common.s390x
286252
+++ b/debian.master/config/s390x/config.common.s390x
287-
@@ -170,7 +170,6 @@ CONFIG_GPIO_GENERIC_PLATFORM=m
288-
# CONFIG_HFSPLUS_FS is not set
253+
@@ -169,7 +169,6 @@ CONFIG_GPIO_GENERIC_PLATFORM=m
289254
# CONFIG_HFS_FS is not set
255+
# CONFIG_HIBERNATION is not set
290256
# CONFIG_HID is not set
291257
-# CONFIG_HIO is not set
292258
# CONFIG_HMC6352 is not set

0 commit comments

Comments
 (0)