diff options
| author |   David S. Miller <davem@davemloft.net> | 2015-12-17 22:08:28 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-12-17 22:08:28 -0500 |
| commit | b3e0d3d7bab14f2544a3314bec53a23dc7dd2206 (patch) | |
| tree | 2bd3c1c1d128e0c362655fa70a6eea02fc856f62 /lib/cpu-notifier-error-inject.c | |
| parent | team: Advertise tunneling offload features (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | wireguard-linux-b3e0d3d7bab14f2544a3314bec53a23dc7dd2206.tar.xz wireguard-linux-b3e0d3d7bab14f2544a3314bec53a23dc7dd2206.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/geneve.c
Here we had an overlapping change, where in 'net' the extraneous stats
bump was being removed whilst in 'net-next' the final argument to
udp_tunnel6_xmit_skb() was being changed.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'lib/cpu-notifier-error-inject.c')
0 files changed, 0 insertions, 0 deletions