Merge branch 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

Pull core locking changes from Ingo Molnar:
 "The biggest changes:

   - add lockdep support for seqcount/seqlocks structures, this
     unearthed both bugs and required extra annotation.

   - move the various kernel locking primitives to the new
     kernel/locking/ directory"

* 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (21 commits)
  block: Use u64_stats_init() to initialize seqcounts
  locking/lockdep: Mark __lockdep_count_forward_deps() as static
  lockdep/proc: Fix lock-time avg computation
  locking/doc: Update references to kernel/mutex.c
  ipv6: Fix possible ipv6 seqlock deadlock
  cpuset: Fix potential deadlock w/ set_mems_allowed
  seqcount: Add lockdep functionality to seqcount/seqlock structures
  net: Explicitly initialize u64_stats_sync structures for lockdep
  locking: Move the percpu-rwsem code to kernel/locking/
  locking: Move the lglocks code to kernel/locking/
  locking: Move the rwsem code to kernel/locking/
  locking: Move the rtmutex code to kernel/locking/
  locking: Move the semaphore core to kernel/locking/
  locking: Move the spinlock code to kernel/locking/
  locking: Move the lockdep code to kernel/locking/
  locking: Move the mutex code to kernel/locking/
  hung_task debugging: Add tracepoint to report the hang
  x86/locking/kconfig: Update paravirt spinlock Kconfig description
  lockstat: Report avg wait and hold times
  lockdep, x86/alternatives: Drop ancient lockdep fixup message
  ...

diff --cc arch/x86/Kconfig
Simple merge

diff --cc drivers/net/ethernet/emulex/benet/be_main.c
Simple merge

diff --cc drivers/net/ethernet/intel/igb/igb_main.c
Simple merge

diff --cc drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
Simple merge

diff --cc drivers/net/ethernet/marvell/mvneta.c
Simple merge

diff --cc drivers/net/ethernet/marvell/sky2.c
Simple merge

diff --cc drivers/net/ethernet/neterion/vxge/vxge-main.c
Simple merge

diff --cc drivers/net/ethernet/realtek/8139too.c
Simple merge

diff --cc drivers/net/ethernet/via/via-rhine.c
Simple merge

diff --cc drivers/net/macvlan.c
Simple merge

diff --cc drivers/net/veth.c
Simple merge

diff --cc drivers/net/virtio_net.c
index 01f4eb5c8b786aca792cd42b8e87568ced1413d1,ee384f3d612b2b576d0e10e617f08aa3bd6737cd..bf7c734259ad640f235b3be752b8f9f38e59fd80
--- 1/drivers/net/virtio_net.c
--- 2/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@@ -1576,6 -1569,18 +1576,13 @@@ static int virtnet_probe(struct virtio_
        if (vi->stats == NULL)
                goto free;
  
 -
 -      vi->vq_index = alloc_percpu(int);
 -      if (vi->vq_index == NULL)
 -              goto free_stats;
 -
+       for_each_possible_cpu(i) {
+               struct virtnet_stats *virtnet_stats;
+               virtnet_stats = per_cpu_ptr(vi->stats, i);
+               u64_stats_init(&virtnet_stats->tx_syncp);
+               u64_stats_init(&virtnet_stats->rx_syncp);
+       }
+ 
        mutex_init(&vi->config_lock);
        vi->config_enable = true;
        INIT_WORK(&vi->config_work, virtnet_config_changed_work);

diff --cc drivers/net/vxlan.c
Simple merge

diff --cc drivers/net/xen-netfront.c
Simple merge

diff --cc fs/dcache.c
Simple merge

diff --cc kernel/sysctl.c
Simple merge

diff --cc lib/Makefile
Simple merge

diff --cc net/8021q/vlan_dev.c
Simple merge

diff --cc net/bridge/br_device.c
Simple merge

diff --cc net/ipv4/af_inet.c
Simple merge

diff --cc net/ipv6/addrconf.c
Simple merge

diff --cc net/ipv6/af_inet6.c
Simple merge

diff --cc net/ipv6/ip6_output.c
Simple merge

diff --cc net/ipv6/sit.c
Simple merge

diff --cc net/netfilter/ipvs/ip_vs_ctl.c
Simple merge

diff --cc net/openvswitch/datapath.c
index 1408adc2a2a7d2c47f4e32f71863bbd3a04cfdf2,b92553c02279cec798f1e9047b822654b7940bcd..449e0776a2c0887bea75fbc963224a37d20ccb33
--- 1/net/openvswitch/datapath.c
--- 2/net/openvswitch/datapath.c
+++ b/net/openvswitch/datapath.c
@@@ -1199,8 -1698,14 +1199,14 @@@ static int ovs_dp_cmd_new(struct sk_buf
                goto err_destroy_table;
        }
  
+       for_each_possible_cpu(i) {
+               struct dp_stats_percpu *dpath_stats;
+               dpath_stats = per_cpu_ptr(dp->stats_percpu, i);
+               u64_stats_init(&dpath_stats->sync);
+       }
+ 
        dp->ports = kmalloc(DP_VPORT_HASH_BUCKETS * sizeof(struct hlist_head),
 -                      GFP_KERNEL);
 +                          GFP_KERNEL);
        if (!dp->ports) {
                err = -ENOMEM;
                goto err_destroy_percpu;