d31e95585c
The only slightly tricky merge conflict was the netdevsim because the mutex locking fix overlapped a lot of driver reload reorganization. The rest were (relatively) trivial in nature. Signed-off-by: David S. Miller <davem@davemloft.net> |
||
|---|---|---|
| .. | ||
| Makefile | ||
| ipvlan.h | ||
| ipvlan_core.c | ||
| ipvlan_l3s.c | ||
| ipvlan_main.c | ||
| ipvtap.c | ||