Subject: net <> net-next conflicts

From: Jakub Kicinski <[email-masked]>
Date: Thu, 19 May 2022 11:31:22 -0700

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!