Patches submitted should apply to which git repository?

Patches submitted should apply to which git repository?

[Naveenan]

Hi,
I would like to submit a patch to linux-wireless and was wondering
what git repository should my patch be apply-able to so that there
wouldn't be any merge conflicts?

I went through:
http://wireless.kernel.org/en/developers/Documentation/SubmittingPatches
but couldn't find this information there so was hoping someone could
point the exact git repository. My current patch applies to
wireless-testing but doesn't apply to wireless-2.6 (due to a trivial
merge conflict) . The changes I'm making are to mac80211.

Thanks.

Re: Patches submitted should apply to which git repository?

[Johannes Berg]

On Tue, 2010-12-28 at 02:40 -0600, Naveenan wrote:
> Hi,
> I would like to submit a patch to linux-wireless and was wondering
> what git repository should my patch be apply-able to so that there
> wouldn't be any merge conflicts?
> 
> I went through:
> http://wireless.kernel.org/en/developers/Documentation/SubmittingPatches
> but couldn't find this information there so was hoping someone could
> point the exact git repository. My current patch applies to
> wireless-testing but doesn't apply to wireless-2.6 (due to a trivial
> merge conflict) . The changes I'm making are to mac80211.

If they're fixes and required in wireless-2.6, then you should make them
apply there, but ask yourself if they really need to be there. If not,
you can typically just submit them on top of wireless-testing, although
they will have to be applied to wireless-next-2.6.

johannes

Re: Patches submitted should apply to which git repository?

[Naveenan]

Hi Johannes,

Thanks for your email.

>> I went through:
>> http://wireless.kernel.org/en/developers/Documentation/SubmittingPatches
>> but couldn't find this information there so was hoping someone could
>> point the exact git repository. My current patch applies to
>> wireless-testing but doesn't apply to wireless-2.6 (due to a trivial
>> merge conflict) . The changes I'm making are to mac80211.
>
> If they're fixes and required in wireless-2.6, then you should make them
> apply there, but ask yourself if they really need to be there. If not,
> you can typically just submit them on top of wireless-testing, although
> they will have to be applied to wireless-next-2.6.

Would it be ok if I can send 2 different patches for both these 2 versions?

Unfortunately someone changed a line of code (that is a few lines
before my patch
but not related to it) in a recent commit to wireless-testing and this
makes the patch
not apply-able to both wireless-2.6 and wireless-next.

I would say that the fix is not a critical one would would be useful
if applied to
wireless-2.6 too.

Thanks

Re: Patches submitted should apply to which git repository?

[Johannes Berg]

On Tue, 2010-12-28 at 03:12 -0600, Naveenan wrote:

> Would it be ok if I can send 2 different patches for both these 2 versions?
> 
> Unfortunately someone changed a line of code (that is a few lines
> before my patch
> but not related to it) in a recent commit to wireless-testing and this
> makes the patch
> not apply-able to both wireless-2.6 and wireless-next.
> 
> I would say that the fix is not a critical one would would be useful
> if applied to wireless-2.6 too.

Yes, if it's an important fix then you would have to send two versions.
Without seeing it, I can offer no advice on whether it is important
enough though.

johannes

Re: Patches submitted should apply to which git repository?

[Naveenan]

[I apologize, I am resending this email with CC to the list]

>> I would say that the fix is not a critical one would would be useful
>> if applied to wireless-2.6 too.
>
> Yes, if it's an important fix then you would have to send two versions.
> Without seeing it, I can offer no advice on whether it is important
> enough though.

Thanks a lot. I guess I will include the git repository I am diffing
against after the "---" marker so that it would be applied to the
right repository. Could you let me know if this style of sending
patches is ok? I kind of would like to not send a patch and have it
rejected due to a merge conflict :)

Thanks

Re: Patches submitted should apply to which git repository?

[Johannes Berg]

On Tue, 2010-12-28 at 03:28 -0600, Naveenan wrote:
> [I apologize, I am resending this email with CC to the list]
> 
> >> I would say that the fix is not a critical one would would be useful
> >> if applied to wireless-2.6 too.
> >
> > Yes, if it's an important fix then you would have to send two versions.
> > Without seeing it, I can offer no advice on whether it is important
> > enough though.
> 
> Thanks a lot. I guess I will include the git repository I am diffing
> against after the "---" marker so that it would be applied to the
> right repository. Could you let me know if this style of sending
> patches is ok? I kind of would like to not send a patch and have it
> rejected due to a merge conflict :)

Yes, you can put anything after the first --- marker.

You can also indicate it in the subject: if it's intended for the
current kernel release still -- which is kinda late -- you can say
"[PATCH 2.6.37] mac80211: foobar"

johannes