* net <> net-next conflicts
@ 2022-05-19 18:31 Jakub Kicinski
2022-05-19 20:23 ` Mat Martineau
2022-05-20 22:14 ` Saeed Mahameed
0 siblings, 2 replies; 3+ messages in thread
From: Jakub Kicinski @ 2022-05-19 18:31 UTC (permalink / raw)
To: netdev; +Cc: David Miller, Paolo Abeni, Mat Martineau, Saeed Mahameed
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!
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: net <> net-next conflicts
2022-05-19 18:31 net <> net-next conflicts Jakub Kicinski
@ 2022-05-19 20:23 ` Mat Martineau
2022-05-20 22:14 ` Saeed Mahameed
1 sibling, 0 replies; 3+ messages in thread
From: Mat Martineau @ 2022-05-19 20:23 UTC (permalink / raw)
To: Jakub Kicinski; +Cc: netdev, David Miller, Paolo Abeni, Saeed Mahameed
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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: net <> net-next conflicts
2022-05-19 18:31 net <> net-next conflicts Jakub Kicinski
2022-05-19 20:23 ` Mat Martineau
@ 2022-05-20 22:14 ` Saeed Mahameed
1 sibling, 0 replies; 3+ messages in thread
From: Saeed Mahameed @ 2022-05-20 22:14 UTC (permalink / raw)
To: Jakub Kicinski; +Cc: netdev, David Miller, Paolo Abeni, Mat Martineau
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.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-05-20 22:14 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-05-19 18:31 net <> net-next conflicts Jakub Kicinski
2022-05-19 20:23 ` Mat Martineau
2022-05-20 22:14 ` Saeed Mahameed
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).