linux-kernel - Re: linux-next: manual merge of the drivers-x86 tree with the drm-misc tree

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-next>] [day] [month] [year] [list]

Date:   Fri, 5 Feb 2021 13:06:59 +0200
From:   Andy Shevchenko <andy.shevchenko@...il.com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Hans de Goede <hdegoede@...hat.com>,
        Mark Gross <mark.gross@...el.com>,
        Daniel Vetter <daniel.vetter@...ll.ch>,
        Intel Graphics <intel-gfx@...ts.freedesktop.org>,
        DRI <dri-devel@...ts.freedesktop.org>,
        Andy Shevchenko <andriy.shevchenko@...ux.intel.com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Patrik Jakobsson <patrik.r.jakobsson@...il.com>,
        Thomas Zimmermann <tzimmermann@...e.de>
Subject: Re: linux-next: manual merge of the drivers-x86 tree with the
 drm-misc tree

On Thu, Feb 4, 2021 at 11:04 AM Andy Shevchenko
<andy.shevchenko@...il.com> wrote:
>> Today's linux-next merge of the drivers-x86 tree got a conflict in:
>
> Thanks. I already asked Patrik yesterday day if DRM missed to pull an immutable tag I provided. I think they can pull and resolve conflicts themselves. Alternatively it would be easy to resolve by Linus by removing Kconfig lines along with mentioned files,

Patrik, I have sent a PR again, so you may consider pulling it, thanks!

-- 
With Best Regards,
Andy Shevchenko