linux-next: manual merge of the pm tree with the i3c tree

linux-next: manual merge of the pm tree with the i3c tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1486 bytes --]

Hi all,

Today's linux-next merge of the pm tree got a conflict in:

  MAINTAINERS

between commit:

  f06a1af8e739 ("MAINTAINERS: Add Silvaco I3C master")

from the i3c tree and commit:

  4590d98f5a4f ("sfi: Remove framework for deprecated firmware")

from the pm 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 fdb32f96ede9,f7ec274a3e5a..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -16221,21 -16235,6 +16218,14 @@@ S:	Maintaine
  F:	Documentation/fb/sm712fb.rst
  F:	drivers/video/fbdev/sm712*
  
 +SILVACO I3C DUAL-ROLE MASTER
 +M:	Miquel Raynal <miquel.raynal@bootlin.com>
 +M:	Conor Culhane <conor.culhane@silvaco.com>
 +L:	linux-i3c@lists.infradead.org
 +S:	Maintained
 +F:	Documentation/devicetree/bindings/i3c/silvaco,i3c-master.yaml
 +F:	drivers/i3c/master/svc-i3c-master.c
 +
- SIMPLE FIRMWARE INTERFACE (SFI)
- S:	Obsolete
- W:	http://simplefirmware.org/
- F:	arch/x86/platform/sfi/
- F:	drivers/sfi/
- F:	include/linux/sfi*.h
- 
  SIMPLEFB FB DRIVER
  M:	Hans de Goede <hdegoede@redhat.com>
  L:	linux-fbdev@vger.kernel.org

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the pm tree with the i3c tree

[Andy Shevchenko]

On Wed, Feb 17, 2021 at 4:11 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> Today's linux-next merge of the pm tree got a conflict in:
>
>   MAINTAINERS
>
> between commit:
>
>   f06a1af8e739 ("MAINTAINERS: Add Silvaco I3C master")
>
> from the i3c tree and commit:
>
>   4590d98f5a4f ("sfi: Remove framework for deprecated firmware")
>
> from the pm 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!
Looks good to me!

> diff --cc MAINTAINERS
> index fdb32f96ede9,f7ec274a3e5a..000000000000
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@@ -16221,21 -16235,6 +16218,14 @@@ S: Maintaine
>   F:    Documentation/fb/sm712fb.rst
>   F:    drivers/video/fbdev/sm712*
>
>  +SILVACO I3C DUAL-ROLE MASTER
>  +M:    Miquel Raynal <miquel.raynal@bootlin.com>
>  +M:    Conor Culhane <conor.culhane@silvaco.com>
>  +L:    linux-i3c@lists.infradead.org
>  +S:    Maintained
>  +F:    Documentation/devicetree/bindings/i3c/silvaco,i3c-master.yaml
>  +F:    drivers/i3c/master/svc-i3c-master.c
>  +
> - SIMPLE FIRMWARE INTERFACE (SFI)
> - S:    Obsolete
> - W:    http://simplefirmware.org/
> - F:    arch/x86/platform/sfi/
> - F:    drivers/sfi/
> - F:    include/linux/sfi*.h
> -
>   SIMPLEFB FB DRIVER
>   M:    Hans de Goede <hdegoede@redhat.com>
>   L:    linux-fbdev@vger.kernel.org



-- 
With Best Regards,
Andy Shevchenko