linux-kernel - Re: linux-next: manual merge of the nfsd tree with the nfsd-fixes 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: <ZNuCTMg2NS4d3xhf@tissot.1015granger.net>
Date:   Tue, 15 Aug 2023 09:49:00 -0400
From:   Chuck Lever <chuck.lever@...cle.com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Jeff Layton <jlayton@...nel.org>,
        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 nfsd tree with the nfsd-fixes
 tree

On Tue, Aug 15, 2023 at 11:06:27AM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the nfsd tree got a conflict in:
> 
>   net/sunrpc/svcsock.c
> 
> between commit:
> 
>   c96e2a695e00 ("sunrpc: set the bv_offset of first bvec in svc_tcp_sendmsg")
> 
> from the nfsd-fixes tree and commit:
> 
>   62c25ceb29a6 ("SUNRPC: Convert svc_tcp_sendmsg to use bio_vecs directly")
> 
> from the nfsd tree.
> 
> I fixed it up (I just used the latter) and can carry the fix as
> necessary.

Thanks, using the latter is the correct fix. I will address this in
my repo, since c96e2a695e00 is destined for v6.5-rc soon.


> 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



-- 
Chuck Lever