linux-kernel - Re: [GIT PULL] platform-drivers-x86 for 4.17-1

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]

Message-ID: <CA+55aFxzkm0ELM4Xa_rkJpsv4hqeFa7yh2Tvkrh_xnhQqZs=Kg@mail.gmail.com>
Date:   Tue, 10 Apr 2018 12:22:43 -0700
From:   Linus Torvalds <torvalds@...ux-foundation.org>
To:     Andy Shevchenko <andriy.shevchenko@...ux.intel.com>
Cc:     LKML <linux-kernel@...r.kernel.org>,
        Darren Hart <dvhart@...radead.org>,
        Andy Shevchenko <andy@...radead.org>
Subject: Re: [GIT PULL] platform-drivers-x86 for 4.17-1

On Tue, Apr 10, 2018 at 10:12 AM, Andy Shevchenko
<andriy.shevchenko@...ux.intel.com> wrote:
>
> This is first batch of Platform Drivers x86 for v4.17 cycle. Due to few
> duplication the merge will have conflicts which would be resolved by
> using `git merge -X no-renames ...` followed by choose of our version of
> two failed one-liner hunks situated in one file.

I'm not sure what git version or flags you are using, but git merges
it cleanly for me using the standard recursive merge policy.

                    Linus