Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Sat, 22 Nov 2014 03:28:24 +0000 (22:28 -0500)
committerDavid S. Miller <davem@davemloft.net>
Sat, 22 Nov 2014 03:28:24 +0000 (22:28 -0500)
commit1459143386c5d868c87903b8d433a52cffcf3e66
treee7878a550aaf6a3af5e84f4258bbcc3bbdd20fef
parent53b15ef3c2a6bac8e3d9bb58c5689d731ed9593b
parent8a84e01e147f44111988f9d8ccd2eaa30215a0f2
Merge git://git./linux/kernel/git/davem/net

Conflicts:
drivers/net/ieee802154/fakehard.c

A bug fix went into 'net' for ieee802154/fakehard.c, which is removed
in 'net-next'.

Add build fix into the merge from Stephen Rothwell in openvswitch, the
logging macros take a new initial 'log' argument, a new call was added
in 'net' so when we merge that in here we have to explicitly add the
new 'log' arg to it else the build fails.

Signed-off-by: David S. Miller <davem@davemloft.net>
18 files changed:
MAINTAINERS
drivers/net/bonding/bond_main.c
drivers/net/ethernet/emulex/benet/be_main.c
drivers/net/ethernet/mellanox/mlx4/en_netdev.c
drivers/net/vxlan.c
drivers/net/wireless/ath/ath9k/main.c
drivers/net/wireless/brcm80211/brcmfmac/of.c
drivers/net/wireless/brcm80211/brcmfmac/pcie.c
drivers/net/wireless/brcm80211/brcmfmac/usb.c
drivers/scsi/cxgbi/cxgb4i/cxgb4i.c
net/core/skbuff.c
net/ipv4/tcp_input.c
net/ipv6/ip6mr.c
net/ipx/af_ipx.c
net/mac80211/rc80211_minstrel_ht.c
net/openvswitch/actions.c
net/openvswitch/datapath.c
net/openvswitch/flow_netlink.c