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

Message-ID: <50a38140-f8dc-979a-99da-dc7b58c782ff@linux.intel.com>
Date:   Thu, 19 May 2022 13:23:56 -0700 (PDT)
From:   Mat Martineau <mathew.j.martineau@...ux.intel.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>,
        Saeed Mahameed <saeedm@...dia.com>
Subject: Re: net <> net-next conflicts

On Thu, 19 May 2022, 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.
>

Sorry about the tedium - I will be sure to note and [tag] any unavoidable 
conflicts in future cover letters. Merge results look good, thank you.

--
Mat Martineau
Intel