[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <320463.1768546738@warthog.procyon.org.uk>
Date: Fri, 16 Jan 2026 06:58:58 +0000
From: David Howells <dhowells@...hat.com>
To: Steve French <smfrench@...il.com>
Cc: dhowells@...hat.com, Enzo Matsumiya <ematsumiya@...e.de>,
Paulo Alcantara <pc@...guebit.org>, linux-cifs@...r.kernel.org,
linux-fsdevel@...r.kernel.org, linux-kernel@...r.kernel.org,
henrique.carvalho@...e.com, ChenXiaoSong <chenxiaosong@...inos.cn>,
ChenXiaoSong <chenxiaosong.chenxiaosong@...ux.dev>
Subject: Re: [PATCH 00/37] cifs: Scripted header file cleanup and SMB1 split
Steve French <smfrench@...il.com> wrote:
> I have tentatively merged the first 24 of this series to cifs-2.6.git
> for-next (pending testing etc) but had merge conflicts with the
> remainder on current mainline. I also added Enzo's Acked-by
>
> David,
> Do you have a newer/rebased version of this series that applies to
> current mainline?
I can make one.
> Also are there other patches you would like in for-next?
Not right at the moment.
> Chen,
> Will we need to rebase your patch series as well? Let me know your
> current cifs.ko patches for 6.20-rc
Chen's patches will conflict with mine. Do you want be to base on top of his
patches, or would you like his patches on top of these?
David
Powered by blists - more mailing lists