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, 11 insertions, 11 deletions

diff --git a/mm/Kconfig b/mm/Kconfig
index de5239c152f9..a03131b6ba8e 100644
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -129,28 +129,28 @@ config SPARSEMEM_VMEMMAP
          efficient option when sufficient kernel resources are available.
 
 config HAVE_MEMBLOCK
-        boolean
+        bool
 
 config HAVE_MEMBLOCK_NODE_MAP
-        boolean
+        bool
 
 config HAVE_MEMBLOCK_PHYS_MAP
-        boolean
+        bool
 
 config HAVE_GENERIC_RCU_GUP
-        boolean
+        bool
 
 config ARCH_DISCARD_MEMBLOCK
-        boolean
+        bool
 
 config NO_BOOTMEM
-        boolean
+        bool
 
 config MEMORY_ISOLATION
-        boolean
+        bool
 
 config MOVABLE_NODE
-        boolean "Enable to assign a node which has only movable memory"
+        bool "Enable to assign a node which has only movable memory"
         depends on HAVE_MEMBLOCK
         depends on NO_BOOTMEM
         depends on X86_64
@@ -228,12 +228,12 @@ config SPLIT_PTLOCK_CPUS
         default "4"
 
 config ARCH_ENABLE_SPLIT_PMD_PTLOCK
-        boolean
+        bool
 
 #
 # support for memory balloon
 config MEMORY_BALLOON
-        boolean
+        bool
 
 #
 # support for memory balloon compaction
@@ -276,7 +276,7 @@ config MIGRATION
           allocation instead of reclaiming.
 
 config ARCH_ENABLE_HUGEPAGE_MIGRATION
-        boolean
+        bool
 
 config PHYS_ADDR_T_64BIT
         def_bool 64BIT || ARCH_PHYS_ADDR_T_64BIT