All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jakub Kicinski <kuba@kernel.org>
To: "netdev@vger.kernel.org" <netdev@vger.kernel.org>
Cc: David Miller <davem@davemloft.net>,
	Paolo Abeni <pabeni@redhat.com>,
	Mat Martineau <mathew.j.martineau@linux.intel.com>,
	Saeed Mahameed <saeedm@nvidia.com>
Subject: net <> net-next conflicts
Date: Thu, 19 May 2022 11:31:22 -0700	[thread overview]
Message-ID: <20220519113122.6bb6809a@kernel.org> (raw)

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!

             reply	other threads:[~2022-05-19 18:31 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-05-19 18:31 Jakub Kicinski [this message]
2022-05-19 20:23 ` net <> net-next conflicts Mat Martineau
2022-05-20 22:14 ` Saeed Mahameed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220519113122.6bb6809a@kernel.org \
    --to=kuba@kernel.org \
    --cc=davem@davemloft.net \
    --cc=mathew.j.martineau@linux.intel.com \
    --cc=netdev@vger.kernel.org \
    --cc=pabeni@redhat.com \
    --cc=saeedm@nvidia.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.