Messages in this thread | | | Date | Mon, 30 Oct 2017 18:10:30 +0000 | From | Mark Brown <> | Subject | Re: linux-next: manual merge of the net-next tree with Linus' tree |
| |
On Mon, Oct 30, 2017 at 10:43:07AM -0700, Jakub Kicinski wrote: > On Mon, 30 Oct 2017 17:02:24 +0000, Mark Brown wrote:
> > is submitted for merging. You may also want to consider cooperating > > with the maintainer of the conflicting tree to minimise any particularly > > complex conflicts.
> Unfortunately, this is not a correct resolution. Please see below.
So I actually ended up just throwing this away (and the rest of what was going on for net-next, there were just far too many of these self conflicts. The tree is one of the bigger time sinks when doing -next but today was particularly heavy. [unhandled content-type:application/pgp-signature] | |