linux-kernel - Re: linux-next: manual merge of the block tree with the nfsd 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-prev] [day] [month] [year] [list]

Message-ID: <ZNLnE5VHprCMAB/e@tissot.1015granger.net>
Date:   Tue, 8 Aug 2023 21:08:35 -0400
From:   Chuck Lever <chuck.lever@...cle.com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Jens Axboe <axboe@...nel.dk>,
        Chengming Zhou <zhouchengming@...edance.com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: manual merge of the block tree with the nfsd tree

On Wed, Aug 09, 2023 at 11:03:34AM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the block tree got a conflict in:
> 
>   block/blk-flush.c
> 
> between commit:
> 
>   bed5a600c6b0 ("block: Revert 615939a2ae73")
> 
> from the nfsd tree and commits:
> 
>   28b241237470 ("blk-flush: fix rq->flush.seq for post-flush requests")
>   b175c86739d3 ("blk-flush: count inflight flush_data requests")
> 
> from the block tree.
> 
> I fixed it up (I used the former, though I wonder if 28b241237470 fixes
> what the revert is trying to work around) 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.

Damn. I forgot bed5a was in my public tree. I haven't sent that out
for review yet. Stephen, please drop bed5a, and I will remove it
from nfsd-next as well.


-- 
Chuck Lever