linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Steffen Klassert <steffen.klassert@secunet.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Fan Du <fan.du@windriver.com>, Joe Perches <joe@perches.com>,
	David Miller <davem@davemloft.net>,
	netdev@vger.kernel.org
Subject: Re: linux-next: manual merge of the ipsec-next tree with the net-next tree
Date: Wed, 25 Sep 2013 07:29:23 +0200	[thread overview]
Message-ID: <20130925052923.GU7660@secunet.com> (raw)
In-Reply-To: <20130925095919.143635403832766c1b190202@canb.auug.org.au>

On Wed, Sep 25, 2013 at 09:59:19AM +1000, Stephen Rothwell wrote:
> Hi Steffen,
> 
> On Tue, 24 Sep 2013 12:25:05 +0200 Steffen Klassert <steffen.klassert@secunet.com> wrote:
> >
> > On Tue, Sep 24, 2013 at 12:16:29PM +1000, Stephen Rothwell wrote:
> > > 
> > > Today's linux-next merge of the ipsec-next tree got a conflict in
> > > include/net/xfrm.h between commit d511337a1eda ("xfrm.h: Remove extern
> > > from function prototypes") from the net-next tree and commit aba826958830
> > > ("{ipv4,xfrm}: Introduce xfrm_tunnel_notifier for xfrm tunnel mode
> > > callback") from the ipsec-next tree.
> > 
> > Thanks for the information, I'll do a rebase of the ipsec-next
> > tree tomorrow.
> 
> Did you miss the end of the next paragraph:  "no action is required"?
> Dave can fix this up (like I did) when he merges your tree into his.
> 

I applied this patch shortly before the merge window opened, it is a left
over from the last develpoment cycle. I already rebased my tree onto
net-next in the past if that happened, even if there were no merge
conflicts. I did that just to see if everything still works. But I
could also do a test merge to see if everything still works and ask
to pull without a rebase then if this is the prefered way. Would make
my life easier :)

  reply	other threads:[~2013-09-25  5:29 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
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 [this message]
2013-09-27  2:01       ` Stephen Rothwell
2014-01-09  2:41 Stephen Rothwell
2017-02-12 23:25 Stephen Rothwell
2018-04-30  0:35 Stephen Rothwell
2019-12-15 23:38 Stephen Rothwell
2020-05-19  3:27 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=20130925052923.GU7660@secunet.com \
    --to=steffen.klassert@secunet.com \
    --cc=davem@davemloft.net \
    --cc=fan.du@windriver.com \
    --cc=joe@perches.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    --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).