linux-kernel - linux-next: manual merge of the metag tree with Linus' tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20170503091910.156cbcf0@canb.auug.org.au>
Date:   Wed, 3 May 2017 09:19:10 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     James Hogan <james.hogan@...tec.com>
Cc:     Linux-Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Al Viro <viro@...iv.linux.org.uk>
Subject: linux-next: manual merge of the metag tree with Linus' tree

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