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=-0.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by aws-us-west-2-korg-lkml-1.web.codeaurora.org (Postfix) with ESMTP id 162DCC433EF for ; Tue, 12 Jun 2018 00:59:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C4BC7208B0 for ; Tue, 12 Jun 2018 00:59:38 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C4BC7208B0 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.vnet.ibm.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934865AbeFLA7g (ORCPT ); Mon, 11 Jun 2018 20:59:36 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:44516 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934447AbeFLA7e (ORCPT ); Mon, 11 Jun 2018 20:59:34 -0400 Received: from pps.filterd (m0098409.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w5C0wdu8040930 for ; Mon, 11 Jun 2018 20:59:34 -0400 Received: from e17.ny.us.ibm.com (e17.ny.us.ibm.com [129.33.205.207]) by mx0a-001b2d01.pphosted.com with ESMTP id 2jj37d9vhh-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 11 Jun 2018 20:59:34 -0400 Received: from localhost by e17.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 11 Jun 2018 20:59:32 -0400 Received: from b01cxnp23032.gho.pok.ibm.com (9.57.198.27) by e17.ny.us.ibm.com (146.89.104.204) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Mon, 11 Jun 2018 20:59:29 -0400 Received: from b01ledav003.gho.pok.ibm.com (b01ledav003.gho.pok.ibm.com [9.57.199.108]) by b01cxnp23032.gho.pok.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id w5C0xSAe18415998 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Tue, 12 Jun 2018 00:59:28 GMT Received: from b01ledav003.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 704ECB2064; Mon, 11 Jun 2018 20:59:27 -0400 (EDT) Received: from b01ledav003.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 5F0A4B205F; Mon, 11 Jun 2018 20:59:27 -0400 (EDT) Received: from paulmck-ThinkPad-W541 (unknown [9.85.177.81]) by b01ledav003.gho.pok.ibm.com (Postfix) with ESMTP; Mon, 11 Jun 2018 20:59:27 -0400 (EDT) Received: by paulmck-ThinkPad-W541 (Postfix, from userid 1000) id 0302916C2A15; Mon, 11 Jun 2018 18:01:21 -0700 (PDT) Date: Mon, 11 Jun 2018 18:01:21 -0700 From: "Paul E. McKenney" To: Stephen Rothwell Cc: Linux-Next Mailing List , Linux Kernel Mailing List , Arnd Bergmann , Joerg Roedel Subject: Re: linux-next: manual merge of the rcu tree with Linus' tree Reply-To: paulmck@linux.vnet.ibm.com References: <20180612104607.69f6f15b@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20180612104607.69f6f15b@canb.auug.org.au> User-Agent: Mutt/1.5.21 (2010-09-15) X-TM-AS-GCONF: 00 x-cbid: 18061200-0040-0000-0000-0000043EC35A X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00009172; HX=3.00000241; KW=3.00000007; PH=3.00000004; SC=3.00000265; SDB=6.01045644; UDB=6.00535454; IPR=6.00824621; MB=3.00021591; MTD=3.00000008; XFM=3.00000015; UTC=2018-06-12 00:59:31 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 18061200-0041-0000-0000-00000844CB2F Message-Id: <20180612010121.GZ3593@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2018-06-11_12:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1805220000 definitions=main-1806120009 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Jun 12, 2018 at 10:46:07AM +1000, Stephen Rothwell wrote: > Hi Paul, > > Today's linux-next merge of the rcu tree got a conflict in: > > drivers/iommu/amd_iommu.c > > between commit: > > 94c793accacd ("iommu/amd: Hide unused iommu_table_lock") > > from Linus' tree and commit: > > 1df9bb146146 ("EXP iommu: Placeholder for fix in mainline") > > from the rcu tree. > > I fixed it up (they share some code change) and can carry the fix as > necessary. This is now fixed as far as linux-next is concerned, but any > non trivial conflicts should be mentioned to your upstream maintainer > when your tree is submitted for merging. You may also want to consider > cooperating with the maintainer of the conflicting tree to minimise any > particularly complex conflicts. I expect to be dropping my commit as soon as I rebase to v4.18-rc1. In the meantime, please accept my apologies for the noise! Thanx, Paul