linux_dsm_epyc7002/include/uapi
David S. Miller f8ddadc4db Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
There were quite a few overlapping sets of changes here.

Daniel's bug fix for off-by-ones in the new BPF branch instructions,
along with the added allowances for "data_end > ptr + x" forms
collided with the metadata additions.

Along with those three changes came veritifer test cases, which in
their final form I tried to group together properly.  If I had just
trimmed GIT's conflict tags as-is, this would have split up the
meta tests unnecessarily.

In the socketmap code, a set of preemption disabling changes
overlapped with the rename of bpf_compute_data_end() to
bpf_compute_data_pointers().

Changes were made to the mv88e6060.c driver set addr method
which got removed in net-next.

The hyperv transport socket layer had a locking change in 'net'
which overlapped with a change of socket state macro usage
in 'net-next'.

Signed-off-by: David S. Miller <davem@davemloft.net>
2017-10-22 13:39:14 +01:00
..
asm-generic Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace 2017-09-11 18:34:47 -07:00
drm Merge branch 'drm-vmwgfx-next' of git://people.freedesktop.org/~syeh/repos_linux into drm-next 2017-08-29 10:38:14 +10:00
linux Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2017-10-22 13:39:14 +01:00
misc uapi: export all headers under uapi directories 2017-05-11 00:21:54 +09:00
mtd uapi: export all headers under uapi directories 2017-05-11 00:21:54 +09:00
rdma IB/core: Fix typo in the name of the tag-matching cap struct 2017-09-25 11:47:23 -04:00
scsi scsi: cxlflash: Support AFU debug 2017-06-26 15:01:12 -04:00
sound Merge remote-tracking branch 'asoc/topic/intel' into asoc-next 2017-09-01 12:12:19 +01:00
video uapi: export all headers under uapi directories 2017-05-11 00:21:54 +09:00
xen uapi: export all headers under uapi directories 2017-05-11 00:21:54 +09:00