linux-kernel - linux-next: manual merge of the fsi tree with the char-misc 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>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20230815182737.534f4ec2@canb.auug.org.au>
Date:   Tue, 15 Aug 2023 18:27:37 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Joel Stanley <joel@....id.au>, Jeremy Kerr <jk@...abs.org>,
        Greg KH <greg@...ah.com>, Arnd Bergmann <arnd@...db.de>
Cc:     Eddie James <eajames@...ux.ibm.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 fsi tree with the char-misc tree

Hi all,

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

  drivers/fsi/fsi-core.c

between commits:

  adde0e112c63 ("fsi: Improve master indexing")
  b1d3a803acfa ("fsi: Lock mutex for master device registration")

from the char-misc tree and commit:

  4ecd69609bc0 ("fsi: Improve master indexing")

from the fsi tree.

I fixed it up (I used the char-misc tree version as it seems to be newer)
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