From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Petr Machata <petrm@mellanox•com>
Cc: Steffen Klassert <steffen.klassert@secunet•com>,
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>,
Stefano Brivio <sbrivio@redhat•com>
Subject: Re: linux-next: manual merge of the ipsec tree with the net tree
Date: Wed, 28 Mar 2018 04:41:40 +1100 [thread overview]
Message-ID: <20180328044140.18bab804@canb.auug.org.au> (raw)
In-Reply-To: <wih7epx8u60.fsf@dev-r-vrt-156.mtr.labs.mlnx>
[-- Attachment #1: Type: text/plain, Size: 727 bytes --]
Hi Petr,
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.
>
> 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.
I fixed up the resolution in linux-next to match your patch from
today. Dave will need to do this when he merges the ipsec tree into
the net tree before sending it to Linus.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2018-03-27 17:41 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
2018-03-27 17:41 ` Stephen Rothwell [this message]
-- 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=20180328044140.18bab804@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=davem@davemloft$(echo .)net \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=netdev@vger$(echo .)kernel.org \
--cc=petrm@mellanox$(echo .)com \
--cc=sbrivio@redhat$(echo .)com \
--cc=steffen.klassert@secunet$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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