linux-kernel - Re: linux-next: manual merge of the arm tree with Linus' 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-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20200530195311.0ae2d1d8@canb.auug.org.au>
Date:   Sat, 30 May 2020 19:53:11 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Russell King - ARM Linux admin <linux@...linux.org.uk>
Cc:     Ard Biesheuvel <ardb@...nel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Ingo Molnar <mingo@...nel.org>
Subject: Re: linux-next: manual merge of the arm tree with Linus' tree

Hi Russell,

On Sat, 30 May 2020 10:17:47 +0100 Russell King - ARM Linux admin <linux@...linux.org.uk> wrote:
>
> I don't know - I don't have a resolution for the first one, Stephen
> didn't provide a 3-way diff with his report, and I was expecting a
> 3-way diff from you for it rather than another pull request.

There is no 3-way diff, because "I just used the latter" i.e. I used
the arm tree version of the conflicted section of the file.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped