* linux-next: manual merge of the drm tree with the crypto tree
@ 2020-12-14 2:54 Stephen Rothwell
2020-12-15 9:58 ` Geert Uytterhoeven
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2020-12-14 2:54 UTC (permalink / raw)
To: Dave Airlie, DRI, Herbert Xu, Linux Crypto List
Cc: Anitha Chrisanthus, Daniele Alessandrelli,
Linux Kernel Mailing List, Linux Next Mailing List, Mike Healy,
Sam Ravnborg
[-- Attachment #1: Type: text/plain, Size: 2347 bytes --]
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
MAINTAINERS
between commit:
885743324513 ("crypto: keembay - Add support for Keem Bay OCS AES/SM4")
from the crypto tree and commit:
ed794057b052 ("drm/kmb: Build files for KeemBay Display driver")
from the drm 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 3b358262de8f,eb18459c1d16..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -6932,11 -6913,16 +6941,10 @@@ S: Maintaine
W: http://floatingpoint.sourceforge.net/emulator/index.html
F: arch/x86/math-emu/
-FRAME RELAY DLCI/FRAD (Sangoma drivers too)
-L: netdev@vger.kernel.org
-S: Orphan
-F: drivers/net/wan/dlci.c
-F: drivers/net/wan/sdla.c
-
FRAMEBUFFER LAYER
- M: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
L: dri-devel@lists.freedesktop.org
L: linux-fbdev@vger.kernel.org
- S: Maintained
+ S: Orphan
Q: http://patchwork.kernel.org/project/linux-fbdev/list/
T: git git://anongit.freedesktop.org/drm/drm-misc
F: Documentation/fb/
@@@ -8985,16 -8962,13 +8993,23 @@@ M: Deepak Saxena <dsaxena@plexity.net
S: Maintained
F: drivers/char/hw_random/ixp4xx-rng.c
+ INTEL KEEMBAY DRM DRIVER
+ M: Anitha Chrisanthus <anitha.chrisanthus@intel.com>
+ M: Edmund Dea <edmund.j.dea@intel.com>
+ S: Maintained
+ F: Documentation/devicetree/bindings/display/intel,kmb_display.yaml
+ F: drivers/gpu/drm/kmb/
+
+INTEL KEEM BAY OCS AES/SM4 CRYPTO DRIVER
+M: Daniele Alessandrelli <daniele.alessandrelli@intel.com>
+S: Maintained
+F: Documentation/devicetree/bindings/crypto/intel,keembay-ocs-aes.yaml
+F: drivers/crypto/keembay/Kconfig
+F: drivers/crypto/keembay/Makefile
+F: drivers/crypto/keembay/keembay-ocs-aes-core.c
+F: drivers/crypto/keembay/ocs-aes.c
+F: drivers/crypto/keembay/ocs-aes.h
+
INTEL MANAGEMENT ENGINE (mei)
M: Tomas Winkler <tomas.winkler@intel.com>
L: linux-kernel@vger.kernel.org
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the drm tree with the crypto tree
2020-12-14 2:54 linux-next: manual merge of the drm tree with the crypto tree Stephen Rothwell
@ 2020-12-15 9:58 ` Geert Uytterhoeven
2020-12-16 1:09 ` mark gross
0 siblings, 1 reply; 3+ messages in thread
From: Geert Uytterhoeven @ 2020-12-15 9:58 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Dave Airlie, DRI, Herbert Xu, Linux Crypto List,
Anitha Chrisanthus, Daniele Alessandrelli,
Linux Kernel Mailing List, Linux Next Mailing List, Mike Healy,
Sam Ravnborg, Paul J. Murphy
On Mon, Dec 14, 2020 at 2:44 PM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Today's linux-next merge of the drm tree got a conflict in:
>
> MAINTAINERS
>
> between commit:
>
> 885743324513 ("crypto: keembay - Add support for Keem Bay OCS AES/SM4")
>
> from the crypto tree and commit:
>
> ed794057b052 ("drm/kmb: Build files for KeemBay Display driver")
>
> from the drm 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 3b358262de8f,eb18459c1d16..000000000000
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@@ -8985,16 -8962,13 +8993,23 @@@ M: Deepak Saxena <dsaxena@plexity.net
> S: Maintained
> F: drivers/char/hw_random/ixp4xx-rng.c
>
> + INTEL KEEMBAY DRM DRIVER
Is it KEEMBAY?
> + M: Anitha Chrisanthus <anitha.chrisanthus@intel.com>
> + M: Edmund Dea <edmund.j.dea@intel.com>
> + S: Maintained
> + F: Documentation/devicetree/bindings/display/intel,kmb_display.yaml
I was just going to comment about "intel,kmb_*" vs. "intel,keembay-*", until
I noticed intel,kmb_display.yaml does not exist, but is called
Documentation/devicetree/bindings/display/intel,keembay-display.yaml
in next-20201214.
> + F: drivers/gpu/drm/kmb/
> +
> +INTEL KEEM BAY OCS AES/SM4 CRYPTO DRIVER
or KEEM BAY?
Or Keem Bay? Keembay? KeemBay?
All of them are present in next-20201214.
> +M: Daniele Alessandrelli <daniele.alessandrelli@intel.com>
> +S: Maintained
> +F: Documentation/devicetree/bindings/crypto/intel,keembay-ocs-aes.yaml
> +F: drivers/crypto/keembay/Kconfig
> +F: drivers/crypto/keembay/Makefile
> +F: drivers/crypto/keembay/keembay-ocs-aes-core.c
> +F: drivers/crypto/keembay/ocs-aes.c
> +F: drivers/crypto/keembay/ocs-aes.h
> +
> INTEL MANAGEMENT ENGINE (mei)
> M: Tomas Winkler <tomas.winkler@intel.com>
> L: linux-kernel@vger.kernel.org
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the drm tree with the crypto tree
2020-12-15 9:58 ` Geert Uytterhoeven
@ 2020-12-16 1:09 ` mark gross
0 siblings, 0 replies; 3+ messages in thread
From: mark gross @ 2020-12-16 1:09 UTC (permalink / raw)
To: Geert Uytterhoeven
Cc: Stephen Rothwell, Dave Airlie, DRI, Herbert Xu,
Linux Crypto List, Anitha Chrisanthus, Daniele Alessandrelli,
Linux Kernel Mailing List, Linux Next Mailing List, Mike Healy,
Sam Ravnborg, Paul J. Murphy
On Tue, Dec 15, 2020 at 10:58:52AM +0100, Geert Uytterhoeven wrote:
> On Mon, Dec 14, 2020 at 2:44 PM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > Today's linux-next merge of the drm tree got a conflict in:
> >
> > MAINTAINERS
> >
> > between commit:
> >
> > 885743324513 ("crypto: keembay - Add support for Keem Bay OCS AES/SM4")
> >
> > from the crypto tree and commit:
> >
> > ed794057b052 ("drm/kmb: Build files for KeemBay Display driver")
> >
> > from the drm 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 3b358262de8f,eb18459c1d16..000000000000
> > --- a/MAINTAINERS
> > +++ b/MAINTAINERS
>
> > @@@ -8985,16 -8962,13 +8993,23 @@@ M: Deepak Saxena <dsaxena@plexity.net
> > S: Maintained
> > F: drivers/char/hw_random/ixp4xx-rng.c
> >
> > + INTEL KEEMBAY DRM DRIVER
>
> Is it KEEMBAY?
>
> > + M: Anitha Chrisanthus <anitha.chrisanthus@intel.com>
> > + M: Edmund Dea <edmund.j.dea@intel.com>
> > + S: Maintained
> > + F: Documentation/devicetree/bindings/display/intel,kmb_display.yaml
>
> I was just going to comment about "intel,kmb_*" vs. "intel,keembay-*", until
> I noticed intel,kmb_display.yaml does not exist, but is called
> Documentation/devicetree/bindings/display/intel,keembay-display.yaml
> in next-20201214.
>
> > + F: drivers/gpu/drm/kmb/
> > +
> > +INTEL KEEM BAY OCS AES/SM4 CRYPTO DRIVER
>
> or KEEM BAY?
>
> Or Keem Bay? Keembay? KeemBay?
It should be Keem Bay. I googled sandybridge, ivybridge, baytrail,
cherrytrail, medfield and merrifiled and for the *bridge and *trail products
the words are split up and capitalized. For the *fields they are one-word.
We'll update the KEEMBAY,KeemBay, KEEM BAY instances to Keem Bay to mimic SDB,
IVB, BYT and CHT since those are the majority. I'm not sure I'm going to rename
the file names however but, within the files wherever we talk about Keem Bay we
will use "Keem Bay" consistently.
Sorry for the variances,
--mark
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-12-16 1:11 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-14 2:54 linux-next: manual merge of the drm tree with the crypto tree Stephen Rothwell
2020-12-15 9:58 ` Geert Uytterhoeven
2020-12-16 1:09 ` mark gross
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).