From: Greg Kroah-Hartman <gregkh@linuxfoundation•org>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux-Next Mailing List <linux-next@vger•kernel.org>,
Linus Torvalds <torvalds@linux-foundation•org>
Subject: Re: linux-next: SPDX id conflicts
Date: Thu, 2 Nov 2017 22:29:56 +0100 [thread overview]
Message-ID: <20171102212956.GA21675@kroah.com> (raw)
In-Reply-To: <20171103075738.55dcd769@canb.auug.org.au>
On Fri, Nov 03, 2017 at 07:57:38AM +1100, Stephen Rothwell wrote:
> Hi all,
>
> I expect to get quite a few conflicts due to the addition of the SPDX
> license ids to many files overnight in Linus' tree. I will not be
> reporting these conflicts as they are mostly trivial.
They should all be trivial, as they all hit the first, or second, line
of the file, and I would be amazed if that caused conflicts.
> If anyone thinks otherwise, please let me know.
Nope, that's fine with me :)
thanks,
greg k-h
next prev parent reply other threads:[~2017-11-02 21:29 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-02 20:57 linux-next: SPDX id conflicts Stephen Rothwell
2017-11-02 21:29 ` Greg Kroah-Hartman [this message]
2017-11-02 22:10 ` Stephen Rothwell
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=20171102212956.GA21675@kroah.com \
--to=gregkh@linuxfoundation$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=torvalds@linux-foundation$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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