Re: [B.A.T.M.A.N.] pull request [net]: batman-adv 20160216

On Sat, Feb 20, 2016 at 01:28:40PM +0800, Antonio Quartulli wrote:

On Fri, Feb 19, 2016 at 03:37:18PM -0500, David Miller wrote:

quoted

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.

Hi David,

I know this kind of mails steal you some time, but do you have any plan
about merging net into net-next in the next days ?

I have some more new changes coming, but I'd like to send them only after
the merge operation is done to avoid you to deal with some conflicts (as per
above).

Thanks !


-- 
Antonio Quartulli