From mboxrd@z Thu Jan 1 00:00:00 1970 From: Greg KH Subject: Re: [PATCH 0/2] mmc: meson: update with SPDX Licence identifier Date: Tue, 4 Jun 2019 11:00:41 +0200 Message-ID: <20190604090041.GB2855@kroah.com> References: <20190520143647.2503-1-narmstrong@baylibre.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Content-Disposition: inline In-Reply-To: Sender: linux-kernel-owner@vger.kernel.org To: Neil Armstrong Cc: Geert Uytterhoeven , Ulf Hansson , "open list:ARM/Amlogic Meson..." , "linux-mmc@vger.kernel.org" , Linux Kernel Mailing List , Linux ARM , Thomas Gleixner List-Id: linux-mmc@vger.kernel.org On Tue, Jun 04, 2019 at 10:52:51AM +0200, Neil Armstrong wrote: > Hi, > > > On 04/06/2019 10:36, Geert Uytterhoeven wrote: > > Hi Ulf, Neil, > > > > On Tue, May 28, 2019 at 10:53 AM Ulf Hansson wrote: > >> On Mon, 20 May 2019 at 16:36, Neil Armstrong wrote: > >>> Update the SPDX Licence identifier for the Amlogic MMC drivers. > >>> > >>> Neil Armstrong (2): > >>> mmc: meson-gx-mmc: update with SPDX Licence identifier > >>> mmc: meson-mx-sdio: update with SPDX Licence identifier > >>> > >>> drivers/mmc/host/meson-gx-mmc.c | 15 +-------------- > >>> drivers/mmc/host/meson-mx-sdio.c | 6 +----- > >>> 2 files changed, 2 insertions(+), 19 deletions(-) > >> > >> Applied for next, thanks! > > > > Please note this conflicts with commit 2874c5fd28426836 ("treewide: > > Replace GPLv2 boilerplate/reference with SPDX - rule 152") upstream, > > which added (different) tags. > > This happens when we are not CCed with such changes. No one was cc:ed on such huge changes. The merge conflicts are trivial to work out, this should not be an issue. thanks, greg k-h