From: Alexander Lobakin <alobakin@pm.me>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Alexander Lobakin <alobakin@pm.me>,
Kees Cook <keescook@chromium.org>,
Thomas Bogendoerfer <tsbogend@alpha.franken.de>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Sami Tolvanen <samitolvanen@google.com>
Subject: Re: linux-next: manual merge of the kspp tree with the mips tree
Date: Tue, 23 Feb 2021 10:44:22 +0000 [thread overview]
Message-ID: <20210223104411.4155-1-alobakin@pm.me> (raw)
In-Reply-To: <20210223104950.1f754320@canb.auug.org.au>
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 23 Feb 2021 10:49:50 +1100
> Hi all,
Hi,
> On Mon, 15 Feb 2021 07:47:26 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > On Mon, 18 Jan 2021 15:08:04 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > >
> > > Today's linux-next merge of the kspp tree got a conflict in:
> > >
> > > include/asm-generic/vmlinux.lds.h
> > >
> > > between commits:
> > >
> > > 9a427556fb8e ("vmlinux.lds.hf41b233de0ae: catch compound literals into data and BSS")
> > > f41b233de0ae ("vmlinux.lds.h: catch UBSAN's "unnamed data" into data")
> > >
> > > from the mips tree and commit:
> > >
> > > dc5723b02e52 ("kbuild: add support for Clang LTO")
> > >
> > > from the kspp tree.
> > >
> > > I fixed it up (9a427556fb8e and dc5723b02e52 made the same change to
> > > DATA_MAIN, which conflicted with the change in f41b233de0ae) and can
> > > carry the fix as necessary. This is now fixed as far as linux-next is
> > > concerned, but any non trivial conflicts should be mentioned to your
> > > upstream maintainer when your tree is submitted for merging. You may
> > > also want to consider cooperating with the maintainer of the
> > > conflicting tree to minimise any particularly complex conflicts.
> >
> > With the merge window about to open, this is a reminder that this
> > conflict still exists.
>
> This is now a conflict between the kspp tree and Linus' tree.
Kees prepared a Git pull of kspp tree for Linus, this will be resolved
soon.
> --
> Cheers,
> Stephen Rothwell
Al
prev parent reply other threads:[~2021-02-23 10:45 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-18 4:08 linux-next: manual merge of the kspp tree with the mips tree Stephen Rothwell
2021-02-14 20:47 ` Stephen Rothwell
2021-02-22 23:49 ` Stephen Rothwell
2021-02-23 10:44 ` Alexander Lobakin [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=20210223104411.4155-1-alobakin@pm.me \
--to=alobakin@pm.me \
--cc=keescook@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=samitolvanen@google.com \
--cc=sfr@canb.auug.org.au \
--cc=tsbogend@alpha.franken.de \
/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).