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

Just minor overlapping changes in the conflicts here.

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

1 files changed, 2 insertions, 1 deletions

diff --git a/kernel/locking/lockdep_proc.c b/kernel/locking/lockdep_proc.c
index 65b6a1600c8f..bda006f8a88b 100644
--- a/kernel/locking/lockdep_proc.c
+++ b/kernel/locking/lockdep_proc.c
@@ -200,7 +200,6 @@ static void lockdep_stats_debug_show(struct seq_file *m)
 
 static int lockdep_stats_show(struct seq_file *m, void *v)
 {
-        struct lock_class *class;
         unsigned long nr_unused = 0, nr_uncategorized = 0,
                       nr_irq_safe = 0, nr_irq_unsafe = 0,
                       nr_softirq_safe = 0, nr_softirq_unsafe = 0,
@@ -211,6 +210,8 @@ static int lockdep_stats_show(struct seq_file *m, void *v)
                       sum_forward_deps = 0;
 
 #ifdef CONFIG_PROVE_LOCKING
+        struct lock_class *class;
+
         list_for_each_entry(class, &all_lock_classes, lock_entry) {
 
                 if (class->usage_mask == 0)