From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932314AbdHVInI (ORCPT ); Tue, 22 Aug 2017 04:43:08 -0400 Received: from ozlabs.org ([103.22.144.67]:60397 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932132AbdHVInF (ORCPT ); Tue, 22 Aug 2017 04:43:05 -0400 Date: Tue, 22 Aug 2017 18:43:02 +1000 From: Stephen Rothwell To: Baoquan He Cc: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra , Joerg Roedel , Linux-Next Mailing List , Linux Kernel Mailing List , Tom Lendacky Subject: Re: linux-next: manual merge of the tip tree with the iommu tree Message-ID: <20170822184302.2c6c183a@canb.auug.org.au> In-Reply-To: <20170822080128.GC12401@x1> References: <20170822135057.776f3509@canb.auug.org.au> <20170822055758.GB12401@x1> <20170822174951.52dab2d1@canb.auug.org.au> <20170822080128.GC12401@x1> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Baoquan, On Tue, 22 Aug 2017 16:01:28 +0800 Baoquan He wrote: > > On 08/22/17 at 05:49pm, Stephen Rothwell wrote: > > Hi Baoquan, > > > > On Tue, 22 Aug 2017 13:57:58 +0800 Baoquan He wrote: > > > > > > On 08/22/17 at 01:50pm, Stephen Rothwell wrote: > > > > from the iommu tree and commit: > > > > > > > > 2543a786aa25 ("iommu/amd: Allow the AMD IOMMU to work with memory encryption") > > > > > > Could you tell where the above commit is put? I can have a look. > > > > > > > from the tip tree. > > ^^^^^^^^^^^^^^^^^ > > > > The tip tree is > > > > git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git > > branch auto-latest > > Thanks, Stephen! > > I didn't see the commit 2543a786aa25 ("iommu/amd: Allow the AMD IOMMU to > work with memory encryption") in tip/auto-latest branch. Its in the copy I fetched this morning (and it has not changed). the auto-latest branch in my tree has commit SHA 87507809e0d7 -- Cheers, Stephen Rothwell