Query regarding pushing a patch series against net-next tree

Query regarding pushing a patch series against net-next tree

[Vipul Pandya]

Hi David Miller,

We have a important patch series fixing a bug as well as adding a
feature. This patch series is prepared against net-next tree. However to
be able to build it successfully it requires a patch from net tree which
was pushed recently. So, we cannot push this patch series until both the
trees are merged. We would like this patch series to be submitted as
soon as possible to net-next so that it can be accepted by OFED community.

Can you please suggest how should we proceed for submitting this patch
series?

Thanks,
Vipul Pandya

Re: Query regarding pushing a patch series against net-next tree

[Francois Romieu]

Vipul Pandya <vipul@chelsio.com> :
[...]
> Can you please suggest how should we proceed for submitting this patch
> series?

- Answer #1
  You rework the fix against -net so that it can be fed into -stable asap
  (your customers use -stable or derivative kernels, don't they ?). You
  rework the feature part against your modified -net vs -net-next merge
  and you carry it until -net gets merged.

- Answer #2
  You wait until David merges -net into -net-next again.

If you don't read netdev regularly (!), you should read
http://marc.info/?l=linux-netdev&m=135170163622882&w=2

-- 
Ueimor