Received: by 2002:a25:ab43:0:0:0:0:0 with SMTP id u61csp297176ybi; Thu, 20 Jun 2019 23:21:38 -0700 (PDT) X-Google-Smtp-Source: APXvYqwvA89k7Lcnm0Km/mXCXbN5UPppLCR43pFJLIQCWlPtNe3tVu34TyaaihCm5CC0FFCzXx28 X-Received: by 2002:a17:90a:ac11:: with SMTP id o17mr4402827pjq.134.1561098097933; Thu, 20 Jun 2019 23:21:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1561098097; cv=none; d=google.com; s=arc-20160816; b=mNHQ2fqjpCo+zhBTFQZI/P8aHM/P25v5zL1JHZymK9CItEEpB4riSEt15a1Jtjlje3 QgDIYkDbchZ7y8wDAz1uOUsXn64pHG0/MtvqKza4UQpxZqTlluHFWwytsKu393qi5e21 s3YLAHSMbQ/kvx4dqwAnJllir+es8K/MFULDWBv25AhoykXoFg/yd98OtfuJzez/Z8OJ YdkO/cMtn2C+5JYmC5URTeMj22RCt3MceoVbgVP8ckixaFhSpEiwMPI2kzCVClCF/PBo Qc/iuFDoFyvxpnwfl1YF7Xm8y/PUIvx+i38RCDwYZ3ecpsBrD7bcF0L+AkyESi+OGqSS HqkA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:user-agent:in-reply-to :content-disposition:mime-version:references:message-id:subject:cc :to:from:date:dkim-signature; bh=bZQkdHhtb/EoZtswkXH7yFmdi9uJPXECLy6pfQmEnoQ=; b=Bu98pCSm4JVcCmZ6Ge0sFdddGeGrtULObNWnN/caUwKIHupi79CL3xSEoyfcop8b5g 55hgZc4C7wiR1ASRUYQG07JqArDuNljBGoznx6BxG9S2gFE9qBvtamzLjVlJ7SIznBih JmViRE0uYopFumu1nNLEA6vEmSC2RpYK9HQ6kXDekt1qSe5s9des8FtSexYUgDOGdEEF FzgxYH3J2GtSgbqgRektt7YRqu3ECfmCcZ4NEoZ3h+J4fWrV7uyWMdzeylqOegQngzbn ixxPFfkl6FJKmv/M3v89IHMYNgrv3dNqiJx9tjml+AFIfyNTKBnuVEDdeN14TBmMssPB vbjA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="gUYF/7sq"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id u11si1681768pgp.200.2019.06.20.23.21.21; Thu, 20 Jun 2019 23:21:37 -0700 (PDT) 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; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="gUYF/7sq"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726092AbfFUGVS (ORCPT + 99 others); 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-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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