On Tue, Oct 06, 2015 at 01:05:27AM -0700, Sudeep Dutt wrote: > On Tue, 2015-10-06 at 08:56 +0100, gre...@linuxfoundation.org wrote: > > On Mon, Oct 05, 2015 at 10:23:38PM -0700, Sudeep Dutt wrote: > > > On Tue, 2015-10-06 at 06:20 +0100, gre...@linuxfoundation.org wrote: > > > > On Tue, Oct 06, 2015 at 06:12:40AM +0100, gre...@linuxfoundation.org > > > > wrote: > > > > > On Mon, Oct 05, 2015 at 10:38:43AM -0700, Sudeep Dutt wrote: > > > > > > On Mon, 2015-10-05 at 03:50 -0700, Woodhouse, David wrote: > > > > > > > On Tue, 2015-09-29 at 18:09 -0700, Ashutosh Dixit wrote: > > > > > > > > From: Sudeep Dutt <sudeep.d...@intel.com> > > > > > > > > > > > > > > > > iova is a library which can be built without IOMMU_SUPPORT > > > > > > > > > > > > > > > > Signed-off-by: Sudeep Dutt <sudeep.d...@intel.com> > > > > > > > > > > > > > > The first three of these patches are in 4.3-rc4 already. > > > > > > > Apologies for > > > > > > > the delay in pushing them out. > > > > > > > > > > > > > > This one looks sane enough too, but perhaps in that case we > > > > > > > should move > > > > > > > the code *out* of drivers/iommu/ and into lib/iova/ ? > > > > > > > > > > > > > > > > > > > Yes, moving the code into lib/iova is the correct long term > > > > > > solution. I > > > > > > have sent Greg a patch which reverts this commit since it is no > > > > > > longer > > > > > > required and will create a merge conflict for him unnecessarily as > > > > > > well > > > > > > with 4.3-rc4. > > > > > > > > > > I can handle merge issues, that's trivial. Reverting the patch > > > > > shoulnd't really be needed, right? Let me see what happens when I > > > > > merge > > > > > to see if your patch is necessary... > > > > > > > > Ok, I don't think it is needed, the merge was pretty trivial. > > > > > > > > Can you test out my char-misc-testing branch right now to see if it's > > > > all ok with the merge? If so, I'll move it all over to the "real" place > > > > for it to start showing up in linux-next, i.e. my char-misc-next branch. > > > > > > > > > > Hi Greg, > > > > > > I think it is best to revert this patch as it is incorrect. The iommu > > > folder gets compiled only if IOMMU_SUPPORT is enabled so IOMMU_IOVA > > > should indeed be included only when IOMMU_SUPPORT is enabled. > > > > > > Sincere apologies for the mess here but I believe it will all get fixed > > > up if you accept the revert of 353649e5da I sent across earlier today. > > > > Again, look at the merge, I think I already handled this in that manner. > > If not, let me know. > > > > Hi Greg, > > I took a look at your latest char-misc-testing tree and it needs to be > fixed up. IOMMU_IOVA should be inside the "if IOMMU_SUPPORT" block > instead of above it. > > git revert 353649e5da in the char-misc-testing tree will fix everything > up or you could also apply the patch I sent earlier today which has the > same revert.
Ok, I've applied your patch, rolled back the merge, and that should be good, right? If so, I'll push this branch out to char-misc-next and then merge in 4.3-rc4 just to keep everything up to date. thanks, greg k-h _______________________________________________ iommu mailing list iommu@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/iommu
