Re: [Linux-zigbee-devel] How often is net-next merged with the mainline kernel and how to manually merge?

2013-09-26 Thread Alexander Aring
Hi Randy, On Wed, Sep 25, 2013 at 08:06:33PM -0700, Randy Graham wrote: > Hello, > > I would like to better understand how patches here make it into the > mainline. > Ok. > I understand that patches here go to Dave Millers net-next repo, but when > or how often do they get merged into the mainl

Re: [Linux-zigbee-devel] How often is net-next merged with the mainline kernel and how to manually merge?

2013-09-26 Thread Randy Graham
Thanks Alex, some day I hope to be able to contribute to this effort and this info is very helpful. Right now I have a 3.11 kernel that has been patched for the beaglebone (which is not mainlined) and was wondering how to patch it with the latest linux-zigbee-devel updates. I really just want to

Re: [Linux-zigbee-devel] How often is net-next merged with the mainline kernel and how to manually merge?

2013-09-26 Thread Randy Graham
Thank you Markus. It really does seem that I need to get smarter about Git :) Do all linux-zigbee-devel patches just affect 'net' and its subdirectories or are other kernel source directories affected ? On Thu, Sep 26, 2013 at 9:38 AM, Markus Becker wrote: > On Thursday 26 September 2013 08:4

Re: [Linux-zigbee-devel] How often is net-next merged with the mainline kernel and how to manually merge?

2013-09-26 Thread Markus Becker
On Thursday 26 September 2013 08:49:28 Randy Graham wrote: > Thanks Alex, some day I hope to be able to contribute to this effort and > this info is very helpful. > > Right now I have a 3.11 kernel that has been patched for the beaglebone > (which is not mainlined) and was wondering how to patch i

Re: [Linux-zigbee-devel] How often is net-next merged with the mainline kernel and how to manually merge?

2013-09-26 Thread Alexander Aring
Hi Randy, On Thu, Sep 26, 2013 at 09:47:41AM -0700, Randy Graham wrote: > Thank you Markus. > > It really does seem that I need to get smarter about Git :) > > Do all linux-zigbee-devel patches just affect 'net' and its subdirectories > or are other kernel source directories affected ? I have a

Re: [Linux-zigbee-devel] How often is net-next merged with the mainline kernel and how to manually merge?

2013-09-26 Thread Randy Graham
Thanks Alex, Markus. I am clearer on this now, thanks. On Thu, Sep 26, 2013 at 10:10 AM, Alexander Aring wrote: > Hi Randy, > > On Thu, Sep 26, 2013 at 09:47:41AM -0700, Randy Graham wrote: > > Thank you Markus. > > > > It really does seem that I need to get smarter about Git :) > > > > Do all