From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754149AbdHWOPT (ORCPT ); Wed, 23 Aug 2017 10:15:19 -0400 Received: from mail-sn1nam02on0071.outbound.protection.outlook.com ([104.47.36.71]:45632 "EHLO NAM02-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754001AbdHWOPQ (ORCPT ); Wed, 23 Aug 2017 10:15:16 -0400 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Thomas.Lendacky@amd.com; Subject: Re: linux-next: manual merge of the tip tree with the iommu tree To: Stephen Rothwell , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra , Joerg Roedel Cc: Linux-Next Mailing List , Linux Kernel Mailing List , Baoquan He References: <20170822135057.776f3509@canb.auug.org.au> From: Tom Lendacky Message-ID: <828c5f60-5d75-f9f3-4d96-a85906399463@amd.com> Date: Wed, 23 Aug 2017 09:15:07 -0500 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.2.1 MIME-Version: 1.0 In-Reply-To: <20170822135057.776f3509@canb.auug.org.au> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Originating-IP: [165.204.78.1] X-ClientProxiedBy: MWHPR22CA0062.namprd22.prod.outlook.com (10.171.142.24) To BN6PR12MB1139.namprd12.prod.outlook.com (10.168.226.141) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 65d16b92-35cc-416f-708f-08d4ea315f9f X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(2017030254152)(300000503095)(300135400095)(48565401081)(201703131423075)(201703031133081)(201702281549075)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095);SRVR:BN6PR12MB1139; X-Microsoft-Exchange-Diagnostics: 1;BN6PR12MB1139;3:mX8+3nLjd8whjZxew80InxyaRMUwn+gyS6UC+BIDt9lgYspOs2n5FmJuJjW4OVbJ33G4XmMQnOHnj4UL/d4q0KFXPDhYZUb/tIAivuv01Ym7iJ/pGHKGitxYIUJhn8ZhTiNKZDG0dDfBzL7SHkWMr86To0jFCYcxU4isfRlB3HJc/5ursaU8mdbcD6v+YXo3xdF5qHXR6E/bi0NV/rlIyaMa0YggXbbRj99j6E7vUpINUEEaNX2gmE5tBQAJeeLb;25:3wdpozd8Nz4wJqmYYYoPy7GEpCWxryI+67jDP2vcYV+BdbXcdS4CwCgKm8dnsnaeZDE7CWNv0jZG1MPXMFShf0+FJf9WnGf7zKn1L/6rMOq4opvozw3KJXqhMuOh8exxQLbNhMS7GUd3dckQMiQ0LSMB37i+Ftor92fOoT65/o6xRQFzSDIcQpiHe4Hs95TQ3K1nJ4VK6SFtkZe1KpPiDZp3JpN1QoVfSGC5eQ28uqxq4YjaubJEA8/ISR1nK7WwYTxUFQI42TdopUT6YiYtgLGse1q7XffdVGDCj8D5bVDX/ilH45XLR5FnUB1a/30MqVzIpNqPiy9FR+HoolCdGw==;31:FO/VIInMchE+L4i4WNMv8WoHcDEXtcOFtkUul9GvmXtMcy6bQN/qs1+/v1syWgl6zH2kzUOZLeako08k2Z52t5LLFhkv4UCqt/I/Y1o6zkusGf+aFkBYRo/n0KRLETRQfLLTE7LEvBU1xpw3cBe2pNHAeEP/su+EgKStJckd5QxtwpoaWdeBc4IIvlOuY94/CsQtXdERAbLwYJ59PPwJyng+1+ypHGbwQcYl7ooTj7E= X-MS-TrafficTypeDiagnostic: BN6PR12MB1139: X-Microsoft-Exchange-Diagnostics: 1;BN6PR12MB1139;20:mQdLk3S7MSU3GVF5D5dxfHZILSKpK+2I2MszdGpyyV9QJGJic9juqoDbwaaNWI6v0MZhvGtUgt8xLZXntg2EEIUYJke4QXLzi+1OQbXDwOPxftXIWB67AkkMiXbIJrl1cqp+0uS53gDgo7qb9lHUs1tZ/4XsPqp8VF1BlYqe9AiRIv+EkRJRrCEnAJwleDWGy3gXU5KVGhM/IHc3KeulUDPN1yJaUePT0rfN8CmXWiDycfEq/3zJ2qGeTEhCX/e8/PW7euqPBGJZej1lu5q4RtSgHJS9h3+C0xfRYZH2RzXPqTNFGAr1Wk6tIQgirG0eB7VhQTH9P1EH+jPSXNZWHa20k+pG6P6zSKQHn/cdulFf0IN7xqlJ11quxdYzAlJwVxLFRqBDgnIfIvAFD5q8CpSJjx90auirL5ChkOT/IJd5IPjCTc7/BbjfLFpfC5E0pGG+nMhEU1SqNYvdkIrTFAIqwmKYwSdOYb+dvONjsGOAAHdd2ZbeFLsKE+VHNAaX;4:ST6I4zoUm3p7r5GyrxpR7dGibJRLI4WTLXQSkTCXgLolDPo4wuJMjJ6E6QUEpTY5sxdqUWqsCUe5TcnFGbPVFNYyWj8ijulvL+wxnNKhR/twqs8aJeX3fXwhn0O8cF0kGaXwjbvnSR8Xwqa71FqzLZZUHbfKkXaQZGfemcqVQP3HYj0Qg5vPkpiiXSvcOd9CB4y7minA5YDeK24c+Zb/aj6ENwH3OcHa3UZsCa+peHy0PEQ8ndHQsGpnB5XhIC+5 X-Exchange-Antispam-Report-Test: UriScan:; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(601004)(2401047)(8121501046)(5005006)(10201501046)(100000703101)(100105400095)(93006095)(93001095)(3002001)(6055026)(6041248)(20161123558100)(20161123560025)(20161123562025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123555025)(20161123564025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095);SRVR:BN6PR12MB1139;BCL:0;PCL:0;RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095);SRVR:BN6PR12MB1139; X-Forefront-PRVS: 040866B734 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(7370300001)(4630300001)(6009001)(6049001)(39860400002)(377454003)(199003)(24454002)(53754006)(189002)(478600001)(106356001)(4326008)(97736004)(90366009)(105586002)(101416001)(6486002)(76176999)(6246003)(77096006)(53936002)(54356999)(42186005)(50986999)(64126003)(230700001)(50466002)(2950100002)(3260700006)(23676002)(54906002)(6666003)(86362001)(6116002)(31686004)(25786009)(2906002)(31696002)(3846002)(7736002)(305945005)(68736007)(4001350100001)(36756003)(229853002)(72206003)(33646002)(81166006)(65806001)(189998001)(81156014)(83506001)(7350300001)(65826007)(53546010)(65956001)(8676002)(5660300001)(47776003)(66066001);DIR:OUT;SFP:1101;SCL:1;SRVR:BN6PR12MB1139;H:[10.236.64.148];FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en; X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtCTjZQUjEyTUIxMTM5OzIzOitrME1ZcHNIa1hwUDRJQlRySTZuLzhSaDgv?= =?utf-8?B?bmRZSjhLTk8wQmZ6R1FqUTJRek9HWStPUzl4QVN6VXczV3Y3SWJ1bnBIRDVI?= =?utf-8?B?MXBWeU1xUGc0SzJBVk1pOCs4bzMzeDVuVm52bDRwQVVCcndzeUVqN0Y0b1Fs?= =?utf-8?B?LzF1S3lnZ25Rb2tpUHRPMVdNeko5RVNwNStOd1Zndy9tYVNHQ050NWJNL0NU?= =?utf-8?B?UTBBbEZDZEFUYXAyYnlZOGpjTmQ3S09VbEdYS1VKRlpEZ1N3QjlJbXpJZVJy?= =?utf-8?B?ZHBvTS93dE5ZeERHYnJnTzZsaE5qMmNJQVA1WEljcGliTEFkSjg3bjdGVlJ4?= =?utf-8?B?N25rSndaVW0rY0NVcE90MHJLYmo0STQ2L2h3SDV4Mlg4SzVCSHdWTFJkQU50?= =?utf-8?B?L1RETUw1MUVKMDhyVU9INkdIc0wrbUlhWlZTR3JsZTNnVkxPN3o3WWNQc3pE?= =?utf-8?B?RzAyVGdjVUFic3BNZ2hqdnloYmZsaEJTb0hTN3pjRnlQQ1B6R0xrRkllcUhY?= =?utf-8?B?eHNjeXQ1a2l2RWxsTDJBblQ1WGR2QkJDbE1pOTYwbEhORlZPcWlWN3J5VUkw?= =?utf-8?B?M0JsVEtCeURaMEdoM2QwcTZJM0hWbCtYNStBSUJTVk9CUGJRTnNmVHYxU1k3?= =?utf-8?B?a2pYOExNRTdxWEVwMnpYQ2hTT2VTYVpPMHI1S0p2VzF3R2xQSVc3ZytOS2Y3?= =?utf-8?B?UmhTK0NrOUZSU0loZnhkMUVKaGpxeEdKYVZ0VHNsOGNJT3dGcExGcGpHTzEz?= =?utf-8?B?R0I1cC9MV1hVdEwyZlViWnp4eTlJWTFtQ2E1dC9Tc2hIL1dxTnU1a21VdEQr?= =?utf-8?B?b1hVNndQSm4xKzdqZFBsRy9mSkdnejhvNVAvTEZsWW0rYldUc0d3bG1zSGtF?= =?utf-8?B?akszQlovT2QxaGNRMUN6bGdicXQ3NWEyR3F4eEFoYkFlY1F0dS83VklDdU5H?= =?utf-8?B?cmZsQlhldWU5eEptdG9zaStObWNHbWpaYThUTEdLc2dMSytMN1dkak5RRml1?= =?utf-8?B?RGIvbnVwSTN0akxyejVLajJISmdmRVZSRFZIcm5PbmFrTGd6OEViSVhuVVZ4?= =?utf-8?B?eWhXbnVnS0J6N0R0KzRjV3hlaGx6SUh2NnJZbzlmRzF4bkQvbENERzlQQnlJ?= =?utf-8?B?WFBtUlphR3pWbkhoSzRiUWpKV3Z2TFBGalZMWmFoMDJ6U1I0dmNadlYyVEJw?= =?utf-8?B?NkgvSG40VkdGdkl1ZU1xQ2cyeFFyUmlCdGJreHRxZHBGN01IQzdKYUFySnVB?= =?utf-8?B?TzdndU93cW5ETnJ3SncxTXZjVlVqYUdQcmszMTdLTGhTVEF2eC9OTEpNbGtw?= =?utf-8?B?VmJhZkhMRXJCNVVYc25jZkFHWGdqZXdGM0YyMUJOUm4ydk1tSGV3cTBhQWds?= =?utf-8?B?bkhpcEd2bjJUMm9CcXk0bFJFdGZNOXc0R1BnZG1tMGx2WWhXL0o2S3FvbDll?= =?utf-8?B?TFIxTEJXb0VmRGc3dS84NG9TTHR4RzhaZVdPSnBTdVNRR2VDQnVuaEs5ZUtP?= =?utf-8?B?ZHV2aVJjS3pmWXdtNk9rSm9RcXFQemF3cE9sN2dZcDAxY2FxdVJHeFo3V1pu?= =?utf-8?B?QncxYmFkelFRMmtOK0tWQTFERU1IMWFwNXlIOXJNNkpFaFg4YjJhKzA3eEFn?= =?utf-8?B?OWE0ZHFodk9IK05YUHYyN0Y3NXJkU09ZdjFLYVhBWDAyMTV5a0RaVm1FWkpj?= =?utf-8?B?SWtod01SaEVtcnNVUVREVmYrZURLbkFlTzE2YmM1OEhzOW82aWgvcDB3bU5a?= =?utf-8?B?Wmp6ZzRkSVV5NHdmVEIrcEJOdWlXeUExNVlZUmlOekZXUmJ0M2p5SFlvd0Jn?= =?utf-8?B?OGhPOTh2SkJIR2tMeE5CSkl1a05xcit6UGFRTjJKM3BwTXorbndneVo5a3E3?= =?utf-8?B?UFd5M0hMTEF3QXlVYUhXWEZ2SzQ3d1gzOGhabEFmL2RGNDFzRWl4NGZjTHhU?= =?utf-8?B?R3FBWjJBUXE5N2xDeEVrUjc1Z081VXhhSWFZeitxdmIzT05kOFBycXFvSEFB?= =?utf-8?Q?yw5tz6?= X-Microsoft-Exchange-Diagnostics: 1;BN6PR12MB1139;6:g6Ilw/T2OSXQ05NVjJbMOoByej96JokaXD0qNEKmJ61rYf6Xi8CxgG/+B6yC0EndXd4jcOHTzeoNgqyl0C61NQ5iHyMVi37rASj+GkpoN2u3CFTyFCQ6Vp9jeUHF26SGuu9yrWtH2kPXzlZcU6PV/o+n6kmj0fB8/vTW2suKoJPlgX5AoVBvZyCA0IX9vqtlRTVeKtgRa4mIVVeKPImfMBVeq921x8voJJsbEJPtx1NDmszo3/opQcyv2damH4/lfShEu/rPHtJDgbxs3F72DIb2jSgOfoNYsdvVILINoBGz+KMQo0vU67Q1QrAm2jn22/rbpJob1hQs1KBgwsQ7Aw==;5:DWInwAvYtnRhBiwDT4Tnti8RIokMDthZ4WAau1KhzDXxj45eQubMQ0EKVtuxD0X6bFXYuEbrLL95tE09V6PQI/pM34MWFpwBQtN7a1hM5f8TZfroZJh6K3Hmlt/Nq/YlDoklT9QDXo2riNJxYMu5+A==;24:nqAuJvW5w78T/k0or3b351epYymbtpDXFoQ9x8p1bJWq1I3AfeC6FRFG0Vq23Lav9jB8jpSFzL0qXD8jb/0eYwn/Muva5x455QMGEXweeZo=;7:2XO2kk/cU732cyZsFujqb06OJ2jVH2hlopto5//6nVjz4ps/Puz3LFoOnjpZvBwc9lOPNAqCz0NO2B+f8jPp/5+oN4j5THoIucDy2+AMNXLYBcAp+V7iCtI/3cTkmnFV9LAuYqoqU2y656ICCzMUpmlaH7SQdtMgjtuGy2pSoZQ7Yfx+thX3sIJ/8ZZOsajNqTE3twqS/b0ZdjGFDqIHYAodSiDoY94EW213gP7dMz0= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;BN6PR12MB1139;20:j9HUj8a33M2/fzymC6+Zo6SNsmgWXn2kG43+mY7iH/gI+JNNd3Wmuy7hA3DiZbKySLpk6gJGWvdw8CdgpbQtACygSERDcCxaDAhtHKLD3Pnv9aUR7l7Rnlg/ZH3VHN69czx+YSFnKS23C/hc0/EErriBJiZ8mpQ2eab72YBbOTd96IDsXplu5XG3RFP10/b/AugdcIiAs5SPASJg01IW44rlIkc31qqLrUCQ+UU971XqKXKzvEnx3i7ZsRq1PgKm X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Aug 2017 14:15:12.7164 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR12MB1139 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 8/21/2017 10:50 PM, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the tip tree got conflicts in: > > drivers/iommu/amd_iommu.c > drivers/iommu/amd_iommu_init.c > drivers/iommu/amd_iommu_proto.h > drivers/iommu/amd_iommu_types.h > > between commits: > > 4c232a708be1 ("iommu/amd: Detect pre enabled translation") > 9494ea90a56d ("Revert "iommu/amd: Suppress IO_PAGE_FAULTs in kdump kernel"") > 07a80a6b5920 ("iommu/amd: Define bit fields for DTE particularly") > daae2d25a477 ("iommu/amd: Don't copy GCR3 table root pointer") > > from the iommu tree and commit: > > 2543a786aa25 ("iommu/amd: Allow the AMD IOMMU to work with memory encryption") > > from the tip tree. > > I fixed it up (see below) 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. > Sorry, I was out of the office the past few days. I checked the linux-next tree and everything looks good in relation to commit 2543a786aa25 ("iommu/amd: Allow the AMD IOMMU to work with memory encryption") Thanks, Tom