From: Antonio Quartulli <a...@unstable.cc> Date: Tue, 3 May 2016 22:42:29 +0800
> Do you have any plan on merging net into net-next in the following days ? > > I am asking because I'd prefer to avoid you the hassle of dealing with the > conflicts. I'll try to do this in the next few days.
