From: Stefano Brivio <sbrivio@redhat.com>
To: Petr Machata <petrm@mellanox.com>,
Stephen Rothwell <sfr@canb.auug.org.au>,
Steffen Klassert <steffen.klassert@secunet.com>
Cc: David Miller <davem@davemloft.net>,
Networking <netdev@vger.kernel.org>,
Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: linux-next: manual merge of the ipsec tree with the net tree
Date: Tue, 27 Mar 2018 19:23:59 +0200 [thread overview]
Message-ID: <20180327192359.4b1bb7d6@epycfail> (raw)
In-Reply-To: <wih7epx8u60.fsf@dev-r-vrt-156.mtr.labs.mlnx>
On Tue, 27 Mar 2018 17:33:43 +0300
Petr Machata <petrm@mellanox.com> wrote:
> Hi, this conflict needs to be resolved differently. Below I'm adding a
> patch on top of linux-next. Squash or apply as you see fit.
Petr, thanks for spotting this. Stephen, you can carry these tags for
Petr's patch:
Fixes: adab890d00dc ("Merge remote-tracking branch 'ipsec/master'")
Reviewed-by: Stefano Brivio <sbrivio@redhat.com>
Tested-by: Stefano Brivio <sbrivio@redhat.com>
> What's the right way to proceed from here? It looks to me like Stefano
> or Steffen should take this into the ipsec tree (possibly just squash to
> the clamping fix), as they'll hit this conflict the next time they
> rebase on top of net...? Let me know what to do, please.
Steffen, please let me know if you want me to submit anything for the
ipsec tree on top of my previous patches.
I guess another alternative would be that David fixes the conflict the
way Petr solved it, when merging to net?
--
Stefano
next prev parent reply other threads:[~2018-03-27 17:24 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-25 22:16 linux-next: manual merge of the ipsec tree with the net tree Stephen Rothwell
2018-03-27 14:33 ` Petr Machata
2018-03-27 17:23 ` Stefano Brivio [this message]
2018-03-27 17:41 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2021-03-03 22:18 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=20180327192359.4b1bb7d6@epycfail \
--to=sbrivio@redhat.com \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=petrm@mellanox.com \
--cc=sfr@canb.auug.org.au \
--cc=steffen.klassert@secunet.com \
/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).