Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Fri, 18 Jan 2019 15:28:51 -0800
From:   Alexei Starovoitov <alexei.starovoitov@gmail.com>
To:     Thomas Gleixner <tglx@linutronix.de>
Cc:     LKML <linux-kernel@vger.kernel.org>,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        Kate Stewart <kstewart@linuxfoundation.org>,
        Jonathan Corbet <corbet@lwn.net>,
        Jakub Kicinski <jakub.kicinski@netronome.com>,
        Roman Gushchin <guro@fb.com>,
        YueHaibing <yuehaibing@huawei.com>, Yonghong Song <yhs@fb.com>,
        Stanislav Fomichev <sdf@google.com>,
        Sean Young <sean@mess.org>, Jiri Benc <jbenc@redhat.com>,
        David Calavera <david.calavera@gmail.com>,
        Andrey Ignatov <rdna@fb.com>, Joe Stringer <joe@wand.net.nz>,
        David Ahern <dsahern@gmail.com>,
        Petar Penkov <ppenkov@stanford.edu>,
        Sandipan Das <sandipan@linux.ibm.com>,
        Prashant Bhole <bhole_prashant_q7@lab.ntt.co.jp>,
        Stephen Hemminger <stephen@networkplumber.org>,
        John Fastabend <john.fastabend@gmail.com>,
        Taeung Song <treeze.taeung@gmail.com>,
        Jiri Olsa <jolsa@kernel.org>,
        Alexei Starovoitov <ast@kernel.org>,
        Daniel Borkmann <daniel@iogearbox.net>,
        Quentin Monnet <quentin.monnet@netronome.com>,
        okash.khawaja@gmail.com, netdev@vger.kernel.org
Subject: Re: [patch 8/9] tools: bpftool: Cleanup license mess
Message-ID: <20190118232849.jec4mipctsupgggn@ast-mbp.dhcp.thefacebook.com>
References: <20190117231416.111952141@linutronix.de>
 <20190117231501.560475279@linutronix.de>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20190117231501.560475279@linutronix.de>
User-Agent: NeoMutt/20180223
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

On Fri, Jan 18, 2019 at 12:14:24AM +0100, Thomas Gleixner wrote:
> Precise and non-ambiguous license information is important. The recent
> relicensing of the bpftools introduced a license conflict.
> 
> The files have now:
> 
>      SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause
> 
> and
> 
>      * This program is free software; you can redistribute it and/or
>      * modify it under the terms of the GNU General Public License
>      * as published by the Free Software Foundation; either version
>      * 2 of the License, or (at your option) any later version
> 
> Amazingly about 20 people acked that change and neither they nor the
> committer noticed. Oh well.
> 
> Digging deeper: The files were imported from the iproute2 repository with
> the GPL V2 or later boiler plate text in commit b66e907cfee2 ("tools:
> bpftool: copy JSON writer from iproute2 repository")
> 
> Looking at the iproute2 repository at
> 
>   git://git.kernel.org/pub/scm/network/iproute2/iproute2.git
> 
> the following commit is the equivivalent:
> 
>   commit d9d8c839 ("json_writer: add SPDX Identifier (GPL-2/BSD-2)")
> 
> That commit explicitly removes the boiler plate and relicenses the code
> uner GPL-2.0-only and BSD-2-Clause. As Steven wrote the original code and
> also the relicensing commit, it's assumed that the relicensing was intended
> to do exaclty that. Just the kernel side update failed to remove the boiler
> plate. Do so now.
> 
> Fixes: 907b22365115 ("tools: bpftool: dual license all files")
> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
> Cc: Jakub Kicinski <jakub.kicinski@netronome.com>
> Cc: Roman Gushchin <guro@fb.com>
> Cc: YueHaibing <yuehaibing@huawei.com>
> Cc: Yonghong Song <yhs@fb.com>
> Cc: Stanislav Fomichev <sdf@google.com>
> Cc: Sean Young <sean@mess.org>
> Cc: Jiri Benc <jbenc@redhat.com>
> Cc: David Calavera <david.calavera@gmail.com>
> Cc: Andrey Ignatov <rdna@fb.com>
> Cc: Joe Stringer <joe@wand.net.nz>
> Cc: David Ahern <dsahern@gmail.com>
> Cc: Alexei Starovoitov <alexei.starovoitov@gmail.com>
> Cc: Petar Penkov <ppenkov@stanford.edu>
> Cc: Sandipan Das <sandipan@linux.ibm.com>
> Cc: Prashant Bhole <bhole_prashant_q7@lab.ntt.co.jp>
> Cc: Stephen Hemminger <stephen@networkplumber.org>
> Cc: John Fastabend <john.fastabend@gmail.com>
> Cc: Taeung Song <treeze.taeung@gmail.com>
> Cc: Jiri Olsa <jolsa@kernel.org>
> Cc: Alexei Starovoitov <ast@kernel.org>
> Cc: Daniel Borkmann <daniel@iogearbox.net>
> Cc: Quentin Monnet <quentin.monnet@netronome.com>
> CC: okash.khawaja@gmail.com
> Cc: netdev@vger.kernel.org
> ---
> 
> P.S.: This patch is part of a larger cleanup, but independent of other
>       patches and is intended to be picked up by the maintainer directly.

Applied this patch to bpf tree.
Sorry about this mess.