Messages in this thread | | | From | Linus Torvalds <> | Date | Fri, 24 Feb 2023 15:14:21 -0800 | Subject | Re: [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
| |