![]() Conflicts: drivers/net/ethernet/freescale/fec_main.c drivers/net/ethernet/renesas/sh_eth.c net/ipv4/gre.c The GRE conflict is between a bug fix (kfree_skb --> kfree_skb_list) and the splitting of the gre.c code into seperate files. The FEC conflict was two sets of changes adding ethtool support code in an "!CONFIG_M5272" CPP protected block. Finally the sh_eth.c conflict was between one commit add bits set in the .eesr_err_check mask whilst another commit removed the .tx_error_check member and assignments. Signed-off-by: David S. Miller <davem@davemloft.net> |
||
---|---|---|
.. | ||
bond_3ad.c | ||
bond_3ad.h | ||
bond_alb.c | ||
bond_alb.h | ||
bond_debugfs.c | ||
bond_main.c | ||
bond_procfs.c | ||
bond_sysfs.c | ||
bonding.h | ||
Makefile |