Merge branch 'linux-lng' into linux-lng-preempt-rtlinux-lng-preempt-rt-v3.10.17-rt12-finallinux-lng-preempt-rt-v3.10.17-rt12

7 files changed, 35 insertions, 2 deletions

diff --git a/linaro/configs/arndale.conf b/linaro/configs/arndale.conf
index 3a6c510f24a5..0add02ee1460 100644
--- a/linaro/configs/arndale.conf
+++ b/linaro/configs/arndale.conf
@@ -42,6 +42,7 @@ CONFIG_CPU_THERMAL=y
 CONFIG_EXYNOS_THERMAL=y
 CONFIG_MFD_SEC_CORE=y
 CONFIG_REGULATOR=y
+CONFIG_REGULATOR_FIXED_VOLTAGE=y
 CONFIG_REGULATOR_S5M8767=y
 CONFIG_USB=y
 CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
@@ -58,6 +59,7 @@ CONFIG_USB_OHCI_HCD=y
 CONFIG_USB_OHCI_EXYNOS=y
 CONFIG_USB_STORAGE=y
 CONFIG_SAMSUNG_USBPHY=y
+CONFIG_USB_HSIC_USB3503=y
 CONFIG_USB_GADGET=y
 CONFIG_MMC=y
 CONFIG_MMC_UNSAFE_RESUME=y
@@ -71,3 +73,4 @@ CONFIG_DEBUG_SPINLOCK=y
 CONFIG_DEBUG_INFO=y
 CONFIG_RCU_CPU_STALL_TIMEOUT=60
 CONFIG_DEBUG_USER=y
+CONFIG_TUN=y
diff --git a/linaro/configs/bigendian.conf b/linaro/configs/bigendian.conf
new file mode 100644
index 000000000000..281fa55d91d0
--- /dev/null
+++ b/linaro/configs/bigendian.conf
@@ -0,0 +1,5 @@
+CONFIG_CPU_BIG_ENDIAN=y
+CONFIG_CPU_ENDIAN_BE8=y
+CONFIG_CPU_BE8_BOOT_LE=y
+# CONFIG_VIRTUALIZATION is not set
+# CONFIG_MMC_DW_IDMAC is not set
diff --git a/linaro/configs/distribution.conf b/linaro/configs/distribution.conf
index fbcfed1b6ce8..7eab0a631571 100644
--- a/linaro/configs/distribution.conf
+++ b/linaro/configs/distribution.conf
@@ -6,23 +6,31 @@ CONFIG_SECCOMP=y
 CONFIG_CC_STACKPROTECTOR=y
 CONFIG_SYN_COOKIES=y
 CONFIG_IPV6=y
+CONFIG_IP_SCTP=m
 CONFIG_NETLABEL=y
 CONFIG_BRIDGE_NETFILTER=y
 CONFIG_NF_CONNTRACK=m
 CONFIG_NETFILTER_XT_CONNMARK=m
 CONFIG_NETFILTER_XT_MARK=m
+CONFIG_NETFILTER_XT_MATCH_LIMIT=m
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
 CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
+CONFIG_NETFILTER_XT_TARGET_LOG=m
+CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
 CONFIG_NF_CONNTRACK_IPV4=m
 CONFIG_NF_NAT_IPV4=m
 CONFIG_IP_NF_IPTABLES=m
 CONFIG_IP_NF_FILTER=m
 CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_REJECT=m
 CONFIG_NF_CONNTRACK_IPV6=m
 CONFIG_NF_NAT_IPV6=m
 CONFIG_IP6_NF_IPTABLES=m
 CONFIG_IP6_NF_FILTER=m
 CONFIG_IP6_NF_MANGLE=m
+CONFIG_IP6_NF_TARGET_REJECT=m
 CONFIG_BRIDGE_NF_EBTABLES=m
+CONFIG_BRIDGE_EBT_T_NAT=m
 CONFIG_BRIDGE_EBT_MARK_T=m
 CONFIG_BRIDGE=m
 CONFIG_DEVTMPFS=y
@@ -42,3 +50,11 @@ CONFIG_SECURITY_SELINUX=y
 CONFIG_SECURITY_SMACK=y
 CONFIG_SECURITY_APPARMOR=y
 CONFIG_DEFAULT_SECURITY_APPARMOR=y
+CONFIG_DUMMY=m
+CONFIG_EXPORTFS=m
+CONFIG_NFSD=m
+CONFIG_NFSD_V2_ACL=y
+CONFIG_NFSD_V3=y
+CONFIG_NFSD_V3_ACL=y
+CONFIG_NFSD_V4=y
+CONFIG_NFSD_FAULT_INJECTION=y
diff --git a/linaro/configs/highbank.conf b/linaro/configs/highbank.conf
index bf0f3c14b0d0..33b978128777 100644
--- a/linaro/configs/highbank.conf
+++ b/linaro/configs/highbank.conf
@@ -1,5 +1,7 @@
 CONFIG_EXPERIMENTAL=y
 CONFIG_NO_HZ=y
+CONFIG_HIGHMEM=y
+CONFIG_HIGHPTE=y
 CONFIG_HIGH_RES_TIMERS=y
 CONFIG_ARCH_HIGHBANK=y
 CONFIG_ARM_ERRATA_754322=y
diff --git a/linaro/configs/kvm-guest.conf b/linaro/configs/kvm-guest.conf
index 00e84a3ba1ec..cf174f89d043 100644
--- a/linaro/configs/kvm-guest.conf
+++ b/linaro/configs/kvm-guest.conf
@@ -1,3 +1,9 @@
+CONFIG_9P_FS=y
+CONFIG_NET_9P_VIRTIO=y
+CONFIG_NET_9P=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_OF_PLATFORM=y
 CONFIG_BALLOON_COMPACTION=y
 CONFIG_VIRTIO_BLK=y
 CONFIG_VIRTIO_NET=y
diff --git a/linaro/configs/linaro-base.conf b/linaro/configs/linaro-base.conf
index 947ca1f50935..44438e22c466 100644
--- a/linaro/configs/linaro-base.conf
+++ b/linaro/configs/linaro-base.conf
@@ -6,7 +6,6 @@ CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=16
 CONFIG_BLK_DEV_INITRD=y
 CONFIG_EMBEDDED=y
-CONFIG_HOTPLUG=y
 CONFIG_PERF_EVENTS=y
 CONFIG_SLAB=y
 CONFIG_PROFILING=y
@@ -70,7 +69,7 @@ CONFIG_JFFS2_RUBIN=y
 CONFIG_CRAMFS=y
 CONFIG_NETWORK_FILESYSTEMS=y
 CONFIG_NFS_FS=y
-# CONFIG_NFS_V2 is not set
+CONFIG_NFS_V2=y
 CONFIG_NFS_V3=y
 CONFIG_NFS_V3_ACL=y
 CONFIG_NFS_V4=y
diff --git a/linaro/configs/netns.conf b/linaro/configs/netns.conf
new file mode 100644
index 000000000000..7fadd7d67e36
--- /dev/null
+++ b/linaro/configs/netns.conf
@@ -0,0 +1,2 @@
+CONFIG_NAMESPACES=y
+CONFIG_VETH=y