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=-2.5 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, T_DKIMWL_WL_HIGH,URIBL_BLOCKED,USER_AGENT_MUTT autolearn=ham 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 2D9F2C282CE for ; Tue, 4 Jun 2019 09:00:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id ECEA124071 for ; Tue, 4 Jun 2019 09:00:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559638845; bh=yLF/5A0Yt9mZ3x/1aXHAcLHej2ocHYBWAz21St3a8cI=; h=Date:From:To:Cc:Subject:References:In-Reply-To:List-ID:From; b=PemTS7MiL152L1dAj9BjlHPyPYUPZFiWbvQI/njkoFlpDe0kBCzbgbxMRXV1fJ2NL RFmICLLWz8A/6gA6kzyHsnedkrz/Bt1nUColLpGg0LI9u3NDShdg54S2BzQhEYl8ML aoLhdUcvIoMBI/B784E/kVteIYtosR3Zslon9Kbo= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727079AbfFDJAo (ORCPT ); Tue, 4 Jun 2019 05:00:44 -0400 Received: from mail.kernel.org ([198.145.29.99]:35972 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726809AbfFDJAo (ORCPT ); Tue, 4 Jun 2019 05:00:44 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 0106B2404B; Tue, 4 Jun 2019 09:00:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559638843; bh=yLF/5A0Yt9mZ3x/1aXHAcLHej2ocHYBWAz21St3a8cI=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=OMPkntsZuOQOTATf2QcQlpT6noEdpw2iM9TaoGZwwXEfEH4Q4a71EjkYhH4vafCeU f4aUKUM3TzE4b4m9fTqCCJ1KYrUfQ5qY2r3jbB9loxrFAjYnyvp/KLpN08m4pWY3i0 LwlvTdaXx+5QVpJTcO5Am5KePDpEOhNS3KcXscqI= Date: Tue, 4 Jun 2019 11:00:41 +0200 From: Greg KH 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 Subject: Re: [PATCH 0/2] mmc: meson: update with SPDX Licence identifier Message-ID: <20190604090041.GB2855@kroah.com> References: <20190520143647.2503-1-narmstrong@baylibre.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.12.0 (2019-05-25) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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