Re: [PATCH 00/37] cifs: Scripted header file cleanup and SMB1 split

From: ChenXiaoSong

Date: Fri Jan 16 2026 - 02:05:12 EST

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@xxxxxxxxx/

Thanks,
ChenXiaoSong <chenxiaosong@xxxxxxxxxx>

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?