![]() Conflicts: drivers/net/ethernet/emulex/benet/be_main.c drivers/net/ethernet/intel/igb/igb_main.c drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c include/net/scm.h net/batman-adv/routing.c net/ipv4/tcp_input.c The e{uid,gid} --> {uid,gid} credentials fix conflicted with the cleanup in net-next to now pass cred structs around. The be2net driver had a bug fix in 'net' that overlapped with the VLAN interface changes by Patrick McHardy in net-next. An IGB conflict existed because in 'net' the build_skb() support was reverted, and in 'net-next' there was a comment style fix within that code. Several batman-adv conflicts were resolved by making sure that all calls to batadv_is_my_mac() are changed to have a new bat_priv first argument. Eric Dumazet's TS ECR fix in TCP in 'net' conflicted with the F-RTO rewrite in 'net-next', mostly overlapping changes. Thanks to Stephen Rothwell and Antonio Quartulli for help with several of these merge resolutions. Signed-off-by: David S. Miller <davem@davemloft.net> |
||
---|---|---|
.. | ||
claw.c | ||
claw.h | ||
ctcm_dbug.c | ||
ctcm_dbug.h | ||
ctcm_fsms.c | ||
ctcm_fsms.h | ||
ctcm_main.c | ||
ctcm_main.h | ||
ctcm_mpc.c | ||
ctcm_mpc.h | ||
ctcm_sysfs.c | ||
fsm.c | ||
fsm.h | ||
Kconfig | ||
lcs.c | ||
lcs.h | ||
Makefile | ||
netiucv.c | ||
qeth_core.h | ||
qeth_core_main.c | ||
qeth_core_mpc.c | ||
qeth_core_mpc.h | ||
qeth_core_sys.c | ||
qeth_l2_main.c | ||
qeth_l3.h | ||
qeth_l3_main.c | ||
qeth_l3_sys.c | ||
smsgiucv.c | ||
smsgiucv.h | ||
smsgiucv_app.c |