From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Andrew Morton <akpm@linux-foundation•org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Kees Cook <keescook@chromium•org>
Subject: linux-next: manual merge of the akpm-current tree with the kspp tree
Date: Wed, 27 Jul 2016 16:23:43 +1000 [thread overview]
Message-ID: <20160727162343.4e103919@canb.auug.org.au> (raw)
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in:
Makefile
between commit:
228d96c603cf ("kbuild: Abort build on bad stack protector flag")
from the kspp tree and commit:
f273155b8dc7 ("kbuild: abort build on bad stack protector flag")
from the akpm-current tree.
I fixed it up (I just arbitrarily used the version from the kspp tree)
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
next reply other threads:[~2016-07-27 6:23 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-27 6:23 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-03-03 8:15 linux-next: manual merge of the akpm-current tree with the kspp tree Stephen Rothwell
2021-06-25 10:37 Stephen Rothwell
2020-11-25 10:05 Stephen Rothwell
2019-02-13 6:03 Stephen Rothwell
2018-01-15 4:57 Stephen Rothwell
2018-01-15 12:41 ` Arnd Bergmann
2018-01-15 20:07 ` Kees Cook
2017-11-02 8:05 Stephen Rothwell
2017-06-20 5:18 Stephen Rothwell
2017-06-20 5:15 Stephen Rothwell
2017-07-03 1:31 ` Stephen Rothwell
2017-02-17 4:53 Stephen Rothwell
2016-06-22 4:58 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=20160727162343.4e103919@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=keescook@chromium$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.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