From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from out-174.mta1.migadu.com (out-174.mta1.migadu.com [95.215.58.174]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3C37A308F05 for ; Fri, 16 Jan 2026 03:07:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=95.215.58.174 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768532862; cv=none; b=DiaHFllapYLJaK5hWZOmQAck9sdfA8P6nqW3y2DF2DTv+nmaAmtgDzrkKXkpHvHn8x7yA5zLtoJ6uoEbqw6ziFf0D2VY9PiwDEylQgqcH3vCaxz8c5lUa0WO1xjPtLuzj3Xky4cZpU+5eGqe0qcWpqwXjHe+9tMTYlCGPgWnE/Q= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768532862; c=relaxed/simple; bh=jt6n2J/H4tz7wZJdl2QBwEq9nW6atH6SGEWdEOiOFfE=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=If3irGhur/bnHdB9/HubyglEXhISpqebgegMTBLkYNBL9D2PjJFLRkTzaibQH1Zs0IPM2c6fSvuMTp2Wh2vNsiV2K2HfJ0WXwl4qju/n0O6JbewokiS2JL4Nx0ejHiNkQnSRvLxsB8ncRu6EBzr/uiFuUniuBUGWz4udXcuAjtM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=sXrUEgAA; arc=none smtp.client-ip=95.215.58.174 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="sXrUEgAA" Message-ID: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1768532858; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=bdGHOmJlRXQc4r4nqzLuSwhnQBPTvpW4xD4Qvc1cNrg=; b=sXrUEgAAn82S+0CoCmnLv5asNgxPwEdNRFJE3RxovQlHtvDribzmjGmygXz+nnd97pb0kI XfSkAfJZRJiNXts7AEf9R36u57fIReyQeIwplV7Pdp7GEiK7KZOfTUuDEqxjoP34NgZYXP 4fu9EJf9ZyqaxLYx5pqS/oXJQR1udYs= Date: Fri, 16 Jan 2026 11:06:45 +0800 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Subject: Re: [PATCH 00/37] cifs: Scripted header file cleanup and SMB1 split To: Steve French , Enzo Matsumiya Cc: David Howells , Paulo Alcantara , linux-cifs@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, henrique.carvalho@suse.com, ChenXiaoSong References: <20251222223006.1075635-1-dhowells@redhat.com> Content-Language: en-US X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: ChenXiaoSong In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Migadu-Flow: FLOW_OUT 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@linux.dev/ Should I send a new version, or would you prefer a kernel tree with the conflicts resolved? Thanks, ChenXiaoSong 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