summaryrefslogtreecommitdiff
path: root/include/net/phonet
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-02-09 11:34:15 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2017-02-09 11:34:15 -0800
commit189addce85330208bea50ea7f1483b58822e93cf (patch)
tree39455d91caa0463c7c4fdcd9c76b81e18541b29d /include/net/phonet
parent59e8f10ac16186c226ef81937994534b28b976f4 (diff)
parent930a42ded3fede7ca3acafc9153f4f2d0f56a92c (diff)
Merge tag 'vfio-v4.10-final' of git://github.com/awilliam/linux-vfio
Pull VFIO fix from Alex Williamson: "Fix regression in attaching groups to existing container for SPAPR IOMMU backend (Alexey Kardashevskiy)" * tag 'vfio-v4.10-final' of git://github.com/awilliam/linux-vfio: vfio/spapr_tce: Set window when adding additional groups to container
Diffstat (limited to 'include/net/phonet')
0 files changed, 0 insertions, 0 deletions
a4a8600bbe5edeb9d7c72780d3a2&id2=05e0be7c900797e9164976a6014d534ce3035909'>include/linux/micrel_phy.h2
-rw-r--r--include/linux/mmzone.h6
-rw-r--r--include/linux/nfs4.h3
-rw-r--r--include/linux/nmi.h1
-rw-r--r--include/linux/percpu-refcount.h4
-rw-r--r--include/linux/phy.h1
-rw-r--r--include/linux/phy_led_triggers.h4
-rw-r--r--include/linux/sunrpc/clnt.h1
-rw-r--r--include/linux/suspend.h2
-rw-r--r--include/linux/virtio_net.h6
-rw-r--r--include/net/ipv6.h2
-rw-r--r--include/net/lwtunnel.h13
-rw-r--r--include/net/netfilter/nf_tables.h6
-rw-r--r--include/net/netfilter/nft_fib.h6
-rw-r--r--include/rdma/ib_verbs.h14
-rw-r--r--include/soc/arc/mcip.h16
-rw-r--r--include/uapi/linux/cec-funcs.h10
-rw-r--r--include/uapi/linux/netfilter/nf_log.h2
-rw-r--r--include/uapi/linux/netfilter/nf_tables.h4
-rw-r--r--include/uapi/rdma/Kbuild1
-rw-r--r--include/uapi/rdma/cxgb3-abi.h2
26 files changed, 133 insertions, 53 deletions
diff --git a/include/drm/drm_atomic.h b/include/drm/drm_atomic.h