Clean up config files by: - removing configs that were deleted in the past - removing configs that are not in tree withot recently pending patches - adding new configs that are replacements for old configs in the file For some detailed information, see Link. Link: https://lore.kernel.org/kernel-janitors/20220929090645.1389-1-lukas.bulwahn@xxxxxxxxx/ Signed-off-by: Lukas Bulwahn <lukas.bulwahn@xxxxxxxxx> --- kernel/configs/android-base.config | 9 --------- kernel/configs/android-recommended.config | 5 ----- 2 files changed, 14 deletions(-) diff --git a/kernel/configs/android-base.config b/kernel/configs/android-base.config index 44b0f0146a3f..07b45571a8ff 100644 --- a/kernel/configs/android-base.config +++ b/kernel/configs/android-base.config @@ -1,7 +1,6 @@ # KEEP ALPHABETICALLY SORTED # CONFIG_DEVMEM is not set # CONFIG_FHANDLE is not set -# CONFIG_INET_LRO is not set # CONFIG_NFSD is not set # CONFIG_NFS_FS is not set # CONFIG_OABI_COMPAT is not set @@ -9,9 +8,7 @@ # CONFIG_USELIB is not set CONFIG_ANDROID_BINDER_IPC=y CONFIG_ANDROID_BINDER_DEVICES=binder,hwbinder,vndbinder -CONFIG_ANDROID_LOW_MEMORY_KILLER=y CONFIG_ARMV8_DEPRECATED=y -CONFIG_ASHMEM=y CONFIG_AUDIT=y CONFIG_BLK_DEV_INITRD=y CONFIG_CGROUPS=y @@ -34,7 +31,6 @@ CONFIG_INET6_IPCOMP=y CONFIG_INET=y CONFIG_INET_DIAG_DESTROY=y CONFIG_INET_ESP=y -CONFIG_INET_XFRM_MODE_TUNNEL=y CONFIG_IP6_NF_FILTER=y CONFIG_IP6_NF_IPTABLES=y CONFIG_IP6_NF_MANGLE=y @@ -71,7 +67,6 @@ CONFIG_MODVERSIONS=y CONFIG_NET=y CONFIG_NETDEVICES=y CONFIG_NETFILTER=y -CONFIG_NETFILTER_TPROXY=y CONFIG_NETFILTER_XT_MATCH_COMMENT=y CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=y CONFIG_NETFILTER_XT_MATCH_CONNMARK=y @@ -115,8 +110,6 @@ CONFIG_NF_CONNTRACK_AMANDA=y CONFIG_NF_CONNTRACK_EVENTS=y CONFIG_NF_CONNTRACK_FTP=y CONFIG_NF_CONNTRACK_H323=y -CONFIG_NF_CONNTRACK_IPV4=y -CONFIG_NF_CONNTRACK_IPV6=y CONFIG_NF_CONNTRACK_IRC=y CONFIG_NF_CONNTRACK_NETBIOS_NS=y CONFIG_NF_CONNTRACK_PPTP=y @@ -148,12 +141,10 @@ CONFIG_SECURITY_SELINUX=y CONFIG_SETEND_EMULATION=y CONFIG_STAGING=y CONFIG_SWP_EMULATION=y -CONFIG_SYNC=y CONFIG_TUN=y CONFIG_UNIX=y CONFIG_USB_GADGET=y CONFIG_USB_CONFIGFS=y CONFIG_USB_CONFIGFS_F_FS=y CONFIG_USB_CONFIGFS_F_MIDI=y -CONFIG_USB_OTG_WAKELOCK=y CONFIG_XFRM_USER=y diff --git a/kernel/configs/android-recommended.config b/kernel/configs/android-recommended.config index e400fbbc8aba..fae090812da6 100644 --- a/kernel/configs/android-recommended.config +++ b/kernel/configs/android-recommended.config @@ -7,7 +7,6 @@ # CONFIG_PM_WAKELOCKS_GC is not set # CONFIG_VT is not set CONFIG_ARM64_SW_TTBR0_PAN=y -CONFIG_BACKLIGHT_LCD_SUPPORT=y CONFIG_BLK_DEV_DM=y CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_RAM=y @@ -76,7 +75,6 @@ CONFIG_HID_WIIMOTE=y CONFIG_HID_ZEROPLUS=y CONFIG_HID_ZYDACRON=y CONFIG_INPUT_EVDEV=y -CONFIG_INPUT_GPIO=y CONFIG_INPUT_JOYSTICK=y CONFIG_INPUT_MISC=y CONFIG_INPUT_TABLET=y @@ -96,7 +94,6 @@ CONFIG_PANIC_TIMEOUT=5 CONFIG_PANTHERLORD_FF=y CONFIG_PERF_EVENTS=y CONFIG_PM_DEBUG=y -CONFIG_PM_RUNTIME=y CONFIG_PM_WAKELOCKS_LIMIT=0 CONFIG_POWER_SUPPLY=y CONFIG_PSTORE=y @@ -107,7 +104,6 @@ CONFIG_SMARTJOYPLUS_FF=y CONFIG_SND=y CONFIG_SOUND=y CONFIG_STRICT_KERNEL_RWX=y -CONFIG_SUSPEND_TIME=y CONFIG_TABLET_USB_ACECAD=y CONFIG_TABLET_USB_AIPTEK=y CONFIG_TABLET_USB_HANWANG=y @@ -116,7 +112,6 @@ CONFIG_TASKSTATS=y CONFIG_TASK_DELAY_ACCT=y CONFIG_TASK_IO_ACCOUNTING=y CONFIG_TASK_XACCT=y -CONFIG_TIMER_STATS=y CONFIG_TMPFS=y CONFIG_TMPFS_POSIX_ACL=y CONFIG_UHID=y -- 2.17.1
