Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Conflicts:
	drivers/net/ethernet/rocker/rocker.c

The rocker commit was two overlapping changes, one to rename
the ->vport member to ->pport, and another making the bitmask
expression use '1ULL' instead of plain '1'.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 15 insertions, 15 deletions

diff --git a/lib/Kconfig b/lib/Kconfig
index cb9758e0ba0c..87da53bb1fef 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -23,7 +23,7 @@ config HAVE_ARCH_BITREVERSE
           have this capability.
 
 config RATIONAL
-        boolean
+        bool
 
 config GENERIC_STRNCPY_FROM_USER
         bool
@@ -48,14 +48,14 @@ config GENERIC_IOMAP
         select GENERIC_PCI_IOMAP
 
 config GENERIC_IO
-        boolean
+        bool
         default n
 
 config STMP_DEVICE
         bool
 
 config PERCPU_RWSEM
-        boolean
+        bool
 
 config ARCH_USE_CMPXCHG_LOCKREF
         bool
@@ -266,7 +266,7 @@ config DECOMPRESS_LZ4
 # Generic allocator support is selected if needed
 #
 config GENERIC_ALLOCATOR
-        boolean
+        bool
 
 #
 # reed solomon support is select'ed if needed
@@ -275,16 +275,16 @@ config REED_SOLOMON
         tristate
         
 config REED_SOLOMON_ENC8
-        boolean
+        bool
 
 config REED_SOLOMON_DEC8
-        boolean
+        bool
 
 config REED_SOLOMON_ENC16
-        boolean
+        bool
 
 config REED_SOLOMON_DEC16
-        boolean
+        bool
 
 #
 # BCH support is selected if needed
@@ -293,7 +293,7 @@ config BCH
         tristate
 
 config BCH_CONST_PARAMS
-        boolean
+        bool
         help
           Drivers may select this option to force specific constant
           values for parameters 'm' (Galois field order) and 't'
@@ -329,7 +329,7 @@ config BCH_CONST_T
 # Textsearch support is select'ed if needed
 #
 config TEXTSEARCH
-        boolean
+        bool
 
 config TEXTSEARCH_KMP
         tristate
@@ -341,10 +341,10 @@ config TEXTSEARCH_FSM
         tristate
 
 config BTREE
-        boolean
+        bool
 
 config INTERVAL_TREE
-        boolean
+        bool
         help
           Simple, embeddable, interval-tree. Can find the start of an
           overlapping range in log(n) time and then iterate over all
@@ -372,18 +372,18 @@ config ASSOCIATIVE_ARRAY
           for more information.
 
 config HAS_IOMEM
-        boolean
+        bool
         depends on !NO_IOMEM
         select GENERIC_IO
         default y
 
 config HAS_IOPORT_MAP
-        boolean
+        bool
         depends on HAS_IOMEM && !NO_IOPORT_MAP
         default y
 
 config HAS_DMA
-        boolean
+        bool
         depends on !NO_DMA
         default y