lkml.org 
[lkml]   [2023]   [Nov]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the iommufd tree with the iommu tree
On Fri, Nov 03, 2023 at 10:53:12AM +1100, Stephen Rothwell wrote:
> > I have used the conflict resolution below now.
>
> This is now a conflict between the iommu tree and Linus' tree.

My PR has instructions for the resolution to both:

https://lore.kernel.org/linux-iommu/20231031131417.GA1815719@nvidia.com/

Thanks,
Jason


\
 
 \ /
  Last update: 2023-11-20 13:47    [W:0.049 / U:0.192 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site