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

..

cxgb3

Merge branches 'nes', 'cxgb4' and 'iwpm' into k.o/for-4.6

2016-03-16 13:57:43 -04:00

cxgb4

Merge branch 'for-next-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending

2016-03-23 15:57:39 -07:00

i40iw

i40iw: avoid potential uninitialized variable use

2016-04-06 10:37:16 -04:00

mlx4

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

2016-03-19 10:05:34 -07:00

mlx5

net/mlx5e: Device's mtu field is u16 and not int

2016-04-24 14:51:38 -04:00

mthca

mm/gup: Switch all callers of get_user_pages() to not pass tsk/mm

2016-02-16 10:11:12 +01:00

nes

infiniband: nes: Kill unused variable in nes_netdev_start_xmit()

2016-04-26 15:57:19 -04:00

ocrdma

IB/ocrdma: Skip using unneeded intermediate variable

2016-03-03 13:33:22 -05:00

qib

Round two of 4.6 merge window patches

2016-03-22 15:48:44 -07:00

usnic

Merge branch 'mm-pkeys-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2016-03-20 19:08:56 -07:00

Makefile

i40iw: changes for build of i40iw module

2016-03-16 13:50:54 -04:00