linux-next: manual merge of the metag tree with Linus' tree
From: Stephen Rothwell
Date: Tue May 02 2017 - 19:19:17 EST
Today's linux-next merge of the metag tree got a conflict in:
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.