From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Andrew Morton <akpm@linux-foundation.org>,
Masahiro Yamada <masahiroy@kernel.org>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Piotr Gorski <lucjan.lucjanov@gmail.com>
Subject: linux-next: manual merge of the akpm-current tree with the kbuild tree
Date: Thu, 8 Apr 2021 20:34:49 +1000 [thread overview]
Message-ID: <20210408203449.58e5edf8@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 976 bytes --]
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
Makefile
between commit:
2f8864dbe668 ("kbuild: move module strip/compression code into scripts/Makefile.modinst")
from the kbuild tree and commit:
7b35c1a01c2e ("init: add support for zstd compressed modules")
from the akpm-current tree.
Also commit
ee2305118fc3 ("kbuild: add support for zstd compressed modules")
from the kbuild tree seems to do the same as the akpm-current commit
above, so I just effectively reverted the akpm-current commit.
I fixed it up (see above) 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-04-08 10:34 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-08 10:34 Stephen Rothwell [this message]
2021-04-08 10:36 ` linux-next: manual merge of the akpm-current tree with the kbuild tree Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2020-05-11 8:23 Stephen Rothwell
2018-08-03 8:36 Stephen Rothwell
2018-08-15 23:55 ` Stephen Rothwell
2017-11-02 7:13 Stephen Rothwell
2016-01-06 6:54 Stephen Rothwell
2016-01-06 8:07 ` Michal Marek
2013-11-07 6:37 Stephen Rothwell
2013-11-07 9:49 ` Michal Marek
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=20210408203449.58e5edf8@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=lucjan.lucjanov@gmail.com \
--cc=masahiroy@kernel.org \
/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).