lists.openwall.net   lists  /  announce  owl-users  owl-dev  john-users  john-dev  passwdqc-users  yescrypt  popa3d-users  /  oss-security  kernel-hardening  musl  sabotage  tlsify  passwords  /  crypt-dev  xvendor  /  Bugtraq  Full-Disclosure  linux-kernel  linux-netdev  linux-ext4  linux-hardening  linux-cve-announce  PHC 
Open Source and information security mailing list archives
 
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Date:   Fri, 24 Feb 2023 15:14:21 -0800
From:   Linus Torvalds <torvalds@...ux-foundation.org>
To:     Joerg Roedel <joro@...tes.org>
Cc:     Will Deacon <will@...nel.org>, linux-kernel@...r.kernel.org,
        iommu@...ts.linux.dev
Subject: Re: [git pull] IOMMU Updates for Linux v6.3

On Fri, Feb 24, 2023 at 2:09 PM Joerg Roedel <joro@...tes.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

Powered by blists - more mailing lists

Powered by Openwall GNU/*/Linux Powered by OpenVZ