From: Stephen Rothwell <sfr@canb•auug.org.au>
To: James Hogan <james.hogan@imgtec•com>
Cc: Linux-Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Al Viro <viro@zeniv•linux.org.uk>
Subject: linux-next: manual merge of the metag tree with Linus' tree
Date: Wed, 3 May 2017 09:19:10 +1000 [thread overview]
Message-ID: <20170503091910.156cbcf0@canb.auug.org.au> (raw)
Hi James,
Today's linux-next merge of the metag tree got a conflict in:
arch/metag/include/asm/uaccess.h
between commit:
db68ce10c4f0 ("new helper: uaccess_kernel(new helper: uaccess_kernel())")
from Linus' tree and commit:
8a8b56638bca ("metag/uaccess: Fix access_ok()")
from the metag tree.
I fixed it up (I used the metag version (as suggested by James, thanks)
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:[~2017-05-02 23:19 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-02 23:19 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2013-02-24 22:48 linux-next: manual merge of the metag tree with Linus' tree Stephen Rothwell
2013-02-25 9:50 ` James Hogan
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=20170503091910.156cbcf0@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=james.hogan@imgtec$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=viro@zeniv$(echo .)linux.org.uk \
/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