0005-configs-based-on-Ubuntu-5.7.0-6.7.patch 9.9 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297
  1. From c3bc0f62079428513e0fbdad1aefe029f769b603 Mon Sep 17 00:00:00 2001
  2. From: "Kernel Builder (sita)" <[email protected]>
  3. Date: Sun, 7 Jun 2020 12:31:27 +0000
  4. Subject: [PATCH 5/5] configs (based on Ubuntu-5.7.0-6.7)
  5. ---
  6. .../config/amd64/config.common.amd64 | 1 -
  7. .../config/amd64/config.flavour.generic | 1 -
  8. .../config/amd64/config.flavour.lowlatency | 1 -
  9. .../config/arm64/config.common.arm64 | 4 +-
  10. .../config/armhf/config.common.armhf | 2 -
  11. debian.master/config/config.common.ubuntu | 37 +------------------
  12. debian.master/config/i386/config.common.i386 | 1 -
  13. .../config/i386/config.flavour.generic | 1 -
  14. .../config/i386/config.flavour.lowlatency | 1 -
  15. .../config/ppc64el/config.common.ppc64el | 2 -
  16. .../config/s390x/config.common.s390x | 1 -
  17. 11 files changed, 3 insertions(+), 49 deletions(-)
  18. diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
  19. index 11d4bde9d612..2a209f34db83 100644
  20. --- a/debian.master/config/amd64/config.common.amd64
  21. +++ b/debian.master/config/amd64/config.common.amd64
  22. @@ -185,7 +185,6 @@ CONFIG_HFSPLUS_FS=m
  23. CONFIG_HFS_FS=m
  24. CONFIG_HIBERNATION=y
  25. CONFIG_HID=m
  26. -CONFIG_HIO=m
  27. CONFIG_HMC6352=m
  28. CONFIG_HOTPLUG_PCI=y
  29. CONFIG_HOTPLUG_PCI_SHPC=y
  30. diff --git a/debian.master/config/amd64/config.flavour.generic b/debian.master/config/amd64/config.flavour.generic
  31. index d1662374ea94..5938d9ba3f6c 100644
  32. --- a/debian.master/config/amd64/config.flavour.generic
  33. +++ b/debian.master/config/amd64/config.flavour.generic
  34. @@ -4,7 +4,6 @@
  35. CONFIG_HZ=250
  36. # CONFIG_HZ_1000 is not set
  37. CONFIG_HZ_250=y
  38. -# CONFIG_IRQ_FORCED_THREADING_DEFAULT is not set
  39. # CONFIG_LATENCYTOP is not set
  40. # CONFIG_PREEMPT is not set
  41. CONFIG_PREEMPT_VOLUNTARY=y
  42. diff --git a/debian.master/config/amd64/config.flavour.lowlatency b/debian.master/config/amd64/config.flavour.lowlatency
  43. index 814348dc984b..42de09fb0bff 100644
  44. --- a/debian.master/config/amd64/config.flavour.lowlatency
  45. +++ b/debian.master/config/amd64/config.flavour.lowlatency
  46. @@ -4,7 +4,6 @@
  47. CONFIG_HZ=1000
  48. CONFIG_HZ_1000=y
  49. # CONFIG_HZ_250 is not set
  50. -CONFIG_IRQ_FORCED_THREADING_DEFAULT=y
  51. CONFIG_LATENCYTOP=y
  52. CONFIG_PREEMPT=y
  53. # CONFIG_PREEMPT_VOLUNTARY is not set
  54. diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
  55. index 8a04a5dea27c..b09ed523e18d 100644
  56. --- a/debian.master/config/arm64/config.common.arm64
  57. +++ b/debian.master/config/arm64/config.common.arm64
  58. @@ -166,7 +166,7 @@ CONFIG_FEALNX=m
  59. CONFIG_FIREWIRE=m
  60. CONFIG_FIREWIRE_NOSY=m
  61. CONFIG_FIXED_PHY=y
  62. -CONFIG_FORCE_MAX_ZONEORDER=13
  63. +CONFIG_FORCE_MAX_ZONEORDER=11
  64. CONFIG_FPGA_BRIDGE=m
  65. CONFIG_FPGA_DFL=m
  66. CONFIG_FRAME_WARN=1024
  67. @@ -197,7 +197,6 @@ CONFIG_HFSPLUS_FS=m
  68. CONFIG_HFS_FS=m
  69. # CONFIG_HIBERNATION is not set
  70. CONFIG_HID=m
  71. -# CONFIG_HIO is not set
  72. CONFIG_HMC6352=m
  73. CONFIG_HOTPLUG_PCI=y
  74. CONFIG_HOTPLUG_PCI_SHPC=y
  75. @@ -287,7 +286,6 @@ CONFIG_IPMI_HANDLER=m
  76. # CONFIG_IPMMU_VMSA is not set
  77. # CONFIG_IP_DCCP_CCID3 is not set
  78. CONFIG_IRQ_BYPASS_MANAGER=y
  79. -# CONFIG_IRQ_FORCED_THREADING_DEFAULT is not set
  80. CONFIG_ISL29003=m
  81. CONFIG_ISL29020=m
  82. CONFIG_JFS_FS=m
  83. diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
  84. index b6521d7ec3ba..413dbe0d70ad 100644
  85. --- a/debian.master/config/armhf/config.common.armhf
  86. +++ b/debian.master/config/armhf/config.common.armhf
  87. @@ -186,7 +186,6 @@ CONFIG_HFSPLUS_FS=m
  88. CONFIG_HFS_FS=m
  89. CONFIG_HIBERNATION=y
  90. CONFIG_HID=m
  91. -# CONFIG_HIO is not set
  92. CONFIG_HMC6352=m
  93. # CONFIG_HOTPLUG_PCI is not set
  94. CONFIG_HPFS_FS=m
  95. @@ -272,7 +271,6 @@ CONFIG_IPMI_HANDLER=m
  96. CONFIG_IPMMU_VMSA=y
  97. # CONFIG_IP_DCCP_CCID3 is not set
  98. CONFIG_IRQ_BYPASS_MANAGER=m
  99. -# CONFIG_IRQ_FORCED_THREADING_DEFAULT is not set
  100. CONFIG_ISL29003=m
  101. CONFIG_ISL29020=m
  102. CONFIG_JFS_FS=m
  103. diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
  104. index a274792c072a..12410e033315 100644
  105. --- a/debian.master/config/config.common.ubuntu
  106. +++ b/debian.master/config/config.common.ubuntu
  107. @@ -283,10 +283,7 @@ CONFIG_AMD_XGBE_DCB=y
  108. CONFIG_AMD_XGBE_HAVE_ECC=y
  109. CONFIG_AMILO_RFKILL=m
  110. CONFIG_AMLOGIC_THERMAL=m
  111. -CONFIG_ANDROID_BINDERFS=m
  112. -CONFIG_ANDROID_BINDER_DEVICES=""
  113. -CONFIG_ANDROID_BINDER_IPC=m
  114. -# CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set
  115. +# CONFIG_ANDROID_BINDER_IPC is not set
  116. CONFIG_APB_TIMER=y
  117. CONFIG_APDS9300=m
  118. CONFIG_APDS9960=m
  119. @@ -773,7 +770,7 @@ CONFIG_ARM_TI_CPUFREQ=y
  120. CONFIG_ARM_VEXPRESS_SPC_CPUFREQ=m
  121. CONFIG_ARM_VIRT_EXT=y
  122. CONFIG_AS3935=m
  123. -CONFIG_ASHMEM=m
  124. +# CONFIG_ASHMEM is not set
  125. CONFIG_ASN1=y
  126. CONFIG_ASPEED_ADC=m
  127. CONFIG_ASPEED_BT_IPMI_BMC=m
  128. @@ -909,25 +906,6 @@ CONFIG_AUDIT_ARCH=y
  129. CONFIG_AUDIT_ARCH_COMPAT_GENERIC=y
  130. CONFIG_AUDIT_COMPAT_GENERIC=y
  131. CONFIG_AUDIT_GENERIC=y
  132. -CONFIG_AUFS_BDEV_LOOP=y
  133. -# CONFIG_AUFS_BRANCH_MAX_1023 is not set
  134. -CONFIG_AUFS_BRANCH_MAX_127=y
  135. -# CONFIG_AUFS_BRANCH_MAX_32767 is not set
  136. -# CONFIG_AUFS_BRANCH_MAX_511 is not set
  137. -# CONFIG_AUFS_BR_FUSE is not set
  138. -CONFIG_AUFS_BR_HFSPLUS=y
  139. -# CONFIG_AUFS_BR_RAMFS is not set
  140. -# CONFIG_AUFS_DEBUG is not set
  141. -CONFIG_AUFS_DIRREN=y
  142. -CONFIG_AUFS_EXPORT=y
  143. -# CONFIG_AUFS_FHSM is not set
  144. -CONFIG_AUFS_FS=m
  145. -# CONFIG_AUFS_HNOTIFY is not set
  146. -CONFIG_AUFS_INO_T_64=y
  147. -# CONFIG_AUFS_RDU is not set
  148. -CONFIG_AUFS_SBILIST=y
  149. -# CONFIG_AUFS_SHWH is not set
  150. -CONFIG_AUFS_XATTR=y
  151. CONFIG_AURORA_NB8800=m
  152. CONFIG_AUTO_ZRELADDR=y
  153. CONFIG_AX25=m
  154. @@ -2481,7 +2459,6 @@ CONFIG_DELL_SMBIOS=m
  155. CONFIG_DELL_SMBIOS_SMM=y
  156. CONFIG_DELL_SMBIOS_WMI=y
  157. CONFIG_DELL_SMO8800=m
  158. -CONFIG_DELL_UART_BACKLIGHT=m
  159. CONFIG_DELL_WMI=m
  160. CONFIG_DELL_WMI_AIO=m
  161. CONFIG_DELL_WMI_DESCRIPTOR=m
  162. @@ -5187,7 +5164,6 @@ CONFIG_KGDB_KDB=y
  163. CONFIG_KGDB_LOW_LEVEL_TRAP=y
  164. CONFIG_KGDB_SERIAL_CONSOLE=y
  165. # CONFIG_KGDB_TESTS is not set
  166. -CONFIG_KMSG_IDS=y
  167. CONFIG_KMX61=m
  168. CONFIG_KPC2000=y
  169. CONFIG_KPC2000_CORE=m
  170. @@ -5415,7 +5391,6 @@ CONFIG_LOCKDEP_SUPPORT=y
  171. CONFIG_LOCKD_V4=y
  172. CONFIG_LOCKUP_DETECTOR=y
  173. CONFIG_LOCK_DEBUGGING_SUPPORT=y
  174. -CONFIG_LOCK_DOWN_IN_SECURE_BOOT=y
  175. # CONFIG_LOCK_DOWN_KERNEL_FORCE_CONFIDENTIALITY is not set
  176. # CONFIG_LOCK_DOWN_KERNEL_FORCE_INTEGRITY is not set
  177. CONFIG_LOCK_DOWN_KERNEL_FORCE_NONE=y
  178. @@ -8556,14 +8531,12 @@ CONFIG_RTLWIFI_USB=m
  179. CONFIG_RTL_CARDS=m
  180. CONFIG_RTS5208=m
  181. CONFIG_RTW88=m
  182. -CONFIG_RTW88_8723DE=y
  183. CONFIG_RTW88_8822BE=y
  184. CONFIG_RTW88_8822CE=y
  185. CONFIG_RTW88_CORE=m
  186. # CONFIG_RTW88_DEBUG is not set
  187. # CONFIG_RTW88_DEBUGFS is not set
  188. CONFIG_RTW88_PCI=m
  189. -# CONFIG_RTW88_REGD_USER_REG_HINTS is not set
  190. # CONFIG_RT_GROUP_SCHED is not set
  191. CONFIG_RT_MUTEXES=y
  192. CONFIG_RUNTIME_TESTING_MENU=y
  193. @@ -9156,8 +9129,6 @@ CONFIG_SGI_XP=m
  194. CONFIG_SGL_ALLOC=y
  195. CONFIG_SG_POOL=y
  196. CONFIG_SG_SPLIT=y
  197. -CONFIG_SHIFT_FS=m
  198. -CONFIG_SHIFT_FS_POSIX_ACL=y
  199. CONFIG_SHMEM=y
  200. CONFIG_SHUFFLE_PAGE_ALLOCATOR=y
  201. CONFIG_SH_ETH=m
  202. @@ -9479,8 +9450,6 @@ CONFIG_SND_SOC_AMD_ACP=m
  203. CONFIG_SND_SOC_AMD_ACP3x=m
  204. CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH=m
  205. CONFIG_SND_SOC_AMD_CZ_RT5645_MACH=m
  206. -CONFIG_SND_SOC_AMD_RENOIR=m
  207. -CONFIG_SND_SOC_AMD_RENOIR_MACH=m
  208. CONFIG_SND_SOC_AMD_RV_RT5682_MACH=m
  209. CONFIG_SND_SOC_APQ8016_SBC=m
  210. CONFIG_SND_SOC_ARIZONA=m
  211. @@ -11267,7 +11236,6 @@ CONFIG_VDPA_SIM=m
  212. CONFIG_VDSO=y
  213. CONFIG_VEML6030=m
  214. CONFIG_VEML6070=m
  215. -CONFIG_VERSION_SIGNATURE=""
  216. CONFIG_VETH=m
  217. CONFIG_VEXPRESS_CONFIG=y
  218. CONFIG_VEXPRESS_SYSCFG=y
  219. @@ -11708,7 +11676,6 @@ CONFIG_WATCHDOG_RTAS=m
  220. CONFIG_WATCHDOG_SYSFS=y
  221. CONFIG_WCN36XX=m
  222. # CONFIG_WCN36XX_DEBUGFS is not set
  223. -# CONFIG_WCN36XX_SNAPDRAGON_HACKS is not set
  224. CONFIG_WD80x3=m
  225. CONFIG_WDAT_WDT=m
  226. CONFIG_WDT=m
  227. diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
  228. index e62994cdf221..821f0a41d7cf 100644
  229. --- a/debian.master/config/i386/config.common.i386
  230. +++ b/debian.master/config/i386/config.common.i386
  231. @@ -182,7 +182,6 @@ CONFIG_HFSPLUS_FS=m
  232. CONFIG_HFS_FS=m
  233. CONFIG_HIBERNATION=y
  234. CONFIG_HID=m
  235. -CONFIG_HIO=m
  236. CONFIG_HMC6352=m
  237. CONFIG_HOTPLUG_PCI=y
  238. CONFIG_HOTPLUG_PCI_SHPC=y
  239. diff --git a/debian.master/config/i386/config.flavour.generic b/debian.master/config/i386/config.flavour.generic
  240. index 5c2e4e1d3a9f..965113b110ce 100644
  241. --- a/debian.master/config/i386/config.flavour.generic
  242. +++ b/debian.master/config/i386/config.flavour.generic
  243. @@ -4,6 +4,5 @@
  244. CONFIG_HZ=250
  245. # CONFIG_HZ_1000 is not set
  246. CONFIG_HZ_250=y
  247. -# CONFIG_IRQ_FORCED_THREADING_DEFAULT is not set
  248. # CONFIG_PREEMPT is not set
  249. CONFIG_PREEMPT_VOLUNTARY=y
  250. diff --git a/debian.master/config/i386/config.flavour.lowlatency b/debian.master/config/i386/config.flavour.lowlatency
  251. index 6b121e3f433b..0af82e00adce 100644
  252. --- a/debian.master/config/i386/config.flavour.lowlatency
  253. +++ b/debian.master/config/i386/config.flavour.lowlatency
  254. @@ -4,6 +4,5 @@
  255. CONFIG_HZ=1000
  256. CONFIG_HZ_1000=y
  257. # CONFIG_HZ_250 is not set
  258. -CONFIG_IRQ_FORCED_THREADING_DEFAULT=y
  259. CONFIG_PREEMPT=y
  260. # CONFIG_PREEMPT_VOLUNTARY is not set
  261. diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el
  262. index 729f8e2647f3..fba24cc25001 100644
  263. --- a/debian.master/config/ppc64el/config.common.ppc64el
  264. +++ b/debian.master/config/ppc64el/config.common.ppc64el
  265. @@ -184,7 +184,6 @@ CONFIG_HFSPLUS_FS=m
  266. CONFIG_HFS_FS=m
  267. # CONFIG_HIBERNATION is not set
  268. CONFIG_HID=m
  269. -# CONFIG_HIO is not set
  270. CONFIG_HMC6352=m
  271. CONFIG_HOTPLUG_PCI=y
  272. # CONFIG_HOTPLUG_PCI_SHPC is not set
  273. @@ -270,7 +269,6 @@ CONFIG_IPACK_BUS=m
  274. CONFIG_IPMI_HANDLER=m
  275. # CONFIG_IP_DCCP_CCID3 is not set
  276. CONFIG_IRQ_BYPASS_MANAGER=y
  277. -# CONFIG_IRQ_FORCED_THREADING_DEFAULT is not set
  278. CONFIG_ISL29003=m
  279. CONFIG_ISL29020=m
  280. CONFIG_JFS_FS=m
  281. diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x
  282. index 4fdac229f6a9..5c58a16b5350 100644
  283. --- a/debian.master/config/s390x/config.common.s390x
  284. +++ b/debian.master/config/s390x/config.common.s390x
  285. @@ -170,7 +170,6 @@ CONFIG_GPIO_GENERIC_PLATFORM=m
  286. # CONFIG_HFSPLUS_FS is not set
  287. # CONFIG_HFS_FS is not set
  288. # CONFIG_HID is not set
  289. -# CONFIG_HIO is not set
  290. # CONFIG_HMC6352 is not set
  291. CONFIG_HOTPLUG_PCI=y
  292. # CONFIG_HOTPLUG_PCI_SHPC is not set
  293. --
  294. 2.17.1