From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755491AbdKBWKf (ORCPT ); Thu, 2 Nov 2017 18:10:35 -0400 Received: from ozlabs.org ([103.22.144.67]:36581 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754185AbdKBWKd (ORCPT ); Thu, 2 Nov 2017 18:10:33 -0400 Date: Fri, 3 Nov 2017 09:10:29 +1100 From: Stephen Rothwell To: Greg Kroah-Hartman Cc: Linux Kernel Mailing List , Linux-Next Mailing List , Linus Torvalds Subject: Re: linux-next: SPDX id conflicts Message-ID: <20171103091029.267f39a6@canb.auug.org.au> In-Reply-To: <20171102212956.GA21675@kroah.com> References: <20171103075738.55dcd769@canb.auug.org.au> <20171102212956.GA21675@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Greg, On Thu, 2 Nov 2017 22:29:56 +0100 Greg Kroah-Hartman wrote: > > 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. 8 so far, but 5 of those were files removed in linux-next trees. The pain is that I have to check each one just in case there is some other conflict :-( -- Cheers, Stephen Rothwell