lkml.org 
[lkml]   [2017]   [Aug]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the tip tree with the iommu tree
Hi Stephen,

On 08/22/17 at 05:49pm, Stephen Rothwell wrote:
> Hi Baoquan,
>
> On Tue, 22 Aug 2017 13:57:58 +0800 Baoquan He <bhe@redhat.com> 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 a lot!

I have commit 2543a786aa25, not sure which branch it's put in. I tried
to apply it to the current tip/auto-latest, and saw the conflicts. I
think your change is correct. Maybe Joerg can also help have a look.

Thanks
Baoquan

\
 
 \ /
  Last update: 2017-08-22 10:13    [W:0.423 / U:7.584 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site