From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.3 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,USER_AGENT_MUTT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7CD15C43613 for ; Fri, 21 Jun 2019 06:21:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4B6EC208CA for ; Fri, 21 Jun 2019 06:21:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1561098079; bh=FzLeeln4yvNk1EUhlNm4sx4apVBZuXfj+bg74Wl6hzI=; h=Date:From:To:Cc:Subject:References:In-Reply-To:List-ID:From; b=ZIioT1T1n0+vQ16iTBGYMs/7RQaLdgDPLj9M/Np+TNWrq0p/JSunpI+xpNM20+VYt 7ikz+co6VWQwGgjH3MNJAooQ6j90+GgpMDpLDCditDUlLJwk1UynoHQklGICjteGT/ EjktJiN+IqqS33lO+9nUSmJ0PWc5XaaCFsE4O/Z0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726025AbfFUGVS (ORCPT ); Fri, 21 Jun 2019 02:21:18 -0400 Received: from mail.kernel.org ([198.145.29.99]:59256 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726008AbfFUGVS (ORCPT ); Fri, 21 Jun 2019 02:21:18 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 265D4208C3; Fri, 21 Jun 2019 06:21:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1561098077; bh=FzLeeln4yvNk1EUhlNm4sx4apVBZuXfj+bg74Wl6hzI=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=gUYF/7sqRqsVCMTvwR7UiaaK9FVwW0tcgYEijuWTCJdkBHAUbhgHwe8sknPhoeTpf krczKfl8xWJ+hQMy+QUYjF9N+IZNUmulO+NJAoGJZlYbm2U5yIDOztcJBU4e1nDWSt 6qCmDNrHWt4eRonz6LaIBsdFKO8ZL6YA/o0BWKdI= Date: Fri, 21 Jun 2019 08:21:15 +0200 From: Greg Kroah-Hartman To: "Martin K. Petersen" Cc: James Bottomley , Linus Torvalds , Stephen Rothwell , Linux Next Mailing List , Linux Kernel Mailing List , Thomas Gleixner , Christoph Hellwig , Hannes Reinecke Subject: Re: linux-next: manual merge of the scsi tree with Linus' tree Message-ID: <20190621062115.GA11084@kroah.com> References: <20190522100808.66994f6b@canb.auug.org.au> <20190528114320.30637398@canb.auug.org.au> <20190621095907.4a6a50fa@canb.auug.org.au> <1561077341.7970.47.camel@HansenPartnership.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.12.1 (2019-06-15) Sender: linux-next-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org On Thu, Jun 20, 2019 at 09:14:07PM -0400, Martin K. Petersen wrote: > > James, > > > There's two problems. One is simple terminology: the > > Documentation/process/licence-rules.rst say: > > > > GPL-2.0 means GPL 2 only > > GPL-2.0+ means GPL 2 or later > > > > I believe RMS made a fuss about this and he finally agreed to > > > > GPL-2.0-only > > GPL-2.0-or-later > > Looks like there are tons of the old style SPDX tags in the kernel. Is > there going to be a treewide conversion to the new tag format? Not any time soon. Both are "valid" for us, and the tools. We are focusing on actually tagging all files before we worry about these two different types of tag that mean the same thing. thanks, greg k-h