From: Kalle Valo <kv...@codeaurora.org> Date: Fri, 22 Jul 2016 17:28:44 +0300
> I'm sick so I have to keep this short, but here's the last pull request > to net-next. This time there's a trivial conflict with mtd tree: > > http://lkml.kernel.org/g/20160720123133.44dab...@canb.auug.org.au > > We concluded with Brian (CCed) that it's best that we ask Linus to fix > this. The patches have been in linux-next for a couple of days. This > time I haven't done any merge tests so I don't know if there are any > other conflicts etc. > > Please let me know if there are any problems. Ok, pulled, thanks Kalle. Feel better soon.
