[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <d3e04144-0a92-4074-80db-64b6d4d77e85@linux.dev>
Date: Fri, 16 Jan 2026 15:04:09 +0800
From: ChenXiaoSong <chenxiaosong.chenxiaosong@...ux.dev>
To: David Howells <dhowells@...hat.com>, Steve French <smfrench@...il.com>
Cc: 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>
Subject: Re: [PATCH 00/37] cifs: Scripted header file cleanup and SMB1 split
I have resolved the conflicts based on cifs-2.6.git for-next. Please see
the other email:
https://lore.kernel.org/linux-cifs/e6e34879-cf33-4e94-a31c-aa1c66254184@linux.dev/
Thanks,
ChenXiaoSong <chenxiaosong@...inos.cn>
On 1/16/26 14:58, David Howells wrote:
> 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?
Powered by blists - more mailing lists