From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Andrew Morton <akpm@linux-foundation•org>,
Masahiro Yamada <masahiroy@kernel•org>
Cc: Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
xujialu <xujialu@vimux•org>
Subject: linux-next: manual merge of the akpm-current tree with the kbuild tree
Date: Mon, 11 May 2020 18:23:05 +1000 [thread overview]
Message-ID: <20200511182305.6001b046@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1230 bytes --]
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
Makefile
between commit:
0e92fd54b7c1 ("kbuild: remove {CLEAN,MRPROPER,DISTCLEAN}_DIRS")
from the kbuild tree and commit:
51b26a64f220 ("scripts/tags.sh: add a intermediate file for 'make gtags'")
from the akpm-current 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.
--
Cheers,
Stephen Rothwell
diff --cc Makefile
index 4334bcffa886,995020716343..000000000000
--- a/Makefile
+++ b/Makefile
@@@ -1413,7 -1397,8 +1413,7 @@@ MRPROPER_FILES += include/config includ
*.spec
# Directories & files removed with 'make distclean'
- DISTCLEAN_FILES += tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS
-DISTCLEAN_DIRS +=
+ DISTCLEAN_FILES += tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS gtags.files
# clean - Delete most, but leave enough to build external modules
#
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2020-05-11 8:23 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-11 8:23 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-04-08 10:34 linux-next: manual merge of the akpm-current tree with the kbuild tree Stephen Rothwell
2021-04-08 10:36 ` 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=20200511182305.6001b046@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=masahiroy@kernel$(echo .)org \
--cc=xujialu@vimux$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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