Conflicts: drivers/net/ethernet/rocker/rocker.c The rocker commit was two overlapping changes, one to rename the ->vport member to ->pport, and another making the bitmask expression use '1ULL' instead of plain '1'. Signed-off-by: David S. Miller <davem@davemloft.net> |
||
---|---|---|
.. | ||
Kconfig | ||
Makefile | ||
caif_dev.c | ||
caif_socket.c | ||
caif_usb.c | ||
cfcnfg.c | ||
cfctrl.c | ||
cfdbgl.c | ||
cfdgml.c | ||
cffrml.c | ||
cfmuxl.c | ||
cfpkt_skbuff.c | ||
cfrfml.c | ||
cfserl.c | ||
cfsrvl.c | ||
cfutill.c | ||
cfveil.c | ||
cfvidl.c | ||
chnl_net.c |