linux-kernel - Re: linux-next: manual merge of the char-misc tree with the driver-core 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] [day] [month] [year] [list]

Message-ID: <20190710160051.5b192606@canb.auug.org.au>
Date:   Wed, 10 Jul 2019 16:00:51 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     "Winkler, Tomas" <tomas.winkler@...el.com>
Cc:     Greg KH <greg@...ah.com>, "Arnd Bergmann" <arnd@...db.de>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        "Lubart, Vitaly" <vitaly.lubart@...el.com>
Subject: Re: linux-next: manual merge of the char-misc tree with the
 driver-core tree

Hi Tomas,

On Tue, 9 Jul 2019 07:12:34 +0000 "Winkler, Tomas" <tomas.winkler@...el.com> wrote:
>
> Actually I've asked Greg this git expertise question: how the
> **exact** conflict resolution is carried between git trees (before it
> is finally resolved in upstream for all.). For next time If anyone
> has the answer, please let me know.

When I see a conflict, I fix it up and report it, then "git rerere"
will remember the resolution for me so that the next day it is fixed up
automatically.  When Linus merges the same trees he will do the same
(or a similar) merge resolution.  I depend on the maintainers to inform
Linus if the conflict is any anyway difficult to resolve.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped