linux-wireless.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* Differences between wireless-testing and mainline
@ 2009-09-11  2:59 John Ranson
  2009-09-11  4:37 ` Pavel Roskin
  0 siblings, 1 reply; 2+ messages in thread
From: John Ranson @ 2009-09-11  2:59 UTC (permalink / raw)
  To: linux-wireless

Is there a good way to keep track of the differences between the
mainline kernel and wireless testing?  I'm running wireless testing to
minimize firmware errors with my iwl4965 card. When mainline
incorporates the code that I'm running, I would like to switch back.

John

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: Differences between wireless-testing and mainline
  2009-09-11  2:59 Differences between wireless-testing and mainline John Ranson
@ 2009-09-11  4:37 ` Pavel Roskin
  0 siblings, 0 replies; 2+ messages in thread
From: Pavel Roskin @ 2009-09-11  4:37 UTC (permalink / raw)
  To: John Ranson; +Cc: linux-wireless

Quoting John Ranson <ranson@analager.net>:

> Is there a good way to keep track of the differences between the
> mainline kernel and wireless testing?  I'm running wireless testing to
> minimize firmware errors with my iwl4965 card. When mainline
> incorporates the code that I'm running, I would like to switch back.

git whatchanged wireless-testing/base..wireless-testing/master

wireless-testing/base is usually the latest release or release  
candidate from the mainline.

If you want a better granularity, e.g. you are ready to switch to the  
mainline before rc1, you'll need to track the mainline and look for  
the patches you care about.

You can also pick up the patches you need from wireless-testing and  
apply them to the mainline repository.  If you do it with STGit, it  
will tell you that the patches have been merged by telling you that  
the local patches have become empty after the update.

-- 
Regards,
Pavel Roskin

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2009-09-11  4:33 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-09-11  2:59 Differences between wireless-testing and mainline John Ranson
2009-09-11  4:37 ` Pavel Roskin

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).