linux-kernel - linux-next: manual merge of the userns tree with the staging 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: <20211101162732.12ef40dc@canb.auug.org.au>
Date:   Mon, 1 Nov 2021 16:27:32 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     "Eric W. Biederman" <ebiederm@...ssion.com>,
        Greg KH <greg@...ah.com>
Cc:     Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
        Larry Finger <Larry.Finger@...inger.net>,
        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 userns tree with the staging tree

Hi all,

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

  drivers/staging/r8188eu/core/rtw_mp.c

between commit:

  7bdedfef085b ("staging: r8188eu: Remove mp, a.k.a. manufacturing process, code")

from the staging tree and commit:

  0fdc0c4279c8 ("exit/r8188eu: Replace the macro thread_exit with a simple return 0")

from the userns tree.

I fixed it up (the former removed the file) 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