forked from Minki/linux
54e5c4def0
Conflicts: drivers/net/bonding/bond_alb.c drivers/net/ethernet/altera/altera_msgdma.c drivers/net/ethernet/altera/altera_sgdma.c net/ipv6/xfrm6_output.c Several cases of overlapping changes. The xfrm6_output.c has a bug fix which overlaps the renaming of skb->local_df to skb->ignore_df. In the Altera TSE driver cases, the register access cleanups in net-next overlapped with bug fixes done in net. Similarly a bug fix to send ALB packets in the bonding driver using the right source address overlaps with cleanups in net-next. Signed-off-by: David S. Miller <davem@davemloft.net> |
||
|---|---|---|
| .. | ||
| altera_msgdma.c | ||
| altera_msgdma.h | ||
| altera_msgdmahw.h | ||
| altera_sgdma.c | ||
| altera_sgdma.h | ||
| altera_sgdmahw.h | ||
| altera_tse_ethtool.c | ||
| altera_tse_main.c | ||
| altera_tse.h | ||
| altera_utils.c | ||
| altera_utils.h | ||
| Kconfig | ||
| Makefile | ||