Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next

Browse source

Minor conflict in ip_output.c, overlapping changes to
the body of an if() statement.

Signed-off-by: David S. Miller <davem@davemloft.net>

...

This commit is contained in:

David S. Miller 2018-05-07 23:56:32 -04:00

parent 9d4927f0d3 565f0fa902

commit 62515f95b4

5 changed files with 114 additions and 8 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

net/ipv4/ip_output.c

View file

2

net/ipv6/ip6_vti.c

View file

6

net/ipv6/xfrm6_state.c

View file

9

net/xfrm/xfrm_state.c

View file

103

tools/testing/selftests/net/rtnetlink.sh

View file