netdev - Re: net <> net-next conflicts

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: <20220520221427.nx3fz7rfgvez3kxc@sx1>
Date:   Fri, 20 May 2022 15:14:27 -0700
From:   Saeed Mahameed <saeedm@...dia.com>
To:     Jakub Kicinski <kuba@...nel.org>
Cc:     "netdev@...r.kernel.org" <netdev@...r.kernel.org>,
        David Miller <davem@...emloft.net>,
        Paolo Abeni <pabeni@...hat.com>,
        Mat Martineau <mathew.j.martineau@...ux.intel.com>
Subject: Re: net <> net-next conflicts

On 19 May 11:31, Jakub Kicinski wrote:
>Hi!
>
>The conflicts in today's net -> net-next merge were pretty tedious.
>
>First off - please try to avoid creating them.
>
>If they are unavoidable - please include the expected resolution
>in the cover letter and mark the cover letter with [conflict]
>(i.e.  [PATCH tree 0/n][conflict]) so we can easily find them days
>later when doing the merge.

Ack, and sorry, will make sure to avoid this as much as possible.