Re: linux-next: manual merge of the tip tree with the iommu tree

2020-10-12 Thread Stephen Rothwell
Hi all, On Fri, 2 Oct 2020 15:22:24 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the tip tree got a conflict in: > > include/linux/iommu.h > > between commits: > > 23cc3493b5e1 ("iommu/uapi: Rename uapi functions") > d90573812eea ("iommu/uapi: Handle data and argsz fill

linux-next: manual merge of the tip tree with the iommu tree

2020-10-01 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the tip tree got a conflict in: include/linux/iommu.h between commits: 23cc3493b5e1 ("iommu/uapi: Rename uapi functions") d90573812eea ("iommu/uapi: Handle data and argsz filled by users") from the iommu tree and commit: c7b6bac9c72c ("drm, iommu: C

Re: linux-next: manual merge of the tip tree with the iommu tree

2017-09-03 Thread Stephen Rothwell
Hi all, On Tue, 22 Aug 2017 13:50:57 +1000 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

Re: linux-next: manual merge of the tip tree with the iommu tree

2017-08-23 Thread Tom Lendacky
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: > >4c23

Re: linux-next: manual merge of the tip tree with the iommu tree

2017-08-22 Thread Baoquan He
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:5

Re: linux-next: manual merge of the tip tree with the iommu tree

2017-08-22 Thread Stephen Rothwell
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 commi

Re: linux-next: manual merge of the tip tree with the iommu tree

2017-08-22 Thread Baoquan He
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 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 wi

Re: linux-next: manual merge of the tip tree with the iommu tree

2017-08-22 Thread Baoquan He
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 >

Re: linux-next: manual merge of the tip tree with the iommu tree

2017-08-22 Thread Stephen Rothwell
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 p

Re: linux-next: manual merge of the tip tree with the iommu tree

2017-08-21 Thread Baoquan He
Hi Stephen, On 08/22/17 at 01:50pm, 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: >

linux-next: manual merge of the tip tree with the iommu tree

2017-08-21 Thread Stephen Rothwell
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 ("Reve

linux-next: manual merge of the tip tree with the iommu tree

2015-06-08 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the tip tree got a conflict in drivers/iommu/dmar.c between commit bc2272dcecae ("iommu/vt-d: Clean up log messages in intel-iommu.c") from the tree and commit 34742db8eaf9 ("iommu/vt-d: Refine the interfaces to create IRQ for DMAR unit") from the tip tree. I

linux-next: manual merge of the tip tree with the iommu tree

2015-06-08 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the tip tree got a conflict in drivers/iommu/intel_irq_remapping.c between commits 82a09c904f6a ("iommu/vt-d: Load old data structures only in kdump kernel") and b1e27c302979 ("iommu/vt-d: Move EIM detection to intel_prepare_irq_remapping") from the iommu tree a

Re: linux-next: manual merge of the tip tree with the iommu tree

2015-06-05 Thread Joerg Roedel
Hi Michael, On Fri, Jun 05, 2015 at 06:50:30PM +1000, Michael Ellerman wrote: > diff --cc include/linux/intel-iommu.h > index a81ceeeaa3d1,0af9b03e2b1c.. > --- a/include/linux/intel-iommu.h > +++ b/include/linux/intel-iommu.h > @@@ -355,9 -349,8 +357,11 @@@ struct intel_iommu > >