linux-kernel - linux-next: manual merge of the block tree with the cifs 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: <20230220113333.16a38bbd@canb.auug.org.au>
Date:   Mon, 20 Feb 2023 11:33:33 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Jens Axboe <axboe@...nel.dk>, Steve French <smfrench@...il.com>
Cc:     CIFS <linux-cifs@...r.kernel.org>,
        David Howells <dhowells@...hat.com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Steve French <stfrench@...rosoft.com>
Subject: linux-next: manual merge of the block tree with the cifs tree

Hi all,

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

  fs/cifs/file.c

between commit:

  8378eea2e41f ("cifs: Change the I/O paths to use an iterator rather than a page list")

from the cifs tree and commit:

  45b94876f54e ("iov_iter: Kill ITER_PIPE")

from the block tree.

I fixed it up (the former removed the function updated by the latter,
so I did that) 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