From: Greg KH <gregkh@linuxfoundation.org>
To: Neil Armstrong <narmstrong@baylibre.com>
Cc: Ulf Hansson <ulf.hansson@linaro.org>,
"linux-mmc@vger.kernel.org" <linux-mmc@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Geert Uytterhoeven <geert@linux-m68k.org>,
"open list:ARM/Amlogic Meson..."
<linux-amlogic@lists.infradead.org>,
Thomas Gleixner <tglx@linutronix.de>,
Linux ARM <linux-arm-kernel@lists.infradead.org>
Subject: Re: [PATCH 0/2] mmc: meson: update with SPDX Licence identifier
Date: Tue, 4 Jun 2019 11:00:41 +0200 [thread overview]
Message-ID: <20190604090041.GB2855@kroah.com> (raw)
In-Reply-To: <b6e67d32-6092-4bdf-312d-7241094a9248@baylibre.com>
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 <ulf.hansson@linaro.org> wrote:
> >> On Mon, 20 May 2019 at 16:36, Neil Armstrong <narmstrong@baylibre.com> 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
_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic
next prev parent reply other threads:[~2019-06-04 9:00 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-20 14:36 [PATCH 0/2] mmc: meson: update with SPDX Licence identifier Neil Armstrong
2019-05-20 14:36 ` [PATCH 1/2] mmc: meson-gx-mmc: " Neil Armstrong
2019-05-21 20:12 ` Kevin Hilman
2019-05-20 14:36 ` [PATCH 2/2] mmc: meson-mx-sdio: " Neil Armstrong
2019-05-20 17:56 ` Martin Blumenstingl
2019-05-21 20:12 ` Kevin Hilman
2019-05-28 8:53 ` [PATCH 0/2] mmc: meson: " Ulf Hansson
2019-06-04 8:36 ` Geert Uytterhoeven
2019-06-04 8:52 ` Neil Armstrong
2019-06-04 9:00 ` Greg KH [this message]
2019-06-04 10:10 ` Ulf Hansson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190604090041.GB2855@kroah.com \
--to=gregkh@linuxfoundation.org \
--cc=geert@linux-m68k.org \
--cc=linux-amlogic@lists.infradead.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
--cc=narmstrong@baylibre.com \
--cc=tglx@linutronix.de \
--cc=ulf.hansson@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).