From: Roger Quadros <rogerq@kernel.org>
To: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>,
Stephen Rothwell <sfr@canb.auug.org.au>,
Miquel Raynal <miquel.raynal@bootlin.com>,
Boris Brezillon <boris.brezillon@collabora.com>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the nand tree with the drivers-memory tree
Date: Thu, 23 Dec 2021 23:55:55 +0200 [thread overview]
Message-ID: <e189f3c2-7b3d-39d6-6717-ad6558638a1b@kernel.org> (raw)
In-Reply-To: <ce08a9b7-4fc5-2cc7-2a5a-dbab6eabea14@canonical.com>
On 23/12/2021 23:17, Krzysztof Kozlowski wrote:
> On 23/12/2021 00:47, Stephen Rothwell wrote:
>> Hi all,
>>
>> Today's linux-next merge of the nand tree got a conflict in:
>>
>> drivers/mtd/nand/raw/omap2.c
>>
>> between commit:
>>
>> f2f8115fe8b3 ("memory: omap-gpmc: Use a compatible match table when checking for NAND controller")
>>
>> from the drivers-memory tree and commit:
>>
>> 0137c74ad873 ("mtd: rawnand: omap2: Add compatible for AM64 SoC")
>>
>> from the nand tree.
>>
>> I fixed it up (I used the former version and added the following patch)
>> 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.
>>
>
> Thanks Stephen, the fix looks correct.
>
> Roger,
> It seems you sent two separate patches touching exactly the same files
> recently for two different trees. One for memory controllers moving the
> NAND ids and second for MTD tree with adding new compatible.
> Please don't, instead second should base on the other and these should
> go via one tree. This is a non-trivial conflict which could be avoided.
Thanks Stephen and Krzysztof.
Sorry for the trouble. I will be more careful next time.
cheers,
-roger
prev parent reply other threads:[~2021-12-23 21:56 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-22 23:47 linux-next: manual merge of the nand tree with the drivers-memory tree Stephen Rothwell
2021-12-23 21:17 ` Krzysztof Kozlowski
2021-12-23 21:55 ` Roger Quadros [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=e189f3c2-7b3d-39d6-6717-ad6558638a1b@kernel.org \
--to=rogerq@kernel.org \
--cc=boris.brezillon@collabora.com \
--cc=krzysztof.kozlowski@canonical.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=miquel.raynal@bootlin.com \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).