On Fri, Feb 19, 2016 at 03:37:18PM -0500, David Miller wrote: > And thanks for the heads up about the potential merge issues, I'll watch > for that. >
Hi David, actually I just realized that the patches that will create the conflict are not yet in net-next, but they are still pending in my queue. At this point I will wait for you to merge net into net-next first (there should be no conflict at that point) and then I will rebase my pending patches on top of that. This should prevent you from dealing with any conflict. Regards, -- Antonio Quartulli
signature.asc
Description: Digital signature
