linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Miquel Raynal <miquel.raynal@bootlin.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Boris Brezillon <boris.brezillon@collabora.com>,
	Richard Weinberger <richard.weinberger@gmail.com>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>,
	Manivannan Sadhasivam <mani@kernel.org>,
	Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>,
	Rob Herring <robh@kernel.org>
Subject: Re: linux-next: manual merge of the nand tree with the mtd tree
Date: Mon, 21 Aug 2023 09:27:15 +0200	[thread overview]
Message-ID: <20230821092715.068a2666@xps-13> (raw)
In-Reply-To: <20230821115507.229d85fc@canb.auug.org.au>

Hi Stephen,

sfr@canb.auug.org.au wrote on Mon, 21 Aug 2023 11:55:07 +1000:

> Hi all,
> 
> Today's linux-next merge of the nand tree got a conflict in:
> 
>   drivers/mtd/nand/raw/qcom_nandc.c
> 
> between commit:
> 
>   c2fc6b694790 ("mtd: Explicitly include correct DT includes")
> 
> from the mtd tree and commit:
> 
>   93ca966b4a20 ("mtd: rawnand: qcom: Sort includes alphabetically")
> 
> 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.

Thanks for the warning, I'll handle it when merging nand/next into
mtd/next before sending to Linus.

Thanks,
Miquèl

  reply	other threads:[~2023-08-21  7:27 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-08-21  1:55 linux-next: manual merge of the nand tree with the mtd tree Stephen Rothwell
2023-08-21  7:27 ` Miquel Raynal [this message]
  -- strict thread matches above, loose matches on Subject: below --
2022-11-18  0:45 Stephen Rothwell
2022-02-21 13:55 broonie
2022-02-21 14:16 ` Miquel Raynal

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=20230821092715.068a2666@xps-13 \
    --to=miquel.raynal@bootlin.com \
    --cc=boris.brezillon@collabora.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=mani@kernel.org \
    --cc=manivannan.sadhasivam@linaro.org \
    --cc=richard.weinberger@gmail.com \
    --cc=robh@kernel.org \
    --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).