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@xxxxxxxxxx> wrote:
> >> On Mon, 20 May 2019 at 16:36, Neil Armstrong <narmstrong@xxxxxxxxxxxx> 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
