From: Steffen Klassert <steffen.klassert@secunet.com>
To: David Miller <davem@davemloft.net>
Cc: <herbert@gondor.apana.org.au>, <netdev@vger.kernel.org>
Subject: Re: pull request (net-next): ipsec-next 2017-02-16
Date: Fri, 17 Feb 2017 10:52:00 +0100 [thread overview]
Message-ID: <20170217095200.GB30338@gauss.secunet.com> (raw)
In-Reply-To: <20170216.220557.990082216928137722.davem@davemloft.net>
On Thu, Feb 16, 2017 at 10:05:57PM -0500, David Miller wrote:
> From: Steffen Klassert <steffen.klassert@secunet.com>
> Date: Thu, 16 Feb 2017 13:18:34 +0100
> >
> > Please note that this has a merge coflict between commit
> >
> > 63fca65d0863 ("net: add confirm_neigh method to dst_ops")
> >
> > from net-next and
> >
> > 3d7d25a68ea5 ("xfrm: policy: remove garbage_collect callback")
> > a2817d8b279b ("xfrm: policy: remove family field")
> >
> > from ipsec-next.
> >
> > The conflict can be solved as it is done in linux-next.
> >
> > Please pull or let me know if there are problems.
>
> Pulled, thanks. Please double check that I did the merge conflict
> resolution properly.
The resolution is correct, thanks!
prev parent reply other threads:[~2017-02-17 9:52 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-16 12:18 pull request (net-next): ipsec-next 2017-02-16 Steffen Klassert
2017-02-16 12:18 ` [PATCH 01/13] xfrm: input: constify xfrm_input_afinfo Steffen Klassert
2017-02-16 12:18 ` [PATCH 02/13] xfrm: policy: xfrm_get_tos cannot fail Steffen Klassert
2017-02-16 12:18 ` [PATCH 03/13] xfrm: policy: xfrm_policy_unregister_afinfo can return void Steffen Klassert
2017-02-16 12:18 ` [PATCH 04/13] xfrm: policy: remove garbage_collect callback Steffen Klassert
2017-02-16 12:18 ` [PATCH 05/13] xfrm: policy: remove family field Steffen Klassert
2017-02-16 12:18 ` [PATCH 06/13] xfrm: policy: remove xfrm_policy_put_afinfo Steffen Klassert
2017-02-16 12:18 ` [PATCH 07/13] xfrm: policy: make policy backend const Steffen Klassert
2017-02-16 12:18 ` [PATCH 08/13] xfrm: Add a secpath_set helper Steffen Klassert
2017-02-16 12:18 ` [PATCH 09/13] net: Add a skb_gro_flush_final helper Steffen Klassert
2017-02-16 12:18 ` [PATCH 10/13] net: Prepare gro for packet consuming gro callbacks Steffen Klassert
2017-02-16 12:18 ` [PATCH 11/13] xfrm: Export xfrm_parse_spi Steffen Klassert
2017-02-16 12:18 ` [PATCH 12/13] xfrm: Extend the sec_path for IPsec offloading Steffen Klassert
2017-02-16 12:18 ` [PATCH 13/13] esp: Add a software GRO codepath Steffen Klassert
2017-02-17 3:05 ` pull request (net-next): ipsec-next 2017-02-16 David Miller
2017-02-17 9:52 ` Steffen Klassert [this message]
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=20170217095200.GB30338@gauss.secunet.com \
--to=steffen.klassert@secunet.com \
--cc=davem@davemloft.net \
--cc=herbert@gondor.apana.org.au \
--cc=netdev@vger.kernel.org \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).