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  PHC 
Open Source and information security mailing list archives
 
Hash Suite for Android: free password hash cracker in your pocket
[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Date:   Mon, 15 Jul 2019 18:31:40 -0700
From:   Linus Torvalds <torvalds@...ux-foundation.org>
To:     Dave Airlie <airlied@...il.com>
Cc:     Daniel Vetter <daniel.vetter@...ll.ch>,
        dri-devel <dri-devel@...ts.freedesktop.org>,
        LKML <linux-kernel@...r.kernel.org>
Subject: Re: [git pull] drm pull for 5.3-rc1

On Mon, Jul 15, 2019 at 11:38 AM Dave Airlie <airlied@...il.com> wrote:
>
> The reason I was waiting for the HMM tree to land, is a single silent
> merge conflict needs to be resolved after merging this as below.

There's more than that there.

For example, the DRM_AMDGPU_USERPTR config has a

        depends on ARCH_HAS_HMM
        select HMM_MIRROR

and that won't work any more. The hmm tree changed the requirements to be

        depends on HMM_MIRROR

instead.

Now, arguably the hmm tree change in this respect is an annoyance -
the old model was much more user-friendly where the drivers that
wanted HMM would just select it when it was available.

See commit 43535b0aefab ("mm: remove the HMM config option").

I've done the merge, but my tests are still on-going. And after I've
finished those, I'll compare against your suggested merge to see if I
missed anything in turn..

                 Linus

Powered by blists - more mailing lists