From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S934577AbdKBU5m (ORCPT <rfc822;w@1wt.eu>);
        Thu, 2 Nov 2017 16:57:42 -0400
Received: from ozlabs.org ([103.22.144.67]:34713 "EHLO ozlabs.org"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S934407AbdKBU5l (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
        Thu, 2 Nov 2017 16:57:41 -0400
Date: Fri, 3 Nov 2017 07:57:38 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        Linus Torvalds <torvalds@linux-foundation.org>
Subject: linux-next: SPDX id conflicts
Message-ID: <20171103075738.55dcd769@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

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.

If anyone thinks otherwise, please let me know.

-- 
Cheers,
Stephen Rothwell