| Message ID | 20221125094634.665b079c@canb.auug.org.au |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp3649476wrr;
Thu, 24 Nov 2022 15:02:28 -0800 (PST)
X-Google-Smtp-Source:
AA0mqf6Iy1jrKXAs2+GB6O2kinmw0qG/RN9kdXwfszTKFSlzRzIKuPyyfZTsdvMYlzQ8cqr+Fi/6
X-Received: by 2002:a17:906:6dd7:b0:7a1:1c24:e564 with SMTP id
j23-20020a1709066dd700b007a11c24e564mr17818474ejt.629.1669330947928;
Thu, 24 Nov 2022 15:02:27 -0800 (PST)
ARC-Seal: i=1; a=rsa-sha256; t=1669330947; cv=none;
d=google.com; s=arc-20160816;
b=mHsoJDACr3iOq5Yr9KtzZQeBw3CkJIIwCeoiN/NWOxkpQP9mww8SF+ig/x5WKPzSOx
5HdLP/Qa3EmIZ0cultaHxHIIKEfVNR/YQeOIKGpi3MmZe+QtAZh9E1mYfSSqSlMOh8t2
i/9/ScZv7b93wtOYv2IEX473Zrt9lqhqPQLH0212hzXT3SRN8/5FO9ifd4UqwiptnjH7
3OGkVuoy9/C2TtJV3YXXRZlfNNHeBYEVhTmFx4yZDn67yYK49eCMRMsQk6kAn6F9iYWO
ixLuW3iyHGbHxhU3SyUr1scp9j09ngwJpc4TwS+BjE9cDv/jgr8bKgszfJKq1jpMYrQY
w6Gw==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com;
s=arc-20160816;
h=list-id:precedence:mime-version:message-id:subject:cc:to:from:date
:dkim-signature;
bh=/61EB3InfPZNQkzeBQ1PJC8S/jDdwtaKgy/iFS5fl6c=;
b=W/5ux3fClEq1jZsce9tijnpPOMc535dho5BwhJ6xtuiyrvcCCUuOd8tZXzCCERY86q
XGUWckzlqQ4k5ygJZcDNBZPXZc3Buhe2C8Uu2tw4hIC5FgF5P8QtyAq1l6mYwoXq/gqj
Se1K5YOh8rzpzfQVz2VU2ioFql8zHXuncwLltw54JdLKm1wpO5FERIORR6LBY1NsEUte
zGzlo+tOI9Cda8y1nylpULtcW22XY7T41nyckis7QaPpFxm5u6jMMlf9fGZeoTIgf45C
sDhe9e+epDoiQqzWsDy12S6acKm8Rw2H7xAgIw03sGVDB2DjljeoaRc1WDle680LBhzm
OH6Q==
ARC-Authentication-Results: i=1; mx.google.com;
dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=W2WteE0X;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
smtp.mailfrom=linux-kernel-owner@vger.kernel.org
Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20])
by mx.google.com with ESMTP id
m9-20020a509309000000b0046a00ff51f4si1768664eda.594.2022.11.24.15.01.56;
Thu, 24 Nov 2022 15:02:27 -0800 (PST)
Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
client-ip=2620:137:e000::1:20;
Authentication-Results: mx.google.com;
dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=W2WteE0X;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
smtp.mailfrom=linux-kernel-owner@vger.kernel.org
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
id S229526AbiKXWqs (ORCPT <rfc822;fengqi706@gmail.com> + 99 others);
Thu, 24 Nov 2022 17:46:48 -0500
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52818 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S229436AbiKXWqq (ORCPT
<rfc822;linux-kernel@vger.kernel.org>);
Thu, 24 Nov 2022 17:46:46 -0500
Received: from gandalf.ozlabs.org (mail.ozlabs.org
[IPv6:2404:9400:2221:ea00::3])
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 20AA285ED4;
Thu, 24 Nov 2022 14:46:45 -0800 (PST)
Received: from authenticated.ozlabs.org (localhost [127.0.0.1])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits)
server-digest SHA256)
(No client certificate requested)
by mail.ozlabs.org (Postfix) with ESMTPSA id 4NJCly4n2wz4wgr;
Fri, 25 Nov 2022 09:46:38 +1100 (AEDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
s=201702; t=1669329999;
bh=/61EB3InfPZNQkzeBQ1PJC8S/jDdwtaKgy/iFS5fl6c=;
h=Date:From:To:Cc:Subject:From;
b=W2WteE0X6vFyFdxvVkeM57ob/pf9TskIJJ8xXjcQVkHNSS9gFgMrpiUgTjf9Sd0Ov
p2UTAsqXdXRzJG69qo5KNXM8zH2j3XIRjAChqLgwFIBkT/04FdsgrM7doNDGG8cGSr
FqZiLYV7LxoLeI7/KEc7OYr5T+UPRtJHyvwYiGKCEPIn3x/lHn3DUPzHTgc1J++isL
8feaM6jbc7/XPgRqnLn1TzV5d7gQk5HEyfXxrJXBKJY2XdL5+GB+c5imybXxyud5Im
E7ehdgE9QVWqCXSPLXhn5XaJKIVLqvPZdslEk1rTXUn4I6ccyE31tYBS+ZE0hX/vcu
6lx2gMNut8pKg==
Date: Fri, 25 Nov 2022 09:46:34 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Miquel Raynal <miquel.raynal@bootlin.com>,
Boris Brezillon <boris.brezillon@collabora.com>
Cc: Jean Delvare <jdelvare@suse.de>,
Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: manual merge of the nand tree with the mtd-fixes tree
Message-ID: <20221125094634.665b079c@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/z1rHAK78n=lgjS..EJ06kCf";
protocol="application/pgp-signature"; micalg=pgp-sha256
X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIM_SIGNED,
DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_MED,SPF_HELO_PASS,SPF_PASS
autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?=
X-GMAIL-THRID: =?utf-8?q?1750420368130527815?=
X-GMAIL-MSGID: =?utf-8?q?1750420368130527815?=
|
| Series |
linux-next: manual merge of the nand tree with the mtd-fixes tree
|
|
Commit Message
Stephen Rothwell
Nov. 24, 2022, 10:46 p.m. UTC
Hi all,
Today's linux-next merge of the nand tree got a conflict in:
drivers/mtd/nand/onenand/Kconfig
between commit:
c717b9b7d6de ("mtd: onenand: omap2: add dependency on GPMC")
from the mtd-fixes tree and commit:
b46ff0780f17 ("mtd: onenand: omap2: Drop obsolete dependency on COMPILE_TEST")
from the nand tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
Comments
Hi Jean, sfr@canb.auug.org.au wrote on Fri, 25 Nov 2022 09:46:34 +1100: > Hi all, > > Today's linux-next merge of the nand tree got a conflict in: > > drivers/mtd/nand/onenand/Kconfig > > between commit: > > c717b9b7d6de ("mtd: onenand: omap2: add dependency on GPMC") > > from the mtd-fixes tree and commit: > > b46ff0780f17 ("mtd: onenand: omap2: Drop obsolete dependency on COMPILE_TEST") As this commit is not super urgent and because I want to make the merge process as smooth as possible, I'll drop it from my branches. Please rebase and resend when -rc1 is out and I'll apply right away. Thanks Stephen for the report. Cheers, Miquèl > > from the nand tree. > > I fixed it up (see below) and can carry the fix as necessary. This > is now fixed as far as linux-next is concerned, but any non trivial > conflicts should be mentioned to your upstream maintainer when your tree > is submitted for merging. You may also want to consider cooperating > with the maintainer of the conflicting tree to minimise any particularly > complex conflicts. >
On Fri, 25 Nov 2022 10:05:04 +0100, Miquel Raynal wrote: > sfr@canb.auug.org.au wrote on Fri, 25 Nov 2022 09:46:34 +1100: > > Today's linux-next merge of the nand tree got a conflict in: > > > > drivers/mtd/nand/onenand/Kconfig > > > > between commit: > > > > c717b9b7d6de ("mtd: onenand: omap2: add dependency on GPMC") > > > > from the mtd-fixes tree and commit: > > > > b46ff0780f17 ("mtd: onenand: omap2: Drop obsolete dependency on COMPILE_TEST") > > As this commit is not super urgent and because I want to make the merge > process as smooth as possible, I'll drop it from my branches. Please > rebase and resend when -rc1 is out and I'll apply right away. Noted, no problem.
diff --cc drivers/mtd/nand/onenand/Kconfig index c94bf483541e,5c240533cea4..000000000000 --- a/drivers/mtd/nand/onenand/Kconfig