David S. Miller c0cc53162a Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Minor overlapping changes in the conflicts.

In the macsec case, the change of the default ID macro
name overlapped with the 64-bit netlink attribute alignment
fixes in net-next.

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

2016-04-27 15:43:10 -04:00

..

asm-generic

generic syscalls: wire up preadv2 and pwritev2 syscalls

2016-04-23 22:38:08 +02:00

drm

Merge tag 'topic/drm-misc-2016-03-14' of git://anongit.freedesktop.org/drm-intel into drm-next

2016-03-16 11:09:26 +10:00

linux

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

2016-04-27 15:43:10 -04:00

misc

cxl: Support to flash a new image on the adapter from a guest

2016-03-09 23:39:56 +11:00

mtd

mtd: mtd-user: remove stdint.h include

2015-10-19 18:19:06 -07:00

rdma

Merge branches 'i40iw', 'sriov' and 'hfi1' into k.o/for-4.6

2016-03-21 17:32:23 -04:00

scsi

cxlflash: Fix to avoid virtual LUN failover failure

2016-01-06 20:50:08 -05:00

sound

ALSA: seq: Provide card number / PID via sequencer client info

2016-03-08 10:52:52 +01:00

video

…

xen

xen/gntdev: add ioctl for grant copy

2016-01-07 13:21:53 +00:00

Kbuild

cxl: Add userspace header file

2014-10-08 20:15:57 +11:00