Received: by 10.223.185.116 with SMTP id b49csp1039939wrg; Fri, 16 Feb 2018 11:17:34 -0800 (PST) X-Google-Smtp-Source: AH8x226i+y3gGi37TcfTPZmHr92MkmSObAeW7XvcI3u//feTyPHCKMdPS4ccbY5bGmJM4UK8zTFC X-Received: by 10.98.210.70 with SMTP id c67mr2803083pfg.164.1518808654492; Fri, 16 Feb 2018 11:17:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1518808654; cv=none; d=google.com; s=arc-20160816; b=p4BL2dScG6hzXFBDZgZR4lH/sl2qqyd7YTZkGabaZ/oF+o4RyILR33bBk8AP38LxJh +IL1/jMbveR1CZ1/cAM3LzItJfSCkBQ5FlPBZEwLaPZJAG/IMzMkeF3vmuqU1TlYU31q 5c7KQ8JyPT8gTXb4Cn95qUgPBRCf8+qtzReb1ebIfDAFAzvhBGPnpAbDO2ZB/xYiFfq5 88inTBuWT7fQESPPexy/HEy5uW9YvBe/Hu7KGfgmaqGrJkJEe2/JSEQAt4ZfPDn0DfBJ zRCP2jUM3uPmJFQ1vj70Vl6Mgcggm8ninSENUn2DwO6lBuDHrQGnMDs+nWdkWVm/vOF0 jKaw== 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:arc-authentication-results; bh=CGtpr9sylHpTX45Zw6cTfEjV3oLl1eLv9zZNRwY47ME=; b=M1uPbb8kx0nBQY8yY73wQ0NYHIVGt+qy1bdCGKMFgj3tLWHkAm8TcvVA2f+pa3562i /YtcyMaZ7ee+lqgzEQ+WMFp1XgZe01j6+XytN7vLRRT86ggorV9rE5d7PIkX9S+YY1Tz e3653H0N+iOXgbAsn2fDViOaiSwunmcd9hC6Hm2Svnw/XywcXHbSRirwoCujiAlWIEWn UkNAkY9AuP8WBnQLcJbwduIU7V+HSxLc7T6aLi8ZbsItccAB+qF4vksRFvFIOm27sX0p 03aL882WGM2N9zW3sbQ4GsoXjSZoMzmipfnWPeXkTURSeC3YLwvXyuBuJfQiOK1n05LX SG5g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=mCMDKANa; 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; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id i187si3551828pfe.384.2018.02.16.11.17.20; Fri, 16 Feb 2018 11:17:34 -0800 (PST) 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=@gmail.com header.s=20161025 header.b=mCMDKANa; 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; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758260AbeBPPrO (ORCPT + 99 others); Fri, 16 Feb 2018 10:47:14 -0500 Received: from mail-wm0-f67.google.com ([74.125.82.67]:39026 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756578AbeBPPrN (ORCPT ); Fri, 16 Feb 2018 10:47:13 -0500 Received: by mail-wm0-f67.google.com with SMTP id b21so3878902wme.4 for ; Fri, 16 Feb 2018 07:47:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=CGtpr9sylHpTX45Zw6cTfEjV3oLl1eLv9zZNRwY47ME=; b=mCMDKANa3OSxYSBtloMcHkp53+mjF85iWY74/ycvnRkGIFiqilUTtyXzEu4vP5MZdE apKMhJctkDQdOxNz1u4V5cGHUx7UEvP96o5Dla64TJ6rBengiNeFD5bqEROCEXa/vswn +EMKpDyaWSPohXtroAfmWZzzCSIie900O7evol/V3AeGeWAhtBo8ey3ZGD5etiv9wCk3 k2+itIuBJEPPj/W1eRa9FVB4PRSrbGXFq9U5Jikw81ev0PUBtvt3lw5byHRTRNuNHKhE 4eUxz/7WQ2S71xcFlJzTGuY0oBqUK/3CMTShwfv4lckv4d40WI0e1A3dFvslUXNbYQA8 jXLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=CGtpr9sylHpTX45Zw6cTfEjV3oLl1eLv9zZNRwY47ME=; b=fgL/VyX6fUxMtx5dJ9NTBDmh8fMXWK8mJMjuyAp5edKXO3Hyb/qY3266kBjWUrT5ZO +xKeMe7wOkiTDiSdSzyOn83Pmc2stOHCdcdktbINXuTKkXSzql56ZA46CSeDx5DGMURr g8IfTuF+FFxVz78uUEluLi+3HPLR8SmojcjVB8gWpSRz8BLfEe6vQ97RMdVYWDu/EtxR 5VkMknShBfsl1yNFJnr/496B74Nmd1a9PdJeTOSEmhYIKKdZwxrW135hxtu0TmXNxz+K LgYi29CfToTmTa6qFwohzJKRGflcB3wAMi4sPQIpW1D4f1fXDAAsGysKAiNNLBkkAT5C B3sA== X-Gm-Message-State: APf1xPDde7niMt4PghIQEUrYS34eZHvh0p8IRh6Fh1LMoV+2JoHsP/bl YdyEAo0ehkCUqdQPLKkRmao= X-Received: by 10.28.166.195 with SMTP id p186mr4838104wme.81.1518796032071; Fri, 16 Feb 2018 07:47:12 -0800 (PST) Received: from andrea (85.100.broadband17.iol.cz. [109.80.100.85]) by smtp.gmail.com with ESMTPSA id f8sm7636167wrf.77.2018.02.16.07.47.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 16 Feb 2018 07:47:11 -0800 (PST) Date: Fri, 16 Feb 2018 16:47:04 +0100 From: Andrea Parri To: Alan Stern Cc: Akira Yokosawa , "Paul E. McKenney" , linux-kernel@vger.kernel.org, mingo@kernel.org, will.deacon@arm.com, peterz@infradead.org, boqun.feng@gmail.com, npiggin@gmail.com, dhowells@redhat.com, j.alglave@ucl.ac.uk, luc.maranget@inria.fr, Patrick Bellasi Subject: Re: Trial of conflict resolution of Alan's patch Message-ID: <20180216154704.GA29493@andrea> References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.24 (2015-08-30) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Feb 16, 2018 at 10:18:34AM -0500, Alan Stern wrote: > On Fri, 16 Feb 2018, Akira Yokosawa wrote: > > > Hi, > > > > My forward-port patch doesn't apply to the "lkmm" branch. > > It looks like "linux-kernel-hardware.cat" is intentionally omitted there. > > Am I guessing right? > > > > If this is the case, I can prepare a patch to be applied to "lkmm". > > But I can't compose a proper change log. So I'd like Alan to post > > a patch with my SOB appended. Does this approach sound reasonable? > > The patch is not yet ready to be merged. At the very least, I need to > include an update to explanation.txt along with it. When it is all > ready, I will rebase it on Paul's repository and post it. > > Which reminds me: Now that the material has been accepted into the > kernel, do we need to keep the github repository? It has the > linux-kernel-hardware.cat file, but otherwise it seems to be redundant. If you mean "to keep up-to-date", I'd say "No, we don't..." ;-) My plan/hope is to add such a disclaimer together with a pointer to Linus's tree ASAP... Andrea > > Alan >