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

[ChenXiaoSong]

There are some conflicts when merging my patches into cifs-2.6.git 
for-next: 
https://lore.kernel.org/linux-cifs/20260106071507.1420900-1-chenxiaosong.chenxiaosong@xxxxxxxxx/

Should I send a new version, or would you prefer a kernel tree with the 
conflicts resolved?

Thanks,
ChenXiaoSong <chenxiaosong@xxxxxxxxxx>

On 1/16/26 10:50, Steve French wrote:
> Chen,
> Will we need to rebase your patch series as well? Let me know your
> current cifs.ko patches for 6.20-rc