linux-kernel - Re: [GIT PULL for v4.15-rc1] media updates

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

Message-ID: <CA+55aFxG5jWvCajaoJvZQXcVMGtsYuywDiJSc1psCkxB3sbJzQ@mail.gmail.com>
Date:   Wed, 15 Nov 2017 20:33:45 -0800
From:   Linus Torvalds <torvalds@...ux-foundation.org>
To:     Mauro Carvalho Chehab <mchehab@....samsung.com>
Cc:     Andrew Morton <akpm@...ux-foundation.org>,
        Linux Media Mailing List <linux-media@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>
Subject: Re: [GIT PULL for v4.15-rc1] media updates

On Wed, Nov 15, 2017 at 4:28 PM, Mauro Carvalho Chehab
<mchehab@....samsung.com> wrote:
>
> PS.: This time, there is a merge from staging tree, from the same commit
>      you pulled on your tree, in order to solve a conflict at the
>      atomisp driver, as reported by Stephen Rothwell.

Please don't do that.

I got conflicts anyway, and I'd rather see them. Honestly, I want to
know, but I also am quite possibly better at resolving those conflicts
than most developers, because I do a *lot* of merges.

Why do I have to say this *every* single merge window?

Stop trying to hide your conflicts. Stop thinking that I prefer them
hidden over being there. Stop doing crazy merges from trees that
aren't yours and you were not asked to pull!

Really.

                Linus