lkml.org 
[lkml]   [2021]   [Feb]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the gpio-brgl tree with the net-next tree
Hi all,

On Tue, 16 Feb 2021 18:19:38 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the gpio-brgl tree got a conflict in:
>
> MAINTAINERS
>
> between commit:
>
> df53e4f48e8d ("MAINTAINERS: Add entries for Toshiba Visconti ethernet controller")
>
> from the net-next tree and commit:
>
> 5103c90d133c ("MAINTAINERS: Add entries for Toshiba Visconti GPIO controller")
>
> from the gpio-brgl 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.
>
> diff --cc MAINTAINERS
> index 9a8285485f0d,656ae6685430..000000000000
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@@ -2615,13 -2641,11 +2615,15 @@@ L: linux-arm-kernel@lists.infradead.or
> S: Supported
> T: git git://git.kernel.org/pub/scm/linux/kernel/git/iwamatsu/linux-visconti.git
> F: Documentation/devicetree/bindings/arm/toshiba.yaml
> + F: Documentation/devicetree/bindings/gpio/toshiba,gpio-visconti.yaml
> +F: Documentation/devicetree/bindings/net/toshiba,visconti-dwmac.yaml
> F: Documentation/devicetree/bindings/pinctrl/toshiba,tmpv7700-pinctrl.yaml
> +F: Documentation/devicetree/bindings/watchdog/toshiba,visconti-wdt.yaml
> F: arch/arm64/boot/dts/toshiba/
> + F: drivers/gpio/gpio-visconti.c
> +F: drivers/net/ethernet/stmicro/stmmac/dwmac-visconti.c
> F: drivers/pinctrl/visconti/
> +F: drivers/watchdog/visconti_wdt.c
> N: visconti
>
> ARM/UNIPHIER ARCHITECTURE

This is now a comflict between the gpio-brgl tree and Linus' tree.

--
Cheers,
Stephen Rothwell
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2021-02-22 09:27    [W:0.024 / U:1.920 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site