From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from out-183.mta0.migadu.com (out-183.mta0.migadu.com [91.218.175.183]) (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 0564D2517AA for ; Fri, 16 Jan 2026 07:05:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.183 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768547114; cv=none; b=RCOS6S198uvQIpsfM6JlM8/EaQHSFmMjnFZtw/K8wNCWAoYaYrJVBHVWgR3Qwdi40aMeqzj25UDH+ExuPPrOlWvoZt0+8m2u5TQHKiwdz9IMDNY1oFztvaH4B66P0deZzHTb8abhMiqWARNT1WpfaBPw7wopi9Us1N0GKrjGcBI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768547114; c=relaxed/simple; bh=c0VolWpFczF5GzIa8WmoPIaO/8RTiFl+3y3367Ltbs8=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=HxAk984y2oP1Y2NZW6zN8pE87jlocPGYed5JwVgxMHT3JAWoYHTKqGCqIi/BgjNfs35uXwNwejMaDEff8DALnedkYhH7aG8Ogb7D7Hi48b0A6E1JIVJdsfxkx39IDSDfIexJZPANauCRyD2ZMViZCBcSX5Jg+/DQYpuWlbGbwng= 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=XyKpRjEH; arc=none smtp.client-ip=91.218.175.183 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="XyKpRjEH" Message-ID: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1768547100; 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=NBUTCOHFjbFGpfKIPNZ2x/MSES1mwdUxF31wOjAIzrY=; b=XyKpRjEHuKwIO6PNRzLYAWpGy5vGQP9lcppuSgOF1NyIk31hvVH+PEEWHZyLiQMXE8+UMf p8OElZYRzAkMIy5hD7SXVsg5bS4sGKO0nXS1QstdZu9vexDNycLIPCHk82upj0Of3GUSMH zSvx9E82pSILt0fMqUYe+AnmE8DfETc= Date: Fri, 16 Jan 2026 15:04:09 +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: David Howells , Steve French Cc: Enzo Matsumiya , 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> <320463.1768546738@warthog.procyon.org.uk> 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: <320463.1768546738@warthog.procyon.org.uk> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Migadu-Flow: FLOW_OUT 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 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?