netfilter: fix file conflicts between kmod-ipt- and kmod-nft- packages

[openwrt/staging/blogic.git] / target / linux / generic / config-4.1

diff --git a/target/linux/generic/config-4.1 b/target/linux/generic/config-4.1
index 09e74ff4b44fc2a7261eeb8474ff69ebe8cb79bc..0b5eccb7eac899f84681a7aa531c752521e24bd9 100644 (file)
--- a/target/linux/generic/config-4.1
+++ b/target/linux/generic/config-4.1
@@ -12,6 +12,7 @@ CONFIG_32BIT=y
 # CONFIG_ACERHDF is not set
 # CONFIG_ACORN_PARTITION is not set
 # CONFIG_ACPI_APEI is not set
+# CONFIG_ACPI_BUTTON is not set
 # CONFIG_ACPI_CUSTOM_METHOD is not set
 # CONFIG_ACPI_EXTLOG is not set
 # CONFIG_ACPI_HED is not set
@@ -233,6 +234,8 @@ CONFIG_ARCH_FLATMEM_ENABLE=y
 # CONFIG_ARM_CCN is not set
 # CONFIG_ARM_CRYPTO is not set
 CONFIG_ARM_CPU_TOPOLOGY=y
+# CONFIG_ARM_CPUIDLE is not set
+# CONFIG_ARM_CRYPTO is not set
 CONFIG_ARM_DMA_MEM_BUFFERABLE=y
 # CONFIG_ARM_ERRATA_326103 is not set
 # CONFIG_ARM_ERRATA_364296 is not set
@@ -253,6 +256,7 @@ CONFIG_ARM_DMA_MEM_BUFFERABLE=y
 # CONFIG_ARM_ERRATA_775420 is not set
 # CONFIG_ARM_ERRATA_798181 is not set
 # CONFIG_ARM_KERNMEM_PERMS is not set
+# CONFIG_ARM_KIRKWOOD_CPUFREQ is not set
 # CONFIG_ARM_KPROBES_TEST is not set
 # CONFIG_ARM_MHU is not set
 # CONFIG_ARM_PATCH_PHYS_VIRT is not set
@@ -264,6 +268,7 @@ CONFIG_ARPD=y
 # CONFIG_ARTHUR is not set
 # CONFIG_AS3935 is not set
 # CONFIG_ASM9260_TIMER is not set
+# CONFIG_ASUS_LAPTOP is not set
 # CONFIG_ASUS_OLED is not set
 # CONFIG_ASYMMETRIC_KEY_TYPE is not set
 # CONFIG_ASYNC_RAID6_TEST is not set
@@ -334,11 +339,13 @@ CONFIG_ATM_CLIP_NO_ICMP=y
 # CONFIG_AX25 is not set
 # CONFIG_AX25_DAMA_SLAVE is not set
 # CONFIG_AX88796 is not set
+# CONFIG_AXP288_ADC is not set
+# CONFIG_AXP288_FUEL_GAUGE is not set
 # CONFIG_B43 is not set
 # CONFIG_B43LEGACY is not set
 # CONFIG_B44 is not set
-# CONFIG_B53 is not set
-# CONFIG_B53_SPI_DRIVER is not set
+# CONFIG_SWCONFIG_B53 is not set
+# CONFIG_SWCONFIG_B53_SPI_DRIVER is not set
 # CONFIG_BACKLIGHT_ADP8860 is not set 
 # CONFIG_BACKLIGHT_ADP8870 is not set
 # CONFIG_BACKLIGHT_BD6107 is not set
@@ -350,6 +357,8 @@ CONFIG_ATM_CLIP_NO_ICMP=y
 # CONFIG_BACKLIGHT_LP855X is not set
 # CONFIG_BACKLIGHT_LV5207LP is not set
 # CONFIG_BACKLIGHT_PANDORA is not set
+# CONFIG_BACKLIGHT_RPI is not set
+# CONFIG_BACKLIGHT_SAHARA is not set
 # CONFIG_BACKTRACE_SELF_TEST is not set
 CONFIG_BASE_FULL=y
 CONFIG_BASE_SMALL=0
@@ -541,6 +550,7 @@ CONFIG_BROKEN_ON_SMP=y
 # CONFIG_BTRFS_ASSERT is not set
 # CONFIG_BTRFS_DEBUG is not set
 # CONFIG_BTRFS_FS is not set
