linux-kernel - linux-next: manual merge of the vfs tree with the csky 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: <20210422093931.620a6a05@canb.auug.org.au>
Date:   Thu, 22 Apr 2021 09:39:31 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Al Viro <viro@...IV.linux.org.uk>, Guo Ren <ren_guo@...ky.com>
Cc:     Guo Ren <guoren@...ux.alibaba.com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: linux-next: manual merge of the vfs tree with the csky tree

Hi all,

Today's linux-next merge of the vfs tree got a conflict in:

  arch/csky/include/asm/uaccess.h

between commit:

  d3900e8d918f ("csky: uaccess.h: Coding convention with asm generic")

from the csky tree and commit:

  a0d8d552783b ("whack-a-mole: kill strlen_user() (again)")

from the vfs tree.

I fixed it up (I just used the former version (which also removed
strlen_user) 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

Content of type "application/pgp-signature" skipped