mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-27 03:10:12 +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>
|
||
|---|---|---|
| .. | ||
| chain_mode.c | ||
| common.h | ||
| descs.h | ||
| descs_com.h | ||
| dwmac100.h | ||
| dwmac100_core.c | ||
| dwmac100_dma.c | ||
| dwmac1000.h | ||
| dwmac1000_core.c | ||
| dwmac1000_dma.c | ||
| dwmac_dma.h | ||
| dwmac_lib.c | ||
| enh_desc.c | ||
| Kconfig | ||
| Makefile | ||
| mmc.h | ||
| mmc_core.c | ||
| norm_desc.c | ||
| ring_mode.c | ||
| stmmac.h | ||
| stmmac_ethtool.c | ||
| stmmac_hwtstamp.c | ||
| stmmac_main.c | ||
| stmmac_mdio.c | ||
| stmmac_pci.c | ||
| stmmac_platform.c | ||
| stmmac_ptp.c | ||
| stmmac_ptp.h | ||