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

Message-ID: <20220519113122.6bb6809a@kernel.org>
Date:   Thu, 19 May 2022 11:31:22 -0700
From:   Jakub Kicinski <kuba@...nel.org>
To:     "netdev@...r.kernel.org" <netdev@...r.kernel.org>
Cc:     David Miller <davem@...emloft.net>,
        Paolo Abeni <pabeni@...hat.com>,
        Mat Martineau <mathew.j.martineau@...ux.intel.com>,
        Saeed Mahameed <saeedm@...dia.com>
Subject: net <> net-next conflicts

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.

Thanks!