mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-12-16 07:24:39 +08:00
06c54055be
Conflicts: drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c net/bridge/br_multicast.c net/ipv6/sit.c The conflicts were minor: 1) sit.c changes overlap with change to ip_tunnel_xmit() signature. 2) br_multicast.c had an overlap between computing max_delay using msecs_to_jiffies and turning MLDV2_MRC() into an inline function with a name using lowercase instead of uppercase letters. 3) stmmac had two overlapping changes, one which conditionally allocated and hooked up a dma_cfg based upon the presence of the pbl OF property, and another one handling store-and-forward DMA made. The latter of which should not go into the new of_find_property() basic block. Signed-off-by: David S. Miller <davem@davemloft.net> |
||
|---|---|---|
| .. | ||
| 8390.c | ||
| 8390.h | ||
| 8390p.c | ||
| apne.c | ||
| ax88796.c | ||
| axnet_cs.c | ||
| etherh.c | ||
| hydra.c | ||
| Kconfig | ||
| lib8390.c | ||
| mac8390.c | ||
| Makefile | ||
| mcf8390.c | ||
| ne2k-pci.c | ||
| ne-h8300.c | ||
| ne.c | ||
| pcnet_cs.c | ||
| smc-ultra.c | ||
| stnic.c | ||
| wd.c | ||
| zorro8390.c | ||