+# CONFIG_BTRFS_FS_POSIX_ACL is not set
 # CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
 # CONFIG_BT_ATH3K is not set
 # CONFIG_BT_BNEP is not set
@@ -668,6 +678,7 @@ CONFIG_CMDLINE=""
 # CONFIG_COMEDI is not set
 # CONFIG_COMMON_CLK_CDCE706 is not set
 # CONFIG_COMMON_CLK_DEBUG is not set
+# CONFIG_COMMON_CLK_PWM is not set
 # CONFIG_COMMON_CLK_PXA is not set
 # CONFIG_COMMON_CLK_QCOM is not set
 # CONFIG_COMMON_CLK_SI5351 is not set
@@ -720,9 +731,10 @@ CONFIG_CRYPTO_ALGAPI=y
 CONFIG_CRYPTO_ALGAPI2=y
 # CONFIG_CRYPTO_ANSI_CPRNG is not set
 # CONFIG_CRYPTO_ANUBIS is not set
-# CONFIG_CRYPTO_ARC4 is not set
+CONFIG_CRYPTO_ARC4=y
 # CONFIG_CRYPTO_AUTHENC is not set
-# CONFIG_CRYPTO_BLKCIPHER is not set
+CONFIG_CRYPTO_BLKCIPHER=y
+CONFIG_CRYPTO_BLKCIPHER2=y
 # CONFIG_CRYPTO_BLOWFISH is not set
 # CONFIG_CRYPTO_CAMELLIA is not set
 # CONFIG_CRYPTO_CAST5 is not set
@@ -751,6 +763,8 @@ CONFIG_CRYPTO_ALGAPI2=y
 # CONFIG_CRYPTO_DEV_QCE is not set
 # CONFIG_CRYPTO_DEV_SAHARA is not set
 # CONFIG_CRYPTO_DEV_TALITOS is not set
+# CONFIG_CRYPTO_DRBG_CTR is not set
+# CONFIG_CRYPTO_DRBG_HASH is not set
 # CONFIG_CRYPTO_DRBG_MENU is not set
 # CONFIG_CRYPTO_ECB is not set
 # CONFIG_CRYPTO_FCRYPT is not set
@@ -950,6 +964,8 @@ CONFIG_DQL=y
 # CONFIG_DS1682 is not set
 # CONFIG_DTLK is not set
 # CONFIG_DUMMY is not set
+CONFIG_DUMMY_CONSOLE_COLUMNS=80
+CONFIG_DUMMY_CONSOLE_ROWS=25
 # CONFIG_DUMMY_IRQ is not set
 # CONFIG_DVB_AU8522_V4L is not set
 # CONFIG_DVB_CORE is not set
@@ -1030,6 +1046,7 @@ CONFIG_EXTRA_TARGETS=""
 # CONFIG_EXYNOS_VIDEO is not set
 # CONFIG_EZX_PCAP is not set
 # CONFIG_F2FS_FS is not set
+# CONFIG_F2FS_FS_POSIX_ACL is not set
 # CONFIG_F2FS_IO_TRACE is not set
 # CONFIG_FAIR_GROUP_SCHED is not set
 # CONFIG_FANOTIFY is not set
@@ -1073,6 +1090,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
 # CONFIG_FB_MB862XX is not set
 # CONFIG_FB_METRONOME is not set
 # CONFIG_FB_MODE_HELPERS is not set
+# CONFIG_FB_MXS is not set
 # CONFIG_FB_N411 is not set
 # CONFIG_FB_NEOMAGIC is not set
 # CONFIG_FB_NVIDIA is not set
@@ -1089,6 +1107,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
 # CONFIG_FB_SAVAGE is not set
 # CONFIG_FB_SIMPLE is not set
 # CONFIG_FB_SIS is not set
+# CONFIG_FB_SM750 is not set
 # CONFIG_FB_SM7XX is not set
 # CONFIG_FB_SMSCUFX is not set
 # CONFIG_FB_SSD1307 is not set
@@ -1140,6 +1159,7 @@ CONFIG_FRAME_WARN=1024
 # CONFIG_FSL_EDMA is not set
 # CONFIG_FSL_XGMAC_MDIO is not set
 CONFIG_FSNOTIFY=y
+# CONFIG_FS_DAX is not set
 # CONFIG_FS_POSIX_ACL is not set
 # CONFIG_FT1000 is not set
 # CONFIG_FTGMAC100 is not set
