Messages in this thread | | | Date | Thu, 9 Jan 2014 13:41:17 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the ipsec-next tree with the net-next tree |
| |
Hi Steffen,
Today's linux-next merge of the ipsec-next tree got a conflict in net/xfrm/xfrm_policy.c between commits be7928d20bab ("net: xfrm: xfrm_policy: fix inline not at beginning of declaration") and da7c224b1baa ("net: xfrm: xfrm_policy: silence compiler warning") from the net-next tree and commit 2f3ea9a95c58 ("xfrm: checkpatch erros with inline keyword position") from the ipsec-next tree.
I fixed it up (I used the version from the net-next tree) and can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |