mirror of https://github.com/torvalds/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>
|
||
|---|---|---|
| .. | ||
| bestcomm | ||
| ioat | ||
| ipu | ||
| ppc4xx | ||
| sh | ||
| Kconfig | ||
| Makefile | ||
| TODO | ||
| amba-pl08x.c | ||
| at_hdmac.c | ||
| at_hdmac_regs.h | ||
| coh901318.c | ||
| coh901318.h | ||
| coh901318_lli.c | ||
| dmaengine.c | ||
| dmaengine.h | ||
| dmatest.c | ||
| dw_dmac.c | ||
| dw_dmac_regs.h | ||
| edma.c | ||
| ep93xx_dma.c | ||
| fsldma.c | ||
| fsldma.h | ||
| imx-dma.c | ||
| imx-sdma.c | ||
| intel_mid_dma.c | ||
| intel_mid_dma_regs.h | ||
| iop-adma.c | ||
| iovlock.c | ||
| mmp_pdma.c | ||
| mmp_tdma.c | ||
| mpc512x_dma.c | ||
| mv_xor.c | ||
| mv_xor.h | ||
| mxs-dma.c | ||
| of-dma.c | ||
| omap-dma.c | ||
| pch_dma.c | ||
| pl330.c | ||
| sa11x0-dma.c | ||
| sirf-dma.c | ||
| ste_dma40.c | ||
| ste_dma40_ll.c | ||
| ste_dma40_ll.h | ||
| tegra20-apb-dma.c | ||
| timb_dma.c | ||
| txx9dmac.c | ||
| txx9dmac.h | ||
| virt-dma.c | ||
| virt-dma.h | ||