net <> net-next conflicts
Subsystems (2)
Jakub Kicinski
maintainerHi!
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!
Quoted 11 lines · Jakub Kicinski
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
Quoted 10 lines · Jakub Kicinski
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.