Re: linux-next: manual merge of the tip tree with the iommu tree
From: Baoquan He <bhe@redhat.com>
Date: 2017-08-22 08:12:03
Also in:
lkml
From: Baoquan He <bhe@redhat.com>
Date: 2017-08-22 08:12:03
Also in:
lkml
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 [off-list ref] wrote:quoted
On 08/22/17 at 01:50pm, Stephen Rothwell wrote:quoted
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.quoted
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