lkml.org 
[lkml]   [2023]   [Feb]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
Date
SubjectRe: [git pull] IOMMU Updates for Linux v6.3
On Fri, Feb 24, 2023 at 2:09 PM Joerg Roedel <joro@8bytes.org> wrote:
>
> Aside from the conflicts with upstream, which I resolved in the merge
> commit, the only other conflict that Stephen reported for linux-next was
> in the rdma tree, iirc. So fingers crossed that this is the only one.

I suspect you mean rpmsg, not rdma. Because I just pulled the latter
with no conflicts that I can tell.

Linus

\
 
 \ /
  Last update: 2023-03-27 00:35    [W:0.064 / U:0.080 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site