Merge remote-tracking branch 'kbuild/for-next'

Conflicts:
	drivers/net/ethernet/stmicro/stmmac/Kconfig

diff --cc Makefile
Simple merge

diff --cc arch/alpha/Kconfig
Simple merge

diff --cc arch/arm/mach-at91/Kconfig
Simple merge

diff --cc arch/m32r/Kconfig
Simple merge

diff --cc arch/mips/Kconfig
Simple merge

diff --cc arch/openrisc/Kconfig
Simple merge

diff --cc arch/powerpc/Kconfig
Simple merge

diff --cc arch/powerpc/platforms/40x/Kconfig
Simple merge

diff --cc arch/powerpc/platforms/Kconfig.cputype
Simple merge

diff --cc arch/powerpc/platforms/wsp/Kconfig
Simple merge

diff --cc arch/sparc/Kconfig
Simple merge

diff --cc arch/x86/Kconfig
Simple merge

diff --cc arch/x86/um/Kconfig
index 21bebe63df6660d08e0bd50ac6b8cb2486b76355,0000000000000000000000000000000000000000..1d97bd84b6fbcfe684b559cf271f7fe72d75f92b
mode 100644,000000..100644
--- 1/arch/x86/um/Kconfig
--- /dev/null
+++ b/arch/x86/um/Kconfig
@@@ -1,70 -1,0 +1,67 @@@
- config SMP_BROKEN
-       def_bool 64BIT
- 
 +mainmenu "User Mode Linux/$SUBARCH $KERNELVERSION Kernel Configuration"
 +
 +source "arch/um/Kconfig.common"
 +
 +menu "UML-specific options"
 +
 +menu "Host processor type and features"
 +
 +config CMPXCHG_LOCAL
 +      bool
 +      default n
 +
 +config CMPXCHG_DOUBLE
 +      bool
 +      default n
 +
 +source "arch/x86/Kconfig.cpu"
 +
 +endmenu
 +
 +config UML_X86
 +      def_bool y
 +      select GENERIC_FIND_FIRST_BIT
 +
 +config 64BIT
 +      bool
 +      default SUBARCH = "x86_64"
 +
 +config X86_32
 +      def_bool !64BIT
 +      select HAVE_AOUT
 +
 +config X86_64
 +      def_bool 64BIT
 +
 +config RWSEM_XCHGADD_ALGORITHM
 +      def_bool X86_XADD && 64BIT
 +
 +config RWSEM_GENERIC_SPINLOCK
 +      def_bool !RWSEM_XCHGADD_ALGORITHM
 +
 +config 3_LEVEL_PGTABLES
 +      bool "Three-level pagetables (EXPERIMENTAL)" if !64BIT
 +      default 64BIT
 +      depends on EXPERIMENTAL
 +      help
 +      Three-level pagetables will let UML have more than 4G of physical
 +      memory.  All the memory that can't be mapped directly will be treated
 +      as high memory.
 +
 +      However, this it experimental on 32-bit architectures, so if unsure say
 +      N (on x86-64 it's automatically enabled, instead, as it's safe there).
 +
 +config ARCH_HAS_SC_SIGNALS
 +      def_bool !64BIT
 +
 +config ARCH_REUSE_HOST_VSYSCALL_AREA
 +      def_bool !64BIT
 +
 +config GENERIC_HWEIGHT
 +      def_bool y
 +
 +source "arch/um/Kconfig.um"
 +
 +endmenu
 +
 +source "arch/um/Kconfig.rest"

diff --cc drivers/net/ethernet/stmicro/stmmac/Kconfig
index ac6f190743dd3227e269d8e05f9df894681e626f,0000000000000000000000000000000000000000..22745d7bf530d3e4865c869a671f981d4758019d
mode 100644,000000..100644
--- 1/drivers/net/ethernet/stmicro/stmmac/Kconfig
--- /dev/null
+++ b/drivers/net/ethernet/stmicro/stmmac/Kconfig
@@@ -1,84 -1,0 +1,75 @@@
- config STMMAC_DUAL_MAC
-       bool "STMMAC: dual mac support (EXPERIMENTAL)"
-       default n
-         depends on EXPERIMENTAL && STMMAC_ETH && !STMMAC_TIMER
-       ---help---
-         Some ST SoCs (for example the stx7141 and stx7200c2) have two
-         Ethernet Controllers. This option turns on the second Ethernet
-         device on this kind of platforms.
- 
 +config STMMAC_ETH
 +      tristate "STMicroelectronics 10/100/1000 Ethernet driver"
 +      depends on HAS_IOMEM
 +      select NET_CORE
 +      select MII
 +      select PHYLIB
 +      select CRC32
 +      ---help---
 +        This is the driver for the Ethernet IPs are built around a
 +        Synopsys IP Core and only tested on the STMicroelectronics
 +        platforms.
 +
 +if STMMAC_ETH
 +
 +config STMMAC_DEBUG_FS
 +      bool "Enable monitoring via sysFS "
 +      default n
 +      depends on STMMAC_ETH && DEBUG_FS
 +      -- help
 +        The stmmac entry in /sys reports DMA TX/RX rings
 +        or (if supported) the HW cap register.
 +
 +config STMMAC_DA
 +      bool "STMMAC DMA arbitration scheme"
 +      default n
 +      ---help---
 +        Selecting this option, rx has priority over Tx (only for Giga
 +        Ethernet device).
 +        By default, the DMA arbitration scheme is based on Round-robin
 +        (rx:tx priority is 1:1).
 +
 +config STMMAC_TIMER
 +      bool "STMMAC Timer optimisation"
 +      default n
 +      depends on RTC_HCTOSYS_DEVICE
 +      ---help---
 +        Use an external timer for mitigating the number of network
 +        interrupts. Currently, for SH architectures, it is possible
 +        to use the TMU channel 2 and the SH-RTC device.
 +
 +choice
 +        prompt "Select Timer device"
 +        depends on STMMAC_TIMER
 +
 +config STMMAC_TMU_TIMER
 +        bool "TMU channel 2"
 +        depends on CPU_SH4
 +      ---help---
 +
 +config STMMAC_RTC_TIMER
 +        bool "Real time clock"
 +        depends on RTC_CLASS
 +      ---help---
 +
 +endchoice
 +
 +choice
 +      prompt "Select the DMA TX/RX descriptor operating modes"
 +      depends on STMMAC_ETH
 +      ---help---
 +        This driver supports DMA descriptor to operate both in dual buffer
 +        (RING) and linked-list(CHAINED) mode. In RING mode each descriptor
 +        points to two data buffer pointers whereas in CHAINED mode they
 +        points to only one data buffer pointer.
 +
 +config STMMAC_RING
 +      bool "Enable Descriptor Ring Mode"
 +
 +config STMMAC_CHAINED
 +      bool "Enable Descriptor Chained Mode"
 +
 +endchoice
 +
 +
 +endif

diff --cc drivers/pci/Kconfig
Simple merge

diff --cc drivers/scsi/Kconfig
Simple merge

diff --cc scripts/checkpatch.pl
Simple merge