mirror of https://gitee.com/openkylin/linux.git
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> |
||
---|---|---|
.. | ||
Kbuild | ||
apc.h | ||
asi.h | ||
auxvec.h | ||
bitsperlong.h | ||
byteorder.h | ||
display7seg.h | ||
envctrl.h | ||
errno.h | ||
fbio.h | ||
fcntl.h | ||
ioctl.h | ||
ioctls.h | ||
ipcbuf.h | ||
jsflash.h | ||
kvm_para.h | ||
mman.h | ||
msgbuf.h | ||
openpromio.h | ||
param.h | ||
perfctr.h | ||
poll.h | ||
posix_types.h | ||
psr.h | ||
psrcompat.h | ||
pstate.h | ||
ptrace.h | ||
resource.h | ||
sembuf.h | ||
setup.h | ||
shmbuf.h | ||
sigcontext.h | ||
siginfo.h | ||
signal.h | ||
socket.h | ||
sockios.h | ||
stat.h | ||
statfs.h | ||
swab.h | ||
termbits.h | ||
termios.h | ||
traps.h | ||
uctx.h | ||
unistd.h | ||
utrap.h | ||
watchdog.h |