projects / platform / kernel / linux-starfive.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9d4927f 565f0fa)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec...
authorDavid S. Miller <davem@davemloft.net>
Tue, 8 May 2018 03:56:32 +0000 (23:56 -0400)
committerDavid S. Miller <davem@davemloft.net>
Tue, 8 May 2018 03:56:32 +0000 (23:56 -0400)
commit62515f95b45818ddd925569504fe52f4afd3eb7a
treed12c866b158b3e36801e4039221829edad0a0b7ftree | snapshot
parent9d4927f0d3760d8f10727c3035121d2677108f44commit | diff
parent565f0fa902b64020d5d147ff1708567e9e0b6e49commit | diff
Merge branch 'master' of git://git./linux/kernel/git/klassert/ipsec-next

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

Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv4/ip_output.c diff1 | diff2 | blob | history
Domain: System / Kernel;