From mboxrd@z Thu Jan 1 00:00:00 1970 From: Baoquan He Subject: Re: linux-next: manual merge of the tip tree with the iommu tree Date: Tue, 22 Aug 2017 16:50:40 +0800 Message-ID: <20170822085040.GE12401@x1> References: <20170822135057.776f3509@canb.auug.org.au> <20170822055758.GB12401@x1> <20170822174951.52dab2d1@canb.auug.org.au> <20170822080128.GC12401@x1> <20170822184302.2c6c183a@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Content-Disposition: inline In-Reply-To: <20170822184302.2c6c183a@canb.auug.org.au> Sender: linux-kernel-owner@vger.kernel.org To: Stephen Rothwell Cc: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra , Joerg Roedel , Linux-Next Mailing List , Linux Kernel Mailing List , Tom Lendacky List-Id: linux-next.vger.kernel.org On 08/22/17 at 06:43pm, Stephen Rothwell wrote: > 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 Later I found it in tip/x86/mm with the git command: git describe --all --contains [commit-id]