0005-configs-based-on-Ubuntu-5.7.0-3.4.patch 10.0 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304
  1. From d3b5fe8d750339adfa962a84b3d42b47a6113424 Mon Sep 17 00:00:00 2001
  2. From: "Kernel Builder (tangerine)" <[email protected]>
  3. Date: Sun, 17 May 2020 20:31:28 -0400
  4. Subject: [PATCH 5/5] configs (based on Ubuntu-5.7.0-3.4)
  5. ---
  6. debian.master/config/amd64/config.common.amd64 | 1 -
  7. debian.master/config/amd64/config.flavour.generic | 1 -
  8. .../config/amd64/config.flavour.lowlatency | 1 -
  9. debian.master/config/arm64/config.common.arm64 | 4 +--
  10. debian.master/config/armhf/config.common.armhf | 2 --
  11. debian.master/config/config.common.ubuntu | 37 ++--------------------
  12. debian.master/config/i386/config.common.i386 | 1 -
  13. debian.master/config/i386/config.flavour.generic | 1 -
  14. .../config/i386/config.flavour.lowlatency | 1 -
  15. debian.master/config/ppc64el/config.common.ppc64el | 2 --
  16. debian.master/config/s390x/config.common.s390x | 1 -
  17. 11 files changed, 4 insertions(+), 48 deletions(-)
  18. diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
  19. index 85ff9dc..fef3036 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 d166237..5938d9b 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 814348d..42de09f 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 b2f8a3c1..ab96a76 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 b5a5f76..1fd6228 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 298d45c..9650399 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. @@ -368,6 +365,7 @@ CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
  120. CONFIG_ARCH_HAS_MEMREMAP_COMPAT_ALIGN=y
  121. CONFIG_ARCH_HAS_MEM_ENCRYPT=y
  122. CONFIG_ARCH_HAS_MMIOWB=y
  123. +CONFIG_ARCH_HAS_NON_OVERLAPPING_ADDRESS_SPACE=y
  124. CONFIG_ARCH_HAS_PHYS_TO_DMA=y
  125. CONFIG_ARCH_HAS_PKEYS=y
  126. CONFIG_ARCH_HAS_PMEM_API=y
  127. @@ -772,7 +770,7 @@ CONFIG_ARM_TI_CPUFREQ=y
  128. CONFIG_ARM_VEXPRESS_SPC_CPUFREQ=m
  129. CONFIG_ARM_VIRT_EXT=y
  130. CONFIG_AS3935=m
  131. -CONFIG_ASHMEM=m
  132. +# CONFIG_ASHMEM is not set
  133. CONFIG_ASN1=y
  134. CONFIG_ASPEED_ADC=m
  135. CONFIG_ASPEED_BT_IPMI_BMC=m
  136. @@ -908,25 +906,6 @@ CONFIG_AUDIT_ARCH=y
  137. CONFIG_AUDIT_ARCH_COMPAT_GENERIC=y
  138. CONFIG_AUDIT_COMPAT_GENERIC=y
  139. CONFIG_AUDIT_GENERIC=y
  140. -CONFIG_AUFS_BDEV_LOOP=y
  141. -# CONFIG_AUFS_BRANCH_MAX_1023 is not set
  142. -CONFIG_AUFS_BRANCH_MAX_127=y
  143. -# CONFIG_AUFS_BRANCH_MAX_32767 is not set
  144. -# CONFIG_AUFS_BRANCH_MAX_511 is not set
  145. -# CONFIG_AUFS_BR_FUSE is not set
  146. -CONFIG_AUFS_BR_HFSPLUS=y
  147. -# CONFIG_AUFS_BR_RAMFS is not set
  148. -# CONFIG_AUFS_DEBUG is not set
  149. -CONFIG_AUFS_DIRREN=y
  150. -CONFIG_AUFS_EXPORT=y
  151. -# CONFIG_AUFS_FHSM is not set
  152. -CONFIG_AUFS_FS=m
  153. -# CONFIG_AUFS_HNOTIFY is not set
  154. -CONFIG_AUFS_INO_T_64=y
  155. -# CONFIG_AUFS_RDU is not set
  156. -CONFIG_AUFS_SBILIST=y
  157. -# CONFIG_AUFS_SHWH is not set
  158. -CONFIG_AUFS_XATTR=y
  159. CONFIG_AURORA_NB8800=m
  160. CONFIG_AUTO_ZRELADDR=y
  161. CONFIG_AX25=m
  162. @@ -2480,7 +2459,6 @@ CONFIG_DELL_SMBIOS=m
  163. CONFIG_DELL_SMBIOS_SMM=y
  164. CONFIG_DELL_SMBIOS_WMI=y
  165. CONFIG_DELL_SMO8800=m
  166. -CONFIG_DELL_UART_BACKLIGHT=m
  167. CONFIG_DELL_WMI=m
  168. CONFIG_DELL_WMI_AIO=m
  169. CONFIG_DELL_WMI_DESCRIPTOR=m
  170. @@ -5186,7 +5164,6 @@ CONFIG_KGDB_KDB=y
  171. CONFIG_KGDB_LOW_LEVEL_TRAP=y
  172. CONFIG_KGDB_SERIAL_CONSOLE=y
  173. # CONFIG_KGDB_TESTS is not set
  174. -CONFIG_KMSG_IDS=y
  175. CONFIG_KMX61=m
  176. CONFIG_KPC2000=y
  177. CONFIG_KPC2000_CORE=m
  178. @@ -5414,7 +5391,6 @@ CONFIG_LOCKDEP_SUPPORT=y
  179. CONFIG_LOCKD_V4=y
  180. CONFIG_LOCKUP_DETECTOR=y
  181. CONFIG_LOCK_DEBUGGING_SUPPORT=y
  182. -CONFIG_LOCK_DOWN_IN_SECURE_BOOT=y
  183. # CONFIG_LOCK_DOWN_KERNEL_FORCE_CONFIDENTIALITY is not set
  184. # CONFIG_LOCK_DOWN_KERNEL_FORCE_INTEGRITY is not set
  185. CONFIG_LOCK_DOWN_KERNEL_FORCE_NONE=y
  186. @@ -8556,14 +8532,12 @@ CONFIG_RTLWIFI_USB=m
  187. CONFIG_RTL_CARDS=m
  188. CONFIG_RTS5208=m
  189. CONFIG_RTW88=m
  190. -CONFIG_RTW88_8723DE=y
  191. CONFIG_RTW88_8822BE=y
  192. CONFIG_RTW88_8822CE=y
  193. CONFIG_RTW88_CORE=m
  194. # CONFIG_RTW88_DEBUG is not set
  195. # CONFIG_RTW88_DEBUGFS is not set
  196. CONFIG_RTW88_PCI=m
  197. -# CONFIG_RTW88_REGD_USER_REG_HINTS is not set
  198. # CONFIG_RT_GROUP_SCHED is not set
  199. CONFIG_RT_MUTEXES=y
  200. CONFIG_RUNTIME_TESTING_MENU=y
  201. @@ -9156,8 +9130,6 @@ CONFIG_SGI_XP=m
  202. CONFIG_SGL_ALLOC=y
  203. CONFIG_SG_POOL=y
  204. CONFIG_SG_SPLIT=y
  205. -CONFIG_SHIFT_FS=m
  206. -CONFIG_SHIFT_FS_POSIX_ACL=y
  207. CONFIG_SHMEM=y
  208. CONFIG_SHUFFLE_PAGE_ALLOCATOR=y
  209. CONFIG_SH_ETH=m
  210. @@ -10473,7 +10445,6 @@ CONFIG_TI_CPSW=y
  211. # CONFIG_TI_CPSW_PHY_SEL is not set
  212. CONFIG_TI_CPSW_SWITCHDEV=m
  213. CONFIG_TI_CPTS=y
  214. -CONFIG_TI_CPTS_MOD=y
  215. CONFIG_TI_DAC082S085=m
  216. CONFIG_TI_DAC5571=m
  217. CONFIG_TI_DAC7311=m
  218. @@ -11265,7 +11236,6 @@ CONFIG_VDPA_SIM=m
  219. CONFIG_VDSO=y
  220. CONFIG_VEML6030=m
  221. CONFIG_VEML6070=m
  222. -CONFIG_VERSION_SIGNATURE=""
  223. CONFIG_VETH=m
  224. CONFIG_VEXPRESS_CONFIG=y
  225. CONFIG_VEXPRESS_SYSCFG=y
  226. @@ -11706,7 +11676,6 @@ CONFIG_WATCHDOG_RTAS=m
  227. CONFIG_WATCHDOG_SYSFS=y
  228. CONFIG_WCN36XX=m
  229. # CONFIG_WCN36XX_DEBUGFS is not set
  230. -# CONFIG_WCN36XX_SNAPDRAGON_HACKS is not set
  231. CONFIG_WD80x3=m
  232. CONFIG_WDAT_WDT=m
  233. CONFIG_WDT=m
  234. diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
  235. index 82398ce..d23088b 100644
  236. --- a/debian.master/config/i386/config.common.i386
  237. +++ b/debian.master/config/i386/config.common.i386
  238. @@ -182,7 +182,6 @@ CONFIG_HFSPLUS_FS=m
  239. CONFIG_HFS_FS=m
  240. CONFIG_HIBERNATION=y
  241. CONFIG_HID=m
  242. -CONFIG_HIO=m
  243. CONFIG_HMC6352=m
  244. CONFIG_HOTPLUG_PCI=y
  245. CONFIG_HOTPLUG_PCI_SHPC=y
  246. diff --git a/debian.master/config/i386/config.flavour.generic b/debian.master/config/i386/config.flavour.generic
  247. index 5c2e4e1..965113b 100644
  248. --- a/debian.master/config/i386/config.flavour.generic
  249. +++ b/debian.master/config/i386/config.flavour.generic
  250. @@ -4,6 +4,5 @@
  251. CONFIG_HZ=250
  252. # CONFIG_HZ_1000 is not set
  253. CONFIG_HZ_250=y
  254. -# CONFIG_IRQ_FORCED_THREADING_DEFAULT is not set
  255. # CONFIG_PREEMPT is not set
  256. CONFIG_PREEMPT_VOLUNTARY=y
  257. diff --git a/debian.master/config/i386/config.flavour.lowlatency b/debian.master/config/i386/config.flavour.lowlatency
  258. index 6b121e3..0af82e0 100644
  259. --- a/debian.master/config/i386/config.flavour.lowlatency
  260. +++ b/debian.master/config/i386/config.flavour.lowlatency
  261. @@ -4,6 +4,5 @@
  262. CONFIG_HZ=1000
  263. CONFIG_HZ_1000=y
  264. # CONFIG_HZ_250 is not set
  265. -CONFIG_IRQ_FORCED_THREADING_DEFAULT=y
  266. CONFIG_PREEMPT=y
  267. # CONFIG_PREEMPT_VOLUNTARY is not set
  268. diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el
  269. index c0c01a8..f66726e 100644
  270. --- a/debian.master/config/ppc64el/config.common.ppc64el
  271. +++ b/debian.master/config/ppc64el/config.common.ppc64el
  272. @@ -184,7 +184,6 @@ CONFIG_HFSPLUS_FS=m
  273. CONFIG_HFS_FS=m
  274. # CONFIG_HIBERNATION is not set
  275. CONFIG_HID=m
  276. -# CONFIG_HIO is not set
  277. CONFIG_HMC6352=m
  278. CONFIG_HOTPLUG_PCI=y
  279. # CONFIG_HOTPLUG_PCI_SHPC is not set
  280. @@ -270,7 +269,6 @@ CONFIG_IPACK_BUS=m
  281. CONFIG_IPMI_HANDLER=m
  282. # CONFIG_IP_DCCP_CCID3 is not set
  283. CONFIG_IRQ_BYPASS_MANAGER=y
  284. -# CONFIG_IRQ_FORCED_THREADING_DEFAULT is not set
  285. CONFIG_ISL29003=m
  286. CONFIG_ISL29020=m
  287. CONFIG_JFS_FS=m
  288. diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x
  289. index 1400c2a..c955443 100644
  290. --- a/debian.master/config/s390x/config.common.s390x
  291. +++ b/debian.master/config/s390x/config.common.s390x
  292. @@ -170,7 +170,6 @@ CONFIG_GPIO_GENERIC_PLATFORM=m
  293. # CONFIG_HFSPLUS_FS is not set
  294. # CONFIG_HFS_FS is not set
  295. # CONFIG_HID is not set
  296. -# CONFIG_HIO is not set
  297. # CONFIG_HMC6352 is not set
  298. CONFIG_HOTPLUG_PCI=y
  299. # CONFIG_HOTPLUG_PCI_SHPC is not set
  300. --
  301. 2.7.4