patch tagging: UBUNTU and SAUCE

classic Classic list List threaded Threaded
4 messages Options
Reply | Threaded
Open this post in threaded view
|

patch tagging: UBUNTU and SAUCE

Kamal Mostafa-2
I still don't understand the patch tagging scheme for
[hidden email] submissions (because I am dense ;-) ...

I submitted this one as an SRU to Lucid and Maverick.  The patch was a
cherry-pick from mainline, but is not present in the 2.6.{32,35} stable
trees:

   UBUNTU: SAUCE: dell-laptop: Add another Dell laptop family to the DMI whitelist


Tim Gardner wrote:
> Its also not a SAUCE patch since its a cherry-pick from Linus' repo.

Stefan Bader wrote:
> Hm, probably annoying nitpick but would we not completely take away the UBUNTU
> tag as well as it really is a cherry-pick from upstream?


I mistakenly thought that it should need UBUNTU: or SAUCE: (or
something) for Lucid and Maverick because it was not present ** in the
associated stable tree **.  But should I never add UBUNTU: or SAUCE: to
*any* cherry-picked patch from *any* upstream tree? (or is it more
complicated than that?)

When exactly should I add UBUNTU: or SAUCE: to a patch submission?

What's the difference between UBUNTU: and SAUCE:?

Thanks,

 -Kamal

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team

signature.asc (853 bytes) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: patch tagging: UBUNTU and SAUCE

Tim Gardner-2
On 01/25/2011 10:29 AM, Kamal Mostafa wrote:

> I still don't understand the patch tagging scheme for
> [hidden email] submissions (because I am dense ;-) ...
>
> I submitted this one as an SRU to Lucid and Maverick.  The patch was a
> cherry-pick from mainline, but is not present in the 2.6.{32,35} stable
> trees:
>
>     UBUNTU: SAUCE: dell-laptop: Add another Dell laptop family to the DMI whitelist
>
>
> Tim Gardner wrote:
>> Its also not a SAUCE patch since its a cherry-pick from Linus' repo.
>
> Stefan Bader wrote:
>> Hm, probably annoying nitpick but would we not completely take away the UBUNTU
>> tag as well as it really is a cherry-pick from upstream?
>
>
> I mistakenly thought that it should need UBUNTU: or SAUCE: (or
> something) for Lucid and Maverick because it was not present ** in the
> associated stable tree **.  But should I never add UBUNTU: or SAUCE: to
> *any* cherry-picked patch from *any* upstream tree? (or is it more
> complicated than that?)
>
> When exactly should I add UBUNTU: or SAUCE: to a patch submission?
>
> What's the difference between UBUNTU: and SAUCE:?
>
> Thanks,
>
>   -Kamal
>

UBUNTU prefaces any commit that _we_ write that does not come from
upstream. SAUCE is included in the description if its a code patch that
we've either written that won't go upstream, or have included from a
source other then upstream. Upstream in this case includes Linus' tree
as well as any of the stable trees (which are composed solely of patches
from Linus' tree anyways).

Clear as mud?

rtg
--
Tim Gardner [hidden email]

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

Re: patch tagging: UBUNTU and SAUCE

Kamal Mostafa-2
On Tue, 2011-01-25 at 11:08 -0700, Tim Gardner wrote:
> UBUNTU prefaces any commit that _we_ write that does not come from
> upstream. SAUCE is included in the description if its a code patch that
> we've either written that won't go upstream, or have included from a
> source other then upstream. Upstream in this case includes Linus' tree
> as well as any of the stable trees (which are composed solely of patches
> from Linus' tree anyways).
>
> Clear as mud?
>

Actually .... Yes, that explains it all!  Thanks Tim!

 -Kamal

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team

signature.asc (853 bytes) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: patch tagging: UBUNTU and SAUCE

Brad Figg-2
In reply to this post by Tim Gardner-2
On 01/25/2011 10:08 AM, Tim Gardner wrote:

> On 01/25/2011 10:29 AM, Kamal Mostafa wrote:
>> I still don't understand the patch tagging scheme for
>> [hidden email] submissions (because I am dense ;-) ...
>>
>> I submitted this one as an SRU to Lucid and Maverick. The patch was a
>> cherry-pick from mainline, but is not present in the 2.6.{32,35} stable
>> trees:
>>
>> UBUNTU: SAUCE: dell-laptop: Add another Dell laptop family to the DMI whitelist
>>
>>
>> Tim Gardner wrote:
>>> Its also not a SAUCE patch since its a cherry-pick from Linus' repo.
>>
>> Stefan Bader wrote:
>>> Hm, probably annoying nitpick but would we not completely take away the UBUNTU
>>> tag as well as it really is a cherry-pick from upstream?
>>
>>
>> I mistakenly thought that it should need UBUNTU: or SAUCE: (or
>> something) for Lucid and Maverick because it was not present ** in the
>> associated stable tree **. But should I never add UBUNTU: or SAUCE: to
>> *any* cherry-picked patch from *any* upstream tree? (or is it more
>> complicated than that?)
>>
>> When exactly should I add UBUNTU: or SAUCE: to a patch submission?
>>
>> What's the difference between UBUNTU: and SAUCE:?
>>
>> Thanks,
>>
>> -Kamal
>>
>
> UBUNTU prefaces any commit that _we_ write that does not come from upstream. SAUCE is included in the description if its a code patch that we've either written that won't go upstream, or have included from a source other then upstream. Upstream in this
> case includes Linus' tree as well as any of the stable trees (which are composed solely of patches from Linus' tree anyways).
>
> Clear as mud?
>
> rtg

This page (https://wiki.ubuntu.com/Kernel/Dev/StablePatchFormat) attempts to anwer any/all such
questions. If it doesn't it should be fixed.

Brad
--
Brad Figg [hidden email] http://www.canonical.com

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team