2012-12-01 02:46:37

by John W. Linville

[permalink] [raw]
Subject: Re: [RFC] How to manage dependency between patches

On Thu, Nov 29, 2012 at 11:29:55AM +0200, Vladimir Kondratiev wrote:
> Hi,
>
> I have the following situation:
>
> - there is the driver for 60g WiFi card, "wil6210", that I want to merge. It
> consists of 2 patches:
>
> wireless: Driver for 60GHz card wil6210
> wireless: integrate wil6210 driver into build
>
> - then, there is one more patch for Atheros drivers family config that I rely
> on:
>
> wireless: allow Atheros card to not depend on ath.ko
>
> - and, there is one more patch that I depend on:
>
> dynamic_debug: dynamic hex dump
>
> Discussion about last patch was taken from linux-wireless to the LKML, and it
> get pushed to Greg K-H by Jason Baron.
>
> So, question is: what is the right strategy for wil6210 driver?
>
> Shall I wait till 2 patches I depend on get merged? Some other idea?
>
> Please advise.
>
> Thanks, Vladimir

Since Greg is merging one patch and I'm merging the other, under
normal circumstances they will only reach the same tree sometime
during the 3.8 merge window. FWIW, I was under the impression that
you were targeting 3.9 anyway. If so, you can simply wait to have
your driver merged sometime after 3.8-rc1.

Does that help?

John
--
John W. Linville Someday the world will need a hero, and you
[email protected] might be all we have. Be ready.


2012-12-02 08:14:19

by Vladimir Kondratiev

[permalink] [raw]
Subject: Re: [RFC] How to manage dependency between patches

On Friday, November 30, 2012 09:38:00 PM John W. Linville wrote:
> Since Greg is merging one patch and I'm merging the other, under
> normal circumstances they will only reach the same tree sometime
> during the 3.8 merge window. FWIW, I was under the impression that
> you were targeting 3.9 anyway. If so, you can simply wait to have
> your driver merged sometime after 3.8-rc1.
>
> Does that help?
>
> John
>

Thanks John,

Actually, I was after 3.8; but I understand in my situation it may be
not feasible.

Positive side is till 3.9 I can integrate more features;
negative one is... the same - since I will end up with one bulky patch.

I'd actually prefer to have baseline merged, and then submit 'feature'
patches - it will be easier to review.

By the way - what is better, hold new features till initial driver merged,
or keep integrating more and more stuff?

Thanks, Vladimir