]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: cabdb1d 036febd)
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)
commit5f2cb8b89d40e565edf998a8c2c7709ca759a6f7
treed12c866b158b3e36801e4039221829edad0a0b7ftree | snapshot
parentcabdb1da6c6c0ef46dac0c69101e8f6edb499653commit | diff
parent036febd6444da15af9e4d378b8c84c4fbb6bd07dcommit | diff
Merge branch 'master' of git://git.kernel.org/pub/scm/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
Linux Kernel Source Tree.