diff --git a/debian/changelog b/debian/changelog index 0d4aa2e53..5b7acbf04 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,26 @@ linux (3.13~rc4-1~exp1) UNRELEASED; urgency=low * [rt] Disable until it is updated for 3.13 or later * aufs: Update to aufs3.x-rcN-20131223 * [x86] staging: lustre: Make LUSTRE_LLITE_LLOOP tristate + * mm: Enable MEM_SOFT_DIRTY, NUMA_BALANCING but not + NUMA_BALANCING_DEFAULT_ENABLED + * ipv6: Enable IPV6_VTI as module + * netfilter: Enable NF_TABLES, NFT_EXTHDR, NFT_META, NFT_CT, NFT_RBTREE, + NFT_HASH, NFT_COUNTER, NFT_LOG, NFT_LIMIT, NFT_NAT, NFT_COMPAT, + IP_SET_HASH_NETPORTNET, IP_SET_HASH_NETNET, IP_NF_TARGET_SYNPROXY, + IP6_NF_TARGET_SYNPROXY as modules + * net/sched: Enable NET_CLS_BPF as module + * nfc: Enable NFC_DIGITAL, NFC_PORT100 as modules + * block: Enable BLK_DEV_NULL_BLK, BLK_DEV_SKD as modules + * SCSI: Enable SCSI_ESAS2R as module + * net/usb: Enable USB_NET_HUAWEI_CDC_NCM as module + * touchscreen: Enable TOUCHSCREEN_SUR40 as module + * [x86] video: Enable X86_SYSFB, FB_SIMPLE + * [x86] ACPI: Enable ACPI_EXTLOG + * [x86] touchscreen: Enable TOUCHSCREEN_TSC_SERIO as module + * [x86] tpm: Enable TCG_TIS_I2C_ATMEL, TCG_TIS_I2C_INFINEON, + TCG_TIS_I2C_NUVOTON, TCG_ST33_I2C, TCG_XEN as modules + * [amd64] misc: Enable INTEL_MIC_HOST as module + * [powerpc/powerpc64] block: Enable AIX_PARTITION [ Aurelien Jarno ] * [mipsel] Remove r5k-cobalt flavour. diff --git a/debian/config/config b/debian/config/config index 238b7198e..47d936582 100644 --- a/debian/config/config +++ b/debian/config/config @@ -250,12 +250,14 @@ CONFIG_BCMA_HOST_PCI=y ## file: drivers/block/Kconfig ## CONFIG_BLK_DEV=y +CONFIG_BLK_DEV_NULL_BLK=m # CONFIG_PARIDE is not set CONFIG_BLK_DEV_LOOP=m CONFIG_BLK_DEV_LOOP_MIN_COUNT=8 # CONFIG_BLK_DEV_CRYPTOLOOP is not set CONFIG_BLK_DEV_NBD=m CONFIG_BLK_DEV_NVME=m +CONFIG_BLK_DEV_SKD=m CONFIG_BLK_DEV_OSD=m CONFIG_BLK_DEV_RAM=m CONFIG_BLK_DEV_RAM_COUNT=16 @@ -1083,6 +1085,7 @@ CONFIG_TOUCHSCREEN_TOUCHIT213=m CONFIG_TOUCHSCREEN_TSC2007=m CONFIG_TOUCHSCREEN_W90X900=m # CONFIG_TOUCHSCREEN_ST1232 is not set +CONFIG_TOUCHSCREEN_SUR40=m CONFIG_TOUCHSCREEN_TPS6507X=m # CONFIG_TOUCHSCREEN_ZFORCE is not set @@ -2604,6 +2607,7 @@ CONFIG_USB_NET_AX88179_178A=m CONFIG_USB_NET_CDCETHER=m CONFIG_USB_NET_CDC_EEM=m CONFIG_USB_NET_CDC_NCM=m +CONFIG_USB_NET_HUAWEI_CDC_NCM=m CONFIG_USB_NET_CDC_MBIM=m CONFIG_USB_NET_DM9601=m CONFIG_USB_NET_SR9700=m @@ -2894,6 +2898,7 @@ CONFIG_ZD1211RW=m ## CONFIG_NFC_PN533=m CONFIG_NFC_SIM=m +CONFIG_NFC_PORT100=m ## ## file: drivers/of/Kconfig @@ -3224,6 +3229,11 @@ CONFIG_SCSI_DH_HP_SW=m CONFIG_SCSI_DH_EMC=m CONFIG_SCSI_DH_ALUA=m +## +## file: drivers/scsi/esas2r/Kconfig +## +CONFIG_SCSI_ESAS2R=m + ## ## file: drivers/scsi/libsas/Kconfig ## @@ -4518,6 +4528,8 @@ CONFIG_RCU_FANOUT=32 CONFIG_RCU_FAST_NO_HZ=y # CONFIG_IKCONFIG is not set CONFIG_LOG_BUF_SHIFT=17 +# CONFIG_NUMA_BALANCING_DEFAULT_ENABLED is not set +CONFIG_NUMA_BALANCING=y CONFIG_CGROUPS=y # CONFIG_CGROUP_DEBUG is not set CONFIG_CGROUP_FREEZER=y @@ -4795,6 +4807,7 @@ CONFIG_CROSS_MEMORY_ATTACH=y # CONFIG_CLEANCACHE is not set # CONFIG_FRONTSWAP is not set # CONFIG_CMA is not set +CONFIG_MEM_SOFT_DIRTY=y ## ## file: net/Kconfig @@ -5033,6 +5046,7 @@ CONFIG_IP_NF_MATCH_AH=m CONFIG_IP_NF_MATCH_RPFILTER=m CONFIG_IP_NF_FILTER=m CONFIG_IP_NF_TARGET_REJECT=m +CONFIG_IP_NF_TARGET_SYNPROXY=m CONFIG_IP_NF_TARGET_ULOG=m CONFIG_NF_NAT_IPV4=m CONFIG_IP_NF_TARGET_MASQUERADE=m @@ -5062,6 +5076,7 @@ CONFIG_INET6_XFRM_MODE_TRANSPORT=m CONFIG_INET6_XFRM_MODE_TUNNEL=m CONFIG_INET6_XFRM_MODE_BEET=m CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m +CONFIG_IPV6_VTI=m CONFIG_IPV6_SIT=m CONFIG_IPV6_SIT_6RD=y CONFIG_IPV6_TUNNEL=m @@ -5089,6 +5104,7 @@ CONFIG_IP6_NF_MATCH_RT=m CONFIG_IP6_NF_TARGET_HL=m CONFIG_IP6_NF_FILTER=m CONFIG_IP6_NF_TARGET_REJECT=m +CONFIG_IP6_NF_TARGET_SYNPROXY=m CONFIG_IP6_NF_MANGLE=m CONFIG_IP6_NF_RAW=m CONFIG_IP6_NF_SECURITY=m @@ -5164,6 +5180,17 @@ CONFIG_NF_CT_NETLINK=m CONFIG_NF_CT_NETLINK_TIMEOUT=y CONFIG_NF_CT_NETLINK_HELPER=m CONFIG_NETFILTER_NETLINK_QUEUE_CT=y +CONFIG_NF_TABLES=m +CONFIG_NFT_EXTHDR=m +CONFIG_NFT_META=m +CONFIG_NFT_CT=m +CONFIG_NFT_RBTREE=m +CONFIG_NFT_HASH=m +CONFIG_NFT_COUNTER=m +CONFIG_NFT_LOG=m +CONFIG_NFT_LIMIT=m +CONFIG_NFT_NAT=m +CONFIG_NFT_COMPAT=m CONFIG_NETFILTER_TPROXY=m CONFIG_NETFILTER_XTABLES=m CONFIG_NETFILTER_XT_SET=m @@ -5247,7 +5274,9 @@ CONFIG_IP_SET_HASH_IP=m CONFIG_IP_SET_HASH_IPPORT=m CONFIG_IP_SET_HASH_IPPORTIP=m CONFIG_IP_SET_HASH_IPPORTNET=m +CONFIG_IP_SET_HASH_NETPORTNET=m CONFIG_IP_SET_HASH_NET=m +CONFIG_IP_SET_HASH_NETNET=m CONFIG_IP_SET_HASH_NETPORT=m CONFIG_IP_SET_HASH_NETIFACE=m CONFIG_IP_SET_LIST_SET=m @@ -5293,6 +5322,7 @@ CONFIG_NETLINK_DIAG=m ## file: net/nfc/Kconfig ## CONFIG_NFC=m +CONFIG_NFC_DIGITAL=m ## ## file: net/nfc/hci/Kconfig @@ -5383,6 +5413,7 @@ CONFIG_NET_CLS_RSVP=m CONFIG_NET_CLS_RSVP6=m CONFIG_NET_CLS_FLOW=m CONFIG_NET_CLS_CGROUP=y +CONFIG_NET_CLS_BPF=m CONFIG_NET_EMATCH=y CONFIG_NET_EMATCH_STACK=32 CONFIG_NET_EMATCH_CMP=m diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config index 175045b2d..5fbf5aee1 100644 --- a/debian/config/kernelarch-x86/config +++ b/debian/config/kernelarch-x86/config @@ -65,6 +65,7 @@ CONFIG_HOTPLUG_CPU=y CONFIG_PCI=y # CONFIG_PCI_CNB20LE_QUIRK is not set # CONFIG_RAPIDIO is not set +CONFIG_X86_SYSFB=y CONFIG_IA32_EMULATION=y CONFIG_IA32_AOUT=y @@ -175,6 +176,7 @@ CONFIG_ACPI_HOTPLUG_MEMORY=y CONFIG_ACPI_SBS=m CONFIG_ACPI_HED=m # CONFIG_ACPI_CUSTOM_METHOD is not set +CONFIG_ACPI_EXTLOG=y ## ## file: drivers/acpi/apei/Kconfig @@ -327,9 +329,14 @@ CONFIG_IPMI_POWEROFF=m ## CONFIG_TCG_TPM=m CONFIG_TCG_TIS=m +CONFIG_TCG_TIS_I2C_ATMEL=m +CONFIG_TCG_TIS_I2C_INFINEON=m +CONFIG_TCG_TIS_I2C_NUVOTON=m CONFIG_TCG_NSC=m CONFIG_TCG_ATMEL=m CONFIG_TCG_INFINEON=m +CONFIG_TCG_ST33_I2C=m +CONFIG_TCG_XEN=m ## ## file: drivers/cpufreq/Kconfig @@ -646,6 +653,7 @@ CONFIG_HYPERV_KEYBOARD=m ## file: drivers/input/touchscreen/Kconfig ## CONFIG_INPUT_TOUCHSCREEN=y +CONFIG_TOUCHSCREEN_TSC_SERIO=m ## ## file: drivers/iommu/Kconfig @@ -1597,6 +1605,7 @@ CONFIG_FB_VOODOO1=m CONFIG_FB_TRIDENT=m CONFIG_FB_VIRTUAL=m CONFIG_FB_HYPERV=m +CONFIG_FB_SIMPLE=y ## ## file: drivers/video/console/Kconfig diff --git a/debian/config/kernelarch-x86/config-arch-64 b/debian/config/kernelarch-x86/config-arch-64 index 4b5b189d3..e9780376b 100644 --- a/debian/config/kernelarch-x86/config-arch-64 +++ b/debian/config/kernelarch-x86/config-arch-64 @@ -93,6 +93,7 @@ CONFIG_MAC_EMUMOUSEBTN=y ## ## file: drivers/misc/mic/Kconfig ## +CONFIG_INTEL_MIC_HOST=m # CONFIG_INTEL_MIC_CARD is not set ## diff --git a/debian/config/powerpc/config.powerpc64 b/debian/config/powerpc/config.powerpc64 index 99d5c19bf..269ddb03c 100644 --- a/debian/config/powerpc/config.powerpc64 +++ b/debian/config/powerpc/config.powerpc64 @@ -71,6 +71,11 @@ CONFIG_PPC_SPLPAR=y CONFIG_SCANLOG=m # CONFIG_LPARCFG is not set +## +## file: block/partitions/Kconfig +## +CONFIG_AIX_PARTITION=y + ## ## file: drivers/ata/Kconfig ##