From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Michal Simek <monstr@monstr.eu>
Cc: Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
"H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the tip tree with the microblaze tree
Date: Wed, 16 Dec 2020 12:00:25 +1100 [thread overview]
Message-ID: <20201216120025.3901896a@canb.auug.org.au> (raw)
In-Reply-To: <1848f245-2a64-0aec-58db-b575de29debc@monstr.eu>
[-- Attachment #1: Type: text/plain, Size: 1139 bytes --]
Hi all,
On Thu, 10 Dec 2020 15:03:23 +0100 Michal Simek <monstr@monstr.eu> wrote:
>
> On 10. 12. 20 5:58, Stephen Rothwell wrote:
> >
> > Today's linux-next merge of the tip tree got conflicts in:
> >
> > arch/microblaze/Kconfig
> > arch/microblaze/mm/Makefile
> >
> > between commit:
> >
> > 05cdf457477d ("microblaze: Remove noMMU code")
> >
> > from the microblaze tree and commit:
> >
> > 7ac1b26b0a72 ("microblaze/mm/highmem: Switch to generic kmap atomic")
> >
> > from the tip tree.
> >
> > I fixed it up (see below) 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.
> >
>
> Thanks for letting me know. I will mentioned it to Linus.
> Your resolution is correct.
These are now conflicts between the microblaze tree and Linus' tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2020-12-16 1:01 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-10 4:58 linux-next: manual merge of the tip tree with the microblaze tree Stephen Rothwell
2020-12-10 14:03 ` Michal Simek
2020-12-16 1:00 ` Stephen Rothwell [this message]
2020-12-16 10:04 ` Michal Simek
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=20201216120025.3901896a@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=monstr@monstr.eu \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.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).