linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Steffen Klassert <steffen.klassert@secunet.com>,
	David Miller <davem@davemloft.net>,
	netdev@vger.kernel.org
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Daniel Borkmann <dborkman@redhat.com>,
	Weilong Chen <chenweilong@huawei.com>
Subject: linux-next: manual merge of the ipsec-next tree with the net-next tree
Date: Thu, 9 Jan 2014 13:41:17 +1100	[thread overview]
Message-ID: <20140109134117.41611cbfb87052212da67f03@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 605 bytes --]

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

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

             reply	other threads:[~2014-01-09  2:41 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-01-09  2:41 Stephen Rothwell [this message]
  -- strict thread matches above, loose matches on Subject: below --
2020-05-19  3:27 Stephen Rothwell
2019-12-15 23:38 Stephen Rothwell
2018-04-30  0:35 Stephen Rothwell
2017-02-12 23:25 Stephen Rothwell
2013-09-24  2:16 Stephen Rothwell
2013-09-24 10:25 ` Steffen Klassert
2013-09-24 23:59   ` Stephen Rothwell
2013-09-25  5:29     ` Steffen Klassert
2013-09-27  2:01       ` Stephen Rothwell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20140109134117.41611cbfb87052212da67f03@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=chenweilong@huawei.com \
    --cc=davem@davemloft.net \
    --cc=dborkman@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=steffen.klassert@secunet.com \
    --subject='Re: linux-next: manual merge of the ipsec-next tree with the net-next tree' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).