From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
"H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: linux-next: manual merge of the tip tree with Linus' tree
Date: Tue, 3 Dec 2019 13:10:24 +1100 [thread overview]
Message-ID: <20191203131024.6e36ed88@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 805 bytes --]
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
arch/x86/mm/pat_interval.c
between commit:
91298f1a302d ("x86/mm/pat: Fix off-by-one bugs in interval tree search")
from Linus' tree and commits:
70bfed57a6de ("x86/mm/pat: Move the memtype related files to arch/x86/mm/pat/")
from the tip tree.
I fixed it up (I just removed the file - there may be further updates
required) 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.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2019-12-03 2:10 UTC|newest]
Thread overview: 122+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-03 2:10 Stephen Rothwell [this message]
2019-12-03 6:57 ` linux-next: manual merge of the tip tree with Linus' tree Ingo Molnar
2019-12-03 8:56 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2024-02-08 1:30 Stephen Rothwell
2023-10-16 1:38 Stephen Rothwell
2023-08-09 2:15 Stephen Rothwell
2023-02-15 1:08 Stephen Rothwell
2023-02-15 11:15 ` Ingo Molnar
2022-07-13 5:08 Stephen Rothwell
2022-05-09 3:59 Stephen Rothwell
2022-01-04 2:45 Stephen Rothwell
2021-10-11 2:21 Stephen Rothwell
2021-10-11 20:48 ` Borislav Petkov
2020-11-06 2:39 Stephen Rothwell
2020-11-06 2:46 ` Steven Rostedt
2020-08-12 1:21 Stephen Rothwell
2020-06-11 1:00 Stephen Rothwell
2020-06-11 0:52 Stephen Rothwell
2020-06-11 10:43 ` Thomas Gleixner
2020-06-11 11:03 ` Stephen Rothwell
2020-06-10 1:49 Stephen Rothwell
2020-06-10 1:42 Stephen Rothwell
2020-05-18 5:10 Stephen Rothwell
2020-05-18 7:12 ` Borislav Petkov
2020-01-06 2:17 Stephen Rothwell
2020-01-06 6:53 ` Ingo Molnar
2019-12-20 1:53 Stephen Rothwell
2019-12-16 2:43 Stephen Rothwell
2019-09-02 7:31 Stephen Rothwell
2019-09-02 18:07 ` Ingo Molnar
2019-07-29 2:00 Stephen Rothwell
2019-03-06 5:53 Stephen Rothwell
2018-10-12 2:14 Stephen Rothwell
2018-10-12 2:18 ` Kees Cook
2018-10-12 10:47 ` Ingo Molnar
2018-10-12 18:56 ` Kees Cook
2018-06-07 1:53 Stephen Rothwell
2018-02-12 1:27 Stephen Rothwell
2018-02-12 7:19 ` Ingo Molnar
2018-02-06 0:54 Stephen Rothwell
2018-02-06 9:14 ` Peter Zijlstra
2018-02-06 0:44 Stephen Rothwell
2018-02-06 0:40 Stephen Rothwell
2018-02-06 12:52 ` Mathieu Desnoyers
2018-02-06 13:55 ` Will Deacon
2018-02-06 14:06 ` Mathieu Desnoyers
2018-02-06 14:11 ` Will Deacon
2018-02-06 17:05 ` Mathieu Desnoyers
2018-02-06 17:21 ` Will Deacon
2018-02-08 7:03 ` Ingo Molnar
2018-02-08 18:56 ` Will Deacon
2018-02-08 19:04 ` Mathieu Desnoyers
2018-02-09 18:25 ` Will Deacon
2018-02-09 20:35 ` Mathieu Desnoyers
2017-11-10 1:27 Stephen Rothwell
2017-05-22 3:27 Stephen Rothwell
2017-05-22 8:32 ` Mark Rutland
2017-05-22 21:44 ` Stephen Rothwell
2017-05-23 8:37 ` Mark Rutland
2016-02-03 0:09 Stephen Rothwell
2016-02-03 0:32 ` Toshi Kani
2015-09-18 1:12 Stephen Rothwell
2015-08-17 5:57 Stephen Rothwell
2015-07-06 0:08 Stephen Rothwell
2015-07-06 7:49 ` Paolo Bonzini
2015-07-06 21:34 ` Stephen Rothwell
2014-05-21 4:12 Stephen Rothwell
2014-05-21 4:24 ` H. Peter Anvin
2014-05-21 6:01 ` Ingo Molnar
2014-05-21 6:02 ` H. Peter Anvin
2014-05-21 6:05 ` Ingo Molnar
2014-05-21 6:10 ` Ingo Molnar
2014-05-21 4:12 Stephen Rothwell
2014-03-21 4:23 Stephen Rothwell
2014-03-21 8:47 ` Srivatsa S. Bhat
2014-02-18 3:09 Stephen Rothwell
2014-02-18 8:06 ` Hans-Christian Egtvedt
2014-02-18 14:15 ` Chen Gang
2014-01-30 1:42 Stephen Rothwell
2014-01-30 1:49 ` Andi Kleen
2014-01-30 1:58 ` Stephen Rothwell
2014-01-30 2:05 ` Andi Kleen
2014-01-28 0:43 Stephen Rothwell
2014-01-17 3:30 Stephen Rothwell
2014-01-17 17:27 ` Sören Brinkmann
2013-12-16 3:18 Stephen Rothwell
2013-09-04 4:24 Stephen Rothwell
2013-07-09 4:36 Stephen Rothwell
2012-12-03 4:19 Stephen Rothwell
2012-10-16 1:00 Stephen Rothwell
2012-10-21 16:29 ` Ingo Molnar
2012-10-15 0:32 Stephen Rothwell
2012-10-10 2:51 Stephen Rothwell
2012-10-10 2:45 Stephen Rothwell
2012-06-26 4:36 Stephen Rothwell
2012-06-22 5:01 Stephen Rothwell
2012-06-04 3:52 Stephen Rothwell
2012-05-22 5:44 Stephen Rothwell
2012-01-03 5:16 Stephen Rothwell
2012-01-03 5:08 Stephen Rothwell
2012-01-03 8:06 ` Ingo Molnar
2012-01-03 8:36 ` Stephen Rothwell
2011-04-14 3:14 Stephen Rothwell
2011-04-14 9:02 ` Peter Zijlstra
2011-04-14 9:25 ` Ingo Molnar
2011-04-08 5:02 Stephen Rothwell
2011-03-16 5:08 Stephen Rothwell
2011-03-16 8:50 ` Sebastian Andrzej Siewior
2011-03-16 11:02 ` Stephen Rothwell
2010-10-22 2:08 Stephen Rothwell
2010-10-06 2:47 Stephen Rothwell
2010-09-23 3:32 Stephen Rothwell
2010-07-26 3:39 Stephen Rothwell
2010-01-18 7:08 Stephen Rothwell
2010-01-18 7:50 ` Ingo Molnar
2010-01-18 8:59 ` Stephen Rothwell
2009-12-09 4:06 Stephen Rothwell
2009-09-24 4:07 Stephen Rothwell
2009-09-24 8:33 ` Ingo Molnar
2009-09-24 9:23 ` Stephen Rothwell
2009-08-19 6:07 Stephen Rothwell
2009-08-19 10:37 ` Ingo Molnar
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=20191203131024.6e36ed88@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=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).