@@ -1216,7 +1236,6 @@ CONFIG_GENERIC_TIME=y
 # CONFIG_GPIO_TS5500 is not set
 # CONFIG_GPIO_VX855 is not set
 # CONFIG_GPIO_WATCHDOG is not set
-# CONFIG_GPIO_WDT is not set
 # CONFIG_GPIO_XILINX is not set
 # CONFIG_GPIO_ZEVIO is not set
 # CONFIG_GREENASIA_FF is not set
@@ -1241,6 +1260,7 @@ CONFIG_HAVE_KRETPROBES=y
 # CONFIG_HFSPLUS_FS is not set
 # CONFIG_HFSPLUS_FS_POSIX_ACL is not set
 # CONFIG_HFS_FS is not set
+# CONFIG_HFS_FS_POSIX_ACL is not set
 # CONFIG_HIBERNATION is not set
 # CONFIG_HID is not set
 # CONFIG_HIDRAW is not set
@@ -1344,6 +1364,7 @@ CONFIG_HPET_MMAP_DEFAULT=y
 # CONFIG_HP_WIRELESS is not set
 # CONFIG_HSI is not set
 # CONFIG_HSR is not set
+# CONFIG_HSU_DMA_PCI is not set
 # CONFIG_HTC_EGPIO is not set
 # CONFIG_HTC_I2CPLD is not set
 # CONFIG_HTC_PASIC3 is not set
@@ -1709,6 +1730,7 @@ CONFIG_IP_ROUTE_VERBOSE=y
 # CONFIG_IRQ_TIME_ACCOUNTING is not set
 # CONFIG_IR_GPIO_CIR is not set
 # CONFIG_IR_HIX5HD2 is not set
+# CONFIG_IR_IGORPLUGUSB is not set
 # CONFIG_IR_IGUANA is not set
 # CONFIG_IR_IMG is not set
 # CONFIG_IR_IMON is not set
@@ -1800,6 +1822,7 @@ CONFIG_KERNFS=y
 # CONFIG_KEYBOARD_ATKBD is not set
 # CONFIG_KEYBOARD_BCM is not set
 # CONFIG_KEYBOARD_CAP1106 is not set
+# CONFIG_KEYBOARD_GPIO is not set
 # CONFIG_KEYBOARD_GPIO_POLLED is not set
 # CONFIG_KEYBOARD_LKKBD is not set
 # CONFIG_KEYBOARD_LM8323 is not set
@@ -1892,6 +1915,7 @@ CONFIG_LEDS_GPIO_PLATFORM=y
 # CONFIG_LEDS_PCA9685 is not set
 # CONFIG_LEDS_PM8941_WLED is not set
 # CONFIG_LEDS_PWM is not set
+# CONFIG_LEDS_REGULATOR is not set
 # CONFIG_LEDS_RENESAS_TPU is not set
 # CONFIG_LEDS_SYSCON is not set
 # CONFIG_LEDS_TCA6507 is not set
@@ -1903,7 +1927,6 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
 # CONFIG_LEDS_TRIGGER_GPIO is not set
 # CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
 # CONFIG_LEDS_TRIGGER_IDE_DISK is not set
-# CONFIG_LEDS_TRIGGER_MORSE is not set
 CONFIG_LEDS_TRIGGER_NETDEV=y
 # CONFIG_LEDS_TRIGGER_ONESHOT is not set
 CONFIG_LEDS_TRIGGER_TIMER=y
@@ -2125,6 +2148,7 @@ CONFIG_MII=y
 # CONFIG_MINIX_FS_NATIVE_ENDIAN is not set
 # CONFIG_MINIX_SUBPARTITION is not set
 # CONFIG_MIPS_ALCHEMY is not set
+# CONFIG_MIPS_CDMM is not set
 # CONFIG_MIPS_COBALT is not set
 # CONFIG_MIPS_FPU_EMULATOR is not set
 # CONFIG_MIPS_MALTA is not set
@@ -2334,13 +2358,14 @@ CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
 # CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
 # CONFIG_MTD_ROM is not set
 CONFIG_MTD_ROOTFS_ROOT_DEV=y
-CONFIG_MTD_ROOTFS_SPLIT=y
 # CONFIG_MTD_SLRAM is not set
 # CONFIG_MTD_SM_COMMON is not set
 # CONFIG_MTD_SPI_NOR_USE_4K_SECTORS is not set
 # CONFIG_MTD_SPI_NOR is not set
 # CONFIG_MTD_SPINAND_MT29F is not set
 CONFIG_MTD_SPLIT=y
