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 it with the latest > linux-zigbee-devel updates. Hi Randy,
assuming you have a git checkout of the beaglebone-linux git repo, you could "git remote add davem-net-next git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git" Dave's net- next as an additional remote to your checkout. With "git merge-base <beaglebone-branch> davem-net-next/master" you can find the last common commit. With " git log <SHA of last common commit>.. -- drivers/net/ieee802154/ net/mac802154/ net/ieee802154/ | grep "^commit" > 154-commits-in-net-next-not- present-in-beaglebone " you could figure out the commits that touched 802154 relevant directories. >From there: * reverse the lines in the file 154-commits-in-net-next-not-present-in- beaglebone * cherry pick those commits (and cross your fingers, that they apply cleanly) I'd love to hear about other easier ways of doing this. Markus > I really just want to catch updates to 802.15.4 and 6Lowpan and understand > how to merge and what to merge into my custom kernel tree. > > -Randy > > On Thu, Sep 26, 2013 at 4:59 AM, Alexander Aring <alex.ar...@gmail.com>wrote: > > 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 mainline ? > > > > First it's good to send the patches to this list, if somebody has > > improvements, fixes or other issues you need to change that. > > > > After this you can send it to net-next mailinglist and David Miller > > takes this patches and put it into his net-next repo(depends if all > > seems ok). Then David Miller sends a pull request to Linus and > > Linus merge it into mainline. > > > > I don't know the exact circle of this, visit kernel.org for more > > information. > > > > To make patches for linux-zigbee-devel: > > > > 1. Your patches MUST based on net-next branch, because David need to > > > > merge it. > > > > 2. You MUST create your patches with git. See git format-patch. > > > > 3. Before you send Patches you MUST run checkpatch on it. Checkpatch is > > > > a powerful perl script to check coding style issues. You can find it > > under scripts/checkpatch.pl in linux src tree. > > > > 3. The simplest way to send patches is the builtin mail-client into git. > > > > Checkout git send-email. > > > > > > Also, suppose I want to use the latest patches in net-next, how do I go > > > about manually merging them myself into my own local kernel tree ? > > > > Checkout [1] and create a branch on it with git. > > > > So that's a lot of git things, maybe just google it and take a git > > tutorial. > > > > [1] http://git.kernel.org/cgit/linux/kernel/git/davem/net-next.git > > > > - Alex ------------------------------------------------ | Dipl.-Ing. Markus Becker | Communication Networks | TZI - Center for Computing Technologies | University Bremen | Germany ------------------------------------------------ | web: http://www-user.uni-bremen.de/~beckerm/ | mailto: m...@comnets.uni-bremen.de | telephone: +49 421 218 62379 | building: NW1 room: N2260 ------------------------------------------------ ------------------------------------------------------------------------------ October Webinars: Code for Performance Free Intel webinars can help you accelerate application performance. Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from the latest Intel processors and coprocessors. See abstracts and register > http://pubads.g.doubleclick.net/gampad/clk?id=60133471&iu=/4140/ostg.clktrk _______________________________________________ Linux-zigbee-devel mailing list Linux-zigbee-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linux-zigbee-devel
