linux-kernel - linux-next: manual merge of the char-misc tree with 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: <20230821142550.232faf95@canb.auug.org.au>
Date:   Mon, 21 Aug 2023 14:25:50 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Greg KH <greg@...ah.com>, Arnd Bergmann <arnd@...db.de>,
        Jonathan Corbet <corbet@....net>
Cc:     Bjorn Helgaas <bhelgaas@...gle.com>, Joel Stanley <joel@....id.au>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Randy Dunlap <rdunlap@...radead.org>
Subject: linux-next: manual merge of the char-misc tree with the jc_docs
 tree

Hi all,

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

  Documentation/ABI/testing/sysfs-bus-fsi-devices-sbefifo

between commit:

  ebab9426cd73 ("Documentation/ABI: Fix typos")

from the jc_docs tree and commit:

  2cd9ec2a5147 ("docs: ABI: fix spelling/grammar in SBEFIFO timeout interface")

from the char-misc tree.

I fixed it up (the latter is a superset of the former) 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