mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-08-05 16:54:27 +00:00
6e0895c2ea
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>
|
||
|---|---|---|
| .. | ||
| e1000_82575.c | ||
| e1000_82575.h | ||
| e1000_defines.h | ||
| e1000_hw.h | ||
| e1000_i210.c | ||
| e1000_i210.h | ||
| e1000_mac.c | ||
| e1000_mac.h | ||
| e1000_mbx.c | ||
| e1000_mbx.h | ||
| e1000_nvm.c | ||
| e1000_nvm.h | ||
| e1000_phy.c | ||
| e1000_phy.h | ||
| e1000_regs.h | ||
| igb.h | ||
| igb_ethtool.c | ||
| igb_hwmon.c | ||
| igb_main.c | ||
| igb_ptp.c | ||
| Makefile | ||