From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Ralf Baechle <ralf@linux-mips.org>, James Hogan <jhogan@kernel.org>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Arnd Bergmann <arnd@arndb.de>, Paul Burton <paul.burton@mips.com>
Subject: linux-next: manual merge of the mips tree with Linus' tree
Date: Wed, 7 Aug 2019 10:25:17 +1000 [thread overview]
Message-ID: <20190807102517.5d2c2873@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 786 bytes --]
Hi all,
Today's linux-next merge of the mips tree got a conflict in:
arch/mips/include/asm/vdso/vdso.h
( arch/mips/vdso/vdso.h in Linus' tree)
between commit:
ee38d94a0ad8 ("page flags: prioritize kasan bits over last-cpuid")
from Linus' tree and commit:
6393e6064486 ("mips: fix vdso32 build, again")
from the mips tree.
I fixed it up (I just used the mips tree version) 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:[~2019-08-07 0:25 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-07 0:25 Stephen Rothwell [this message]
2019-08-07 7:42 ` linux-next: manual merge of the mips tree with Linus' tree Arnd Bergmann
-- strict thread matches above, loose matches on Subject: below --
2020-05-25 0:05 Stephen Rothwell
2019-09-18 11:33 Mark Brown
2019-08-11 23:19 Stephen Rothwell
2019-05-12 23:47 Stephen Rothwell
2018-08-23 22:37 Stephen Rothwell
2017-07-11 0:04 Stephen Rothwell
2017-01-03 0:26 Stephen Rothwell
2016-01-24 22:25 Stephen Rothwell
2016-01-25 7:42 ` Ralf Baechle
2015-10-01 1:13 Stephen Rothwell
2015-02-22 0:22 Stephen Rothwell
2015-02-22 0:15 Stephen Rothwell
2015-02-13 0:11 Stephen Rothwell
2015-02-13 10:28 ` Ralf Baechle
2014-06-03 0:50 Stephen Rothwell
2012-10-04 0:35 Stephen Rothwell
2012-10-01 3:58 Stephen Rothwell
2011-11-07 0:04 Stephen Rothwell
2011-11-07 0:04 Stephen Rothwell
2011-11-07 10:18 ` Ralf Baechle
2009-12-14 23:20 Stephen Rothwell
2009-12-15 7:26 ` Michal Simek
2009-12-15 19:27 ` Ralf Baechle
2009-08-18 8:23 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=20190807102517.5d2c2873@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=arnd@arndb.de \
--cc=jhogan@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=paul.burton@mips.com \
--cc=ralf@linux-mips.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).