From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Shaokun Zhang <zhangshaokun@hisilicon.com>,
Thomas Gleixner <tglx@linutronix.de>,
Yuqi Jin <jinyuqi@huawei.com>
Subject: linux-next: manual merge of the akpm-current tree with Linus' tree
Date: Mon, 8 Feb 2021 23:10:52 +1100 [thread overview]
Message-ID: <20210208231052.6af62234@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 884 bytes --]
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
lib/cpumask.c
between commit:
2452483d9546 ("Revert "lib: Restrict cpumask_local_spread to houskeeping CPUs"")
from Linus' tree and commits:
9eca9bb9bd98 ("lib: optimize cpumask_local_spread()")
a7ac26ba236f ("lib-optimize-cpumask_local_spread-v8")
from the akpm-current tree.
I fixed it up (it was sufficiently messy that I just dropped the 2
commits from the akpm-current tree for today) 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:[~2021-02-08 12:12 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-08 12:10 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-04-11 3:35 linux-next: manual merge of the akpm-current tree with Linus' tree Stephen Rothwell
2021-04-06 11:29 Stephen Rothwell
2020-09-08 9:24 Stephen Rothwell
2020-09-08 9:17 Stephen Rothwell
2020-06-03 8:07 Stephen Rothwell
2020-06-03 7:53 Stephen Rothwell
2019-02-18 6:51 Stephen Rothwell
2019-02-20 1:00 ` Stephen Rothwell
2019-01-11 2:51 Stephen Rothwell
2019-01-11 15:08 ` Jerome Glisse
2019-01-07 2:16 Stephen Rothwell
2018-08-15 8:05 Stephen Rothwell
2018-07-23 8:00 Stephen Rothwell
2018-06-14 1:43 Stephen Rothwell
2018-06-14 1:36 Stephen Rothwell
2018-03-16 5:56 Stephen Rothwell
2017-11-02 8:10 Stephen Rothwell
2017-11-02 7:37 Stephen Rothwell
2017-05-08 3:48 Stephen Rothwell
2017-04-24 7:25 Stephen Rothwell
2017-04-24 9:11 ` Mel Gorman
2016-12-05 5:38 Stephen Rothwell
2016-12-05 5:56 ` Michal Hocko
2016-12-05 6:08 ` Stephen Rothwell
2016-01-18 3:22 Stephen Rothwell
2015-12-18 5:09 Stephen Rothwell
2015-10-06 5:46 Stephen Rothwell
2015-07-20 3:54 Stephen Rothwell
2015-05-19 6:40 Stephen Rothwell
2014-08-08 5:46 Stephen Rothwell
2014-08-07 6:51 Stephen Rothwell
2014-05-29 9:08 Stephen Rothwell
2014-04-29 4:47 Stephen Rothwell
2014-04-24 5:38 Stephen Rothwell
2014-04-07 4:18 Stephen Rothwell
2014-01-29 3:46 Stephen Rothwell
2013-12-23 3:58 Stephen Rothwell
2013-12-03 1:52 Stephen Rothwell
2013-12-03 7:16 ` Richard Weinberger
2013-12-03 7:31 ` Andrew Morton
2013-12-03 7:36 ` Richard Weinberger
2013-02-02 12:55 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=20210208231052.6af62234@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=akpm@linux-foundation.org \
--cc=jinyuqi@huawei.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=tglx@linutronix.de \
--cc=zhangshaokun@hisilicon.com \
/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).