From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Andrew Morton <akpm@linux-foundation.org>,
Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Mark Rutland <mark.rutland@arm.com>
Subject: linux-next: manual merge of the akpm tree with the kbuild tree
Date: Tue, 22 Jan 2019 15:02:31 +1100 [thread overview]
Message-ID: <20190122150231.0191e8d4@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1575 bytes --]
Hi all,
Today's linux-next merge of the akpm tree got a conflict in:
Makefile
between commit:
b57304bb03de ("kbuild: remove meaningless prepare2 target")
from the kbuild tree and patch:
"locking/atomics: build atomic headers as required"
from the akpm tree.
I fixed it up (I hope - 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 004a190e3ece,bd0f79d8295e..000000000000
--- a/Makefile
+++ b/Makefile
@@@ -1077,8 -1077,12 +1077,8 @@@ ifneq ($(KBUILD_SRC),
fi;
endif
- prepare1: prepare3 outputmakefile asm-generic $(version_h) $(autoksyms_h) \
- include/generated/utsrelease.h
-# prepare2 creates a makefile if using a separate output directory.
-# From this point forward, .config has been reprocessed, so any rules
-# that need to depend on updated CONFIG_* values can be checked here.
-prepare2: prepare3 outputmakefile asm-generic genheader
-
-prepare1: prepare2 $(version_h) $(autoksyms_h) include/generated/utsrelease.h
++prepare1: prepare3 outputmakefile asm-generic genheader $(version_h) \
++ $(autoksyms_h) include/generated/utsrelease.h
$(cmd_crmodverdir)
archprepare: archheaders archscripts prepare1 scripts
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2019-01-22 4:02 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-22 4:02 Stephen Rothwell [this message]
2019-01-22 5:30 ` linux-next: manual merge of the akpm tree with the kbuild tree Masahiro Yamada
-- strict thread matches above, loose matches on Subject: below --
2017-07-10 5:30 Stephen Rothwell
2013-07-04 4:33 Stephen Rothwell
2013-07-04 4:43 ` Andrew Morton
2013-07-04 9:07 ` Michal Marek
2013-02-18 5:52 Stephen Rothwell
2013-01-14 3:49 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=20190122150231.0191e8d4@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=mark.rutland@arm.com \
--cc=yamada.masahiro@socionext.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).