From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from relay3-d.mail.gandi.net (relay3-d.mail.gandi.net [217.70.183.195]) (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 7B16C19F135; Tue, 29 Jul 2025 10:08:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.70.183.195 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753783705; cv=none; b=AtDE6mp7Awi22xDEAF3XRW4QqryWw5GZuSNs5yjiMqHHmdhWNhhh4WElxCfxyBCavxso6bHSppy/sxYfyGIjhi9ahJScLgsSwsa+f58LZgb+K6fZxmTgbxVFpG3CJAMxGJZEZDaROLK8bLBLGlc2YjG6htCB6yUbW51EcWPm90Y= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753783705; c=relaxed/simple; bh=5fNC/UPaGkwV99491pG0EBYdapDegM5tvoJS3Iagj/w=; h=From:To:Cc:Subject:In-Reply-To:References:Date:Message-ID: MIME-Version:Content-Type; b=OsNlbZ8iFIh7DWxEL9mpVhh0CgPkReCegF+iliZRvM4DBkXkpicHULKtF84twZc8UG6X4PFH93wk2VL6e1/IHcFXwgNwWdnVCqiLJS4RwkkM82eUBa1Wm4pAEBB64YkUqOpb9xPX4o/Q7U77onmA3TwWr39jmDKWhHZKm940J0Y= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com; spf=pass smtp.mailfrom=bootlin.com; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b=pbhPnC5U; arc=none smtp.client-ip=217.70.183.195 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bootlin.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="pbhPnC5U" Received: by mail.gandi.net (Postfix) with ESMTPSA id 50B46205AE; Tue, 29 Jul 2025 10:08:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1753783701; 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=UAkGJnZnTYflyNKOv3fSpVH6Z6Frd5MXsw6XzHEQa6A=; b=pbhPnC5USrbXG7BF+V7WvyN5eJZ2bULD1ZVdXMmN5dWYIACXw3JNLgTqiEr09bK+mtJR+Z TnxHNfWanm3F/Medalz0TKVM0njQY918RcmW9FbklvAc1U8FO0YEG70gilx2U9dedVOa8j HQxQ8ikHA2pWZzCTU8n9y2gZ6+YqcwXyX+vj5rxCNSLchvGc2SK2NlV5FiNMIy1HNWttck qOuJJz2XSw+2MDsCPLQIjA4dhg1o/ZAxNvvaTt6ioE+lHovl1KrkXT5Y+pWHEE3Dqjahb/ XOSH2gwGFO1uZpyIAVvRcmUS8sN+Oum32HqaDyUzCs+ccKqzy/EO6C49TtY+4g== From: Miquel Raynal To: Stephen Rothwell Cc: Mark Brown , Boris Brezillon , Gabor Juhos , Linux Kernel Mailing List , Linux Next Mailing List Subject: Re: linux-next: manual merge of the spi tree with the nand tree In-Reply-To: <20250729103816.5354a528@canb.auug.org.au> (Stephen Rothwell's message of "Tue, 29 Jul 2025 10:38:16 +1000") References: <20250729103816.5354a528@canb.auug.org.au> User-Agent: mu4e 1.12.7; emacs 30.1 Date: Tue, 29 Jul 2025 12:08:20 +0200 Message-ID: <87bjp3pawb.fsf@bootlin.com> Precedence: bulk X-Mailing-List: linux-next@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-GND-State: clean X-GND-Score: -100 X-GND-Cause: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgdelgeejjecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfitefpfffkpdcuggftfghnshhusghstghrihgsvgenuceurghilhhouhhtmecufedtudenucesvcftvggtihhpihgvnhhtshculddquddttddmnecujfgurhephffvvefujghffgffkfggtgfgsehtqhertddtreejnecuhfhrohhmpefoihhquhgvlhcutfgrhihnrghluceomhhiqhhuvghlrdhrrgihnhgrlhessghoohhtlhhinhdrtghomheqnecuggftrfgrthhtvghrnhepffeghfejtdefieeguddukedujeektdeihfelleeuieeuveehkedvleduheeivdefnecukfhppeeltddrkeelrdduieefrdduvdejnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepledtrdekledrudeifedruddvjedphhgvlhhopehlohgtrghlhhhoshhtpdhmrghilhhfrhhomhepmhhiqhhuvghlrdhrrgihnhgrlhessghoohhtlhhinhdrtghomhdpnhgspghrtghpthhtohepiedprhgtphhtthhopehsfhhrsegtrghnsgdrrghuuhhgrdhorhhgrdgruhdprhgtphhtthhopegsrhhoohhnihgvsehkvghrnhgvlhdrohhrghdprhgtphhtthhopegsohhrihhsrdgsrhgviihilhhlohhnsegtohhllhgrsghorhgrrdgtohhmpdhrtghpthhtohepjhegghekhiejsehgmhgrihhlrdgtohhmpdhrtghpthhtoheplhhinhhugidqkhgvrhhnvghlsehvghgvrhdrkhgvrhhnvghlrdhorhhgp dhrtghpthhtoheplhhinhhugidqnhgvgihtsehvghgvrhdrkhgvrhhnvghlrdhorhhg X-GND-Sasl: miquel.raynal@bootlin.com Hello, On 29/07/2025 at 10:38:16 +10, Stephen Rothwell wrot= e: > Hi all, > > Today's linux-next merge of the spi tree got a conflict in: > > include/linux/mtd/nand-qpic-common.h > > between commit: > > 8e37aaf97153 ("mtd: nand: qpic-common: remove a bunch of unused defines= ") > > from the nand tree and commit: > > 0dc7e656ddd5 ("mtd: nand: qpic-common: add defines for ECC_MODE values") > > from the spi tree. Indeed, I forgot about this change which conflicts. I'll drop the patch from my tree, it is not urgent anyway. Gabor, please resend after a rebase at -rc1, sorry for the extra work.. Thanks, Miqu=C3=A8l