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

Conflicts were easy to resolve using immediate context mostly,
except the cls_u32.c one where I simply too the entire HEAD
chunk.

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

1 files changed, 0 insertions, 4 deletions

diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
index 3f4c0b167333..d4b0c79d2924 100644
--- a/include/linux/mmzone.h
+++ b/include/linux/mmzone.h
@@ -668,10 +668,6 @@ typedef struct pglist_data {
         wait_queue_head_t kcompactd_wait;
         struct task_struct *kcompactd;
 #endif
-#ifdef CONFIG_NUMA_BALANCING
-        /* Lock serializing the migrate rate limiting window */
-        spinlock_t numabalancing_migrate_lock;
-#endif
         /*
          * This is a per-node reserve of pages that are not available
          * to userspace allocations.