From: Ard Biesheuvel <ardb@kernel.org>
To: Russell King - ARM Linux admin <linux@armlinux.org.uk>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Ingo Molnar <mingo@kernel.org>
Subject: Re: linux-next: manual merge of the arm tree with Linus' tree
Date: Sat, 30 May 2020 12:25:58 +0200 [thread overview]
Message-ID: <CAMj1kXHmv9pkRB-UJ43rJkRz_r8v48Ufbt-FRmsyjCbR9DjZVg@mail.gmail.com> (raw)
In-Reply-To: <20200530091747.GD1551@shell.armlinux.org.uk>
On Sat, 30 May 2020 at 11:17, Russell King - ARM Linux admin
<linux@armlinux.org.uk> wrote:
>
> On Sat, May 30, 2020 at 10:51:32AM +0200, Ard Biesheuvel wrote:
> > On Sat, 30 May 2020 at 10:41, Russell King - ARM Linux admin
> > <linux@armlinux.org.uk> wrote:
> > >
> > > On Thu, May 28, 2020 at 09:01:55AM +0200, Ard Biesheuvel wrote:
> > > > On Thu, 28 May 2020 at 01:23, Russell King - ARM Linux admin
> > > > <linux@armlinux.org.uk> wrote:
> > > > >
> > > > > Ard,
> > > > >
> > > > > Please take a look. Obviously, whatever the resolution is going to be
> > > > > needed when Linus opens the merge window.
> > > > >
> > > >
> > > > Sorry for that.
> > > >
> > > > I have pushed the signed tag below to resolve it. Those changes were
> > > > already in v5.7-rc2, so I wouldn't expect this to cause more trouble.
> > > > If you prefer, you could merge v5.7-rc2 into your tree directly
> > > > instead.
> > >
> > > In light of Stephen's report of a different conflict on the 29th, I
> > > haven't pulled this. I don't know if that's a side effect of this
> > > change having been picked up by -next or not.
> > >
> >
> > Fair enough. Both conflicts are unambiguous and self explanatory so I
> > don't think it should be a problem, right?
>
> I don't know - I don't have a resolution for the first one, Stephen
> didn't provide a 3-way diff with his report, and I was expecting a
> 3-way diff from you for it rather than another pull request.
>
That was not clear to me.
> I now also don't know whether the conflict on the 28th still exists
> or not.
>
Yes it does. That conflict is with v5.7-rc2, which exists because your
tree is based on v5.7-rc1, and so a fix that arrived in the mean time
is touching some of the lines that are being removed in v5.8.
That is why I mentioned that you could preempt this by merging
v5.7-rc2 into your tree as well.
> I'm completely confused, and I'm considering dropping the original
> EFI pull request on the grounds that the merge window opens tomorrow,
> and there isn't going to be another -next before that happens, so we
> don't know what's going to happen whatever action we take.
>
The other conflict is with the EFI changes queued up for v5.8 in the
-tip tree. The pr_efi_err() function was renamed to efi_err(), which
was used in a lot of places. This is slightly annoying, but rather
straightforward to resolve.
In any case, I am happy to go along with whatever you feel is best.
next prev parent reply other threads:[~2020-05-30 10:26 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-27 23:09 linux-next: manual merge of the arm tree with Linus' tree Stephen Rothwell
2020-05-27 23:22 ` Russell King - ARM Linux admin
2020-05-28 7:01 ` Ard Biesheuvel
2020-05-30 8:41 ` Russell King - ARM Linux admin
2020-05-30 8:51 ` Ard Biesheuvel
2020-05-30 9:17 ` Russell King - ARM Linux admin
2020-05-30 9:53 ` Stephen Rothwell
2020-05-30 10:25 ` Ard Biesheuvel [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-03-08 22:35 Stephen Rothwell
2016-06-01 0:07 Stephen Rothwell
2016-06-01 8:52 ` Russell King
2012-03-30 0:11 Stephen Rothwell
2012-03-26 0:05 Stephen Rothwell
2012-03-13 0:08 Stephen Rothwell
2012-03-13 6:16 ` Ingo Molnar
2012-03-13 8:33 ` Russell King
2012-03-13 8:36 ` Ingo Molnar
2012-03-13 8:47 ` Russell King
2012-03-13 8:56 ` Ingo Molnar
2012-03-13 9:00 ` Russell King
2012-03-13 8:48 ` Ingo Molnar
2012-03-13 8:58 ` Russell King
2012-03-13 9:06 ` Ingo Molnar
2012-03-13 9:09 ` Russell King
2012-03-13 9:11 ` Russell King
2012-01-29 23:38 Stephen Rothwell
2012-01-08 23:53 Stephen Rothwell
2012-01-08 23:53 linux-next: manual merge of the arm tree with Linus tree Stephen Rothwell
2012-01-08 23:53 linux-next: manual merge of the arm tree with Linus' tree Stephen Rothwell
2011-12-20 23:08 Stephen Rothwell
2011-09-21 0:33 Stephen Rothwell
2011-09-21 9:31 ` Linus Walleij
2010-07-13 0:51 Stephen Rothwell
2010-03-03 23:49 Stephen Rothwell
2010-03-04 1:16 ` Eric Miao
2010-03-03 23:33 Stephen Rothwell
2009-07-31 0:33 Stephen Rothwell
2009-07-31 0:41 ` H Hartley Sweeten
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=CAMj1kXHmv9pkRB-UJ43rJkRz_r8v48Ufbt-FRmsyjCbR9DjZVg@mail.gmail.com \
--to=ardb@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=mingo@kernel.org \
--cc=sfr@canb.auug.org.au \
/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).