[PATCH 3/3] staging: brcm80211: align common driver code

Greg KH greg at kroah.com
Wed Feb 2 23:10:03 UTC 2011


On Wed, Feb 02, 2011 at 01:23:39PM +0100, Arend van Spriel wrote:
> Hi Greg,
> 
> On Wed, 26 Jan 2011 08:22:23 +0100, Arend van Spriel
> <arend at broadcom.com> wrote:
> 
> >Hi Greg,
> >
> >For the first patch your reply contained the question whether it should
> >be in the final .38 release. We are getting confused over here about the
> >distribution of patches in branches/repositories within the community so
> >could you elaborate a little and answer my questions below.
> >
> >1. From the various response I see following submit possibilities:
> >	- staging-next	-> patch to you (ie. gregkh at suse.de)
> >	- staging-linus	-> patch to you (ie. gregkh at suse.de)
> >	- linus tree      -> ??
> >	- stable			-> patch to stable at kernel.org
> >	- final .38	-> ??
> >2. For the last three targets it is unclear what repo/branch we
> >need to use
> >    to create our patch upon.
> >3. For the stable tree it suggest to add Cc: stable at kernel.org and add
> >    the upstream (linus tree) commit id. Is this something you will add
> >    when we request it to be applied to those trees or does it require
> >    a separate patch email sent by us?
> >
> >Hope you can eradicate our confusion.
> 
> Could you please confirm my assumptions regarding the questions above:
> 1. staging-next  - used for collecting patches intended for linux-next.

Yes, this is what gets merged into linux-next every day.

> 2. staging-linus - used for collecting patches intended for linus tree.

Yes.  This too is merged into linux-next every day.

> 3. patches for stable are based on your staging-linus and we
> indicate in the patch that it is intended for stable as well.

Yes.

> 4. "final .38" and "linus tree" are one and the same.

Yes.

> 5. we should send all patches to you for either staging-next
> (default) or staging-linus (indicated in patch).

Yes.

> 6. our staging-linus patches are submitted to stable tree by you if
> we indicate it in the patch.

Yes.  Well kind of.  They happen "automagically" thanks to a bunch of
scripts that we have set up.  Once the patch hits Linus's tree, an
automated email is sent to the stable developers and then it gets
backported and added there.

Hope this helps,

greg k-h



More information about the devel mailing list