mirror of
https://github.com/FEX-Emu/linux.git
synced 2025-01-09 11:00:52 +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>
|
||
|---|---|---|
| .. | ||
| ircomm | ||
| irlan | ||
| irnet | ||
| af_irda.c | ||
| discovery.c | ||
| irda_device.c | ||
| iriap_event.c | ||
| iriap.c | ||
| irias_object.c | ||
| irlap_event.c | ||
| irlap_frame.c | ||
| irlap.c | ||
| irlmp_event.c | ||
| irlmp_frame.c | ||
| irlmp.c | ||
| irmod.c | ||
| irnetlink.c | ||
| irproc.c | ||
| irqueue.c | ||
| irsysctl.c | ||
| irttp.c | ||
| Kconfig | ||
| Makefile | ||
| parameters.c | ||
| qos.c | ||
| timer.c | ||
| wrapper.c | ||