+# CONFIG_MTD_SPLIT_BRNIMAGE_FW is not set
+# CONFIG_MTD_SPLIT_EVA_FW is not set
 # CONFIG_MTD_SPLIT_FIRMWARE is not set
 CONFIG_MTD_SPLIT_FIRMWARE_NAME="firmware"
 # CONFIG_MTD_SPLIT_FIT_FW is not set
@@ -2546,8 +2571,6 @@ CONFIG_NET_SCHED=y
 # CONFIG_NET_SCH_CODEL is not set
 # CONFIG_NET_SCH_DRR is not set
 # CONFIG_NET_SCH_DSMARK is not set
-# CONFIG_NET_SCH_ESFQ is not set
-CONFIG_NET_SCH_ESFQ_NFCT=y
 CONFIG_NET_SCH_FIFO=y
 # CONFIG_NET_SCH_FQ is not set
 CONFIG_NET_SCH_FQ_CODEL=y
@@ -2568,6 +2591,7 @@ CONFIG_NET_SCH_FQ_CODEL=y
 # CONFIG_NET_SCH_SFQ is not set
 # CONFIG_NET_SCH_TBF is not set
 # CONFIG_NET_SCH_TEQL is not set
+# CONFIG_NET_SCTPPROBE is not set
 # CONFIG_NET_SWITCHDEV is not set
 # CONFIG_NET_TCPPROBE is not set
 # CONFIG_NET_TEAM is not set
@@ -2693,6 +2717,7 @@ CONFIG_NF_CONNTRACK_PROCFS=y
 # CONFIG_NF_NAT_SNMP_BASIC is not set
 # CONFIG_NF_NAT_TFTP is not set
 # CONFIG_NF_REJECT_IPV4 is not set
+# CONFIG_NF_REJECT_IPV6 is not set
 # CONFIG_NF_TABLES is not set
 # CONFIG_NI52 is not set
 # CONFIG_NI65 is not set
@@ -2775,19 +2800,6 @@ CONFIG_NLS_DEFAULT="iso8859-1"
 # CONFIG_OABI_COMPAT is not set
 # CONFIG_OBS600 is not set
 # CONFIG_OCFS2_FS is not set
-# CONFIG_OCF_BENCH is not set
-# CONFIG_OCF_C7108 is not set
-# CONFIG_OCF_CRYPTOCTEON is not set
-# CONFIG_OCF_EP80579 is not set
-# CONFIG_OCF_HIFN is not set
-# CONFIG_OCF_HIFNHIPP is not set
-# CONFIG_OCF_IXP4XX is not set
-# CONFIG_OCF_KIRKWOOD is not set
-# CONFIG_OCF_OCF is not set
-# CONFIG_OCF_OCFNULL is not set
-# CONFIG_OCF_SAFE is not set
-# CONFIG_OCF_TALITOS is not set
-# CONFIG_OCF_UBSEC_SSB is not set
 # CONFIG_OC_ETM is not set
 # CONFIG_OF_OVERLAY is not set
 # CONFIG_OF_SELFTEST is not set
@@ -2801,6 +2813,7 @@ CONFIG_NLS_DEFAULT="iso8859-1"
 # CONFIG_OMAP_USB3 is not set
 # CONFIG_OMFS_FS is not set
 # CONFIG_OPENVSWITCH is not set
+# CONFIG_OPROFILE is not set
 # CONFIG_OPROFILE_EVENT_MULTIPLEX is not set
 # CONFIG_ORION_WATCHDOG is not set
 # CONFIG_OSF_PARTITION is not set
@@ -2817,9 +2830,9 @@ CONFIG_PAGE_SIZE_4KB=y
 # CONFIG_PAGE_SIZE_64KB is not set
 # CONFIG_PAGE_SIZE_8KB is not set
 # CONFIG_PANEL is not set
-# CONFIG_PANIC_ON_OOPS is not set
-CONFIG_PANIC_ON_OOPS_VALUE=0
-CONFIG_PANIC_TIMEOUT=0
+CONFIG_PANIC_ON_OOPS=y
+CONFIG_PANIC_ON_OOPS_VALUE=1
+CONFIG_PANIC_TIMEOUT=1
 # CONFIG_PANTHERLORD_FF is not set
 # CONFIG_PARPORT is not set
 # CONFIG_PARPORT_1284 is not set
