From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.2 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8EE79C2BBCA for ; Wed, 16 Dec 2020 01:11:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5D4D2230FA for ; Wed, 16 Dec 2020 01:11:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726292AbgLPBL0 (ORCPT ); Tue, 15 Dec 2020 20:11:26 -0500 Received: from mga06.intel.com ([134.134.136.31]:61055 "EHLO mga06.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725275AbgLPBLZ (ORCPT ); Tue, 15 Dec 2020 20:11:25 -0500 IronPort-SDR: AC7vtsAq5eHsvhgcxsNp0lKK0yvoBzDcv3Sm2k5Ozh42uh9STF/IL2RCkLrxab5+D8Vskqp7EB Bp4NdADi1C7g== X-IronPort-AV: E=McAfee;i="6000,8403,9836"; a="236560119" X-IronPort-AV: E=Sophos;i="5.78,423,1599548400"; d="scan'208";a="236560119" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Dec 2020 17:09:38 -0800 IronPort-SDR: RU9tWlTsZCIOuXYyqvu9cECu6EZoHttatFgsVIZwtruFTVtcBbrZ/0/3IT6+IoHB60TAVdN/qk qWiQoArHUlyw== X-IronPort-AV: E=Sophos;i="5.78,423,1599548400"; d="scan'208";a="556586381" Received: from smtp.ostc.intel.com ([10.54.29.231]) by fmsmga006-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Dec 2020 17:09:38 -0800 Received: from localhost (mtg-dev.jf.intel.com [10.54.74.10]) by smtp.ostc.intel.com (Postfix) with ESMTP id E77316363; Tue, 15 Dec 2020 17:09:37 -0800 (PST) Date: Tue, 15 Dec 2020 17:09:37 -0800 From: mark gross 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" Subject: Re: linux-next: manual merge of the drm tree with the crypto tree Message-ID: <20201216010937.GA6517@linux.intel.com> Reply-To: mgross@linux.intel.com References: <20201214135453.16e76e9d@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.9.4 (2018-02-28) Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org On Tue, Dec 15, 2020 at 10:58:52AM +0100, Geert Uytterhoeven wrote: > On Mon, Dec 14, 2020 at 2:44 PM Stephen Rothwell 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 > S: Maintained > > F: drivers/char/hw_random/ixp4xx-rng.c > > > > + INTEL KEEMBAY DRM DRIVER > > Is it KEEMBAY? > > > + M: Anitha Chrisanthus > > + M: Edmund Dea > > + 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 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.2 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9495EC0018C for ; Wed, 16 Dec 2020 08:55:56 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 273E420735 for ; Wed, 16 Dec 2020 08:55:56 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 273E420735 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3CE1F89138; Wed, 16 Dec 2020 08:55:48 +0000 (UTC) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTPS id 258708845B for ; Wed, 16 Dec 2020 01:09:39 +0000 (UTC) IronPort-SDR: nwyQ2ACrNsAOqaSuBEWGUKGf7TsIPSE/GI/a1WFKHFInOYWct7VCEV7xth8gDdZEcxZB6t8ahW Ce26HoqCkEqQ== X-IronPort-AV: E=McAfee;i="6000,8403,9836"; a="193363374" X-IronPort-AV: E=Sophos;i="5.78,423,1599548400"; d="scan'208";a="193363374" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Dec 2020 17:09:38 -0800 IronPort-SDR: RU9tWlTsZCIOuXYyqvu9cECu6EZoHttatFgsVIZwtruFTVtcBbrZ/0/3IT6+IoHB60TAVdN/qk qWiQoArHUlyw== X-IronPort-AV: E=Sophos;i="5.78,423,1599548400"; d="scan'208";a="556586381" Received: from smtp.ostc.intel.com ([10.54.29.231]) by fmsmga006-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Dec 2020 17:09:38 -0800 Received: from localhost (mtg-dev.jf.intel.com [10.54.74.10]) by smtp.ostc.intel.com (Postfix) with ESMTP id E77316363; Tue, 15 Dec 2020 17:09:37 -0800 (PST) Date: Tue, 15 Dec 2020 17:09:37 -0800 From: mark gross To: Geert Uytterhoeven Subject: Re: linux-next: manual merge of the drm tree with the crypto tree Message-ID: <20201216010937.GA6517@linux.intel.com> References: <20201214135453.16e76e9d@canb.auug.org.au> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.9.4 (2018-02-28) X-Mailman-Approved-At: Wed, 16 Dec 2020 08:55:47 +0000 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: mgross@linux.intel.com Cc: Stephen Rothwell , "Paul J. Murphy" , Herbert Xu , Dave Airlie , Linux Kernel Mailing List , DRI , Linux Next Mailing List , Linux Crypto List , Anitha Chrisanthus , Mike Healy , Sam Ravnborg , Daniele Alessandrelli Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On Tue, Dec 15, 2020 at 10:58:52AM +0100, Geert Uytterhoeven wrote: > On Mon, Dec 14, 2020 at 2:44 PM Stephen Rothwell 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 > S: Maintained > > F: drivers/char/hw_random/ixp4xx-rng.c > > > > + INTEL KEEMBAY DRM DRIVER > > Is it KEEMBAY? > > > + M: Anitha Chrisanthus > > + M: Edmund Dea > > + 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 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel