tree ccfee93ede4e36d6d355e00e485d3d1c0fec0bdd
parent 6626af692692b52c8f9e20ad8201a3255e5ab25b
parent 4de930efc23b92ddf88ce91c405ee645fe6e27ea
author David S. Miller <davem@davemloft.net> 1426891869 -0400
committer David S. Miller <davem@davemloft.net> 1426891869 -0400

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

Conflicts:
	drivers/net/ethernet/emulex/benet/be_main.c
	net/core/sysctl_net_core.c
	net/ipv4/inet_diag.c

The be_main.c conflict resolution was really tricky.  The conflict
hunks generated by GIT were very unhelpful, to say the least.  It
split functions in half and moved them around, when the real actual
conflict only existed solely inside of one function, that being
be_map_pci_bars().

So instead, to resolve this, I checked out be_main.c from the top
of net-next, then I applied the be_main.c changes from 'net' since
the last time I merged.  And this worked beautifully.

The inet_diag.c and sysctl_net_core.c conflicts were simple
overlapping changes, and were easily to resolve.

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