linux-kernel - linux-next: manual merge of the jc

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>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20200917121656.4116529b@canb.auug.org.au>
Date:   Thu, 17 Sep 2020 12:16:56 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Jonathan Corbet <corbet@....net>, Greg KH <greg@...ah.com>
Cc:     Mauro Carvalho Chehab <mchehab+huawei@...nel.org>,
        Thomas Gleixner <tglx@...utronix.de>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>
Subject: linux-next: manual merge of the jc_docs tree with the spdx tree

Hi all,

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

  MAINTAINERS

between commit:

  951f3e9f2086 ("net/qla3xxx: Convert to SPDX license identifiers")

from the spdx tree and commit:

  51652804d018 ("MAINTAINERS: fix location of qlogic/LICENSE.qla3xxx")

from the jc_docs tree.

I fixed it up (I used the former - which removed the line updated by the
latter) 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