@@ -2887,6 +2900,7 @@ CONFIG_PARTITION_ADVANCED=y
 # CONFIG_PCIEASPM is not set
 # CONFIG_PCIEPORTBUS is not set
 # CONFIG_PCIE_ECRC is not set
+# CONFIG_PCIE_IPROC is not set
 # CONFIG_PCIPCWATCHDOG is not set
 # CONFIG_PCI_ATMEL is not set
 # CONFIG_PCI_CNB20LE_QUIRK is not set
@@ -3040,6 +3054,7 @@ CONFIG_PROC_SYSCTL=y
 # CONFIG_PTP_1588_CLOCK_IXP46X is not set
 # CONFIG_PTP_1588_CLOCK_PCH is not set
 # CONFIG_PWM is not set
+# CONFIG_PWM_FSL_FTM is not set
 # CONFIG_PWM_PCA9685 is not set
 # CONFIG_QCA7000 is not set
 # CONFIG_QLA3XXX is not set
@@ -3119,6 +3134,7 @@ CONFIG_RCU_TORTURE_TEST_SLOW_INIT_DELAY=3
 # CONFIG_REGULATOR_BQ24022 is not set
 # CONFIG_REGULATOR_DA9210 is not set
 # CONFIG_REGULATOR_DA9211 is not set
+# CONFIG_REGULATOR_DEBUG is not set
 # CONFIG_REGULATOR_FAN53555 is not set
 # CONFIG_REGULATOR_FIXED_VOLTAGE is not set
 # CONFIG_REGULATOR_GPIO is not set
@@ -3135,12 +3151,14 @@ CONFIG_RCU_TORTURE_TEST_SLOW_INIT_DELAY=3
 # CONFIG_REGULATOR_MAX8952 is not set
 # CONFIG_REGULATOR_MAX8973 is not set
 # CONFIG_REGULATOR_PFUZE100 is not set
+# CONFIG_REGULATOR_PWM is not set
 # CONFIG_REGULATOR_TI_ABB is not set
 # CONFIG_REGULATOR_TPS51632 is not set
 # CONFIG_REGULATOR_TPS62360 is not set
 # CONFIG_REGULATOR_TPS65023 is not set
 # CONFIG_REGULATOR_TPS6507X is not set
 # CONFIG_REGULATOR_TPS6524X is not set
+# CONFIG_REGULATOR_USERSPACE_CONSUMER is not set
 # CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
 # CONFIG_REISERFS_CHECK is not set
 # CONFIG_REISERFS_FS is not set
@@ -3968,6 +3986,7 @@ CONFIG_SQUASHFS_XZ=y
 # CONFIG_SSB_PCMCIAHOST is not set
 CONFIG_SSB_POSSIBLE=y
 # CONFIG_SSB_SDIOHOST is not set
+# CONFIG_SSB_HOST_SOC is not set
 # CONFIG_SSB_SILENT is not set
 # CONFIG_SSFDC is not set
 CONFIG_STACKTRACE_SUPPORT=y
@@ -4060,6 +4079,7 @@ CONFIG_TEXTSEARCH=y
 # CONFIG_THERMAL is not set
 # CONFIG_THERMAL_GOV_BANG_BANG is not set
 # CONFIG_THERMAL_HWMON is not set
+# CONFIG_THINKPAD_ACPI is not set
 # CONFIG_THRUSTMASTER_FF is not set
 # CONFIG_THUNDERBOLT is not set
 # CONFIG_TICK_CPU_ACCOUNTING is not set
@@ -4087,6 +4107,7 @@ CONFIG_TINY_RCU=y
 CONFIG_TMPFS=y
 # CONFIG_TMPFS_POSIX_ACL is not set
 CONFIG_TMPFS_XATTR=y
+# CONFIG_TOPSTAR_LAPTOP is not set
 # CONFIG_TORTURE_TEST is not set
 # CONFIG_TOSHIBA_HAPS is not set
 # CONFIG_TOUCHSCREEN_AD7877 is not set
@@ -4657,6 +4678,7 @@ CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
 # CONFIG_VIDEO_ZORAN is not set
 # CONFIG_VIRQ_DEBUG is not set
 # CONFIG_VIRTIO_BALLOON is not set
+# CONFIG_VIRTIO_INPUT is not set
 # CONFIG_VIRTIO_MMIO is not set
 # CONFIG_VIRTIO_PCI is not set
 # CONFIG_VIRTUALIZATION is not set