From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Mark Brown <broonie@kernel.org>,
Conor Dooley <conor.dooley@microchip.com>,
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 usb tree with the spi tree
Date: Thu, 23 Jun 2022 10:20:17 +0200 [thread overview]
Message-ID: <YrQiQYRSEjRwj/2t@kroah.com> (raw)
In-Reply-To: <20220623134259.03af40f6@canb.auug.org.au>
On Thu, Jun 23, 2022 at 01:42:59PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the usb tree got a conflict in:
>
> MAINTAINERS
>
> between commit:
>
> f303c6b26ced ("MAINTAINERS: add spi to PolarFire SoC entry")
>
> from the spi tree and commit:
>
> 4a691b8c157a ("MAINTAINERS: add musb to PolarFire SoC entry")
>
> from the usb 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.
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc MAINTAINERS
> index fcaa66ea848b,e73c77d479bb..000000000000
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@@ -17225,7 -17169,7 +17232,8 @@@ S: Supporte
> F: arch/riscv/boot/dts/microchip/
> F: drivers/mailbox/mailbox-mpfs.c
> F: drivers/soc/microchip/
> +F: drivers/spi/spi-microchip-core.c
> + F: drivers/usb/musb/mpfs.c
> F: include/soc/microchip/mpfs.h
>
> RNBD BLOCK DRIVERS
Merge looks good, thanks!
greg k-h
next prev parent reply other threads:[~2022-06-23 8:20 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-23 3:42 linux-next: manual merge of the usb tree with the spi tree Stephen Rothwell
2022-06-23 8:20 ` Greg KH [this message]
2022-07-05 7:39 ` Geert Uytterhoeven
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=YrQiQYRSEjRwj/2t@kroah.com \
--to=greg@kroah.com \
--cc=broonie@kernel.org \
--cc=conor.dooley@microchip.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.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).