We got slightly different patches removing a double word
in a comment in net/ipv4/raw.c - picked the version from net.
Simple conflict in drivers/net/ethernet/ibm/ibmvnic.c. Use cached
values instead of VNIC login response buffer (following what
commit
|
||
|---|---|---|
| .. | ||
| cassini.c | ||
| cassini.h | ||
| Kconfig | ||
| ldmvsw.c | ||
| Makefile | ||
| niu.c | ||
| niu.h | ||
| sunbmac.c | ||
| sunbmac.h | ||
| sungem.c | ||
| sungem.h | ||
| sunhme.c | ||
| sunhme.h | ||
| sunqe.c | ||
| sunqe.h | ||
| sunvnet.c | ||
| sunvnet_common.c | ||
| sunvnet_common.h | ||