On 07/14/2014 01:15 PM, Alexander Aring wrote: > Martin, > > On Thu, Jul 10, 2014 at 07:07:03PM +0100, Martin Townsend wrote: >> Hi Alex, >> >> Yes I failed to appreciated that the code is shared with bluetooth, sorry >> about that. I'll wait until the IPHC code is moved, it makes sense to have >> a net/6lowpan as it can sit on top of other MAC layers not just 802.15.4. >> > I create a branch for the current iphc implementation with all patches > for movement, cleanup etc. Name is "for-martin" [0]. > > You can do your work on it and it should easily to rebase the patches on > net-next/bluetooth-next. > > I talked with the bluetooth maintainer Marcel Holtmann, he will apply > the changes for the iphc code. > > Marcel should accept all the patches on this branch (for iphc changes > and the necessary changes for iphc). I will take care there are no > conflicts with future patches). > > - Alex > > [0] https://github.com/linux-wpan/linux-wpan-next/commits/for-martin > I am already having wpan-next on my working machine. git pull is not working.
$git pull ...... M tools/vm/page-types.c M usr/Kconfig M virt/kvm/arm/arch_timer.c M virt/kvm/arm/vgic.c M virt/kvm/assigned-dev.c M virt/kvm/async_pf.c M virt/kvm/eventfd.c M virt/kvm/ioapic.c M virt/kvm/irq_comm.c M virt/kvm/irqchip.c M virt/kvm/kvm_main.c M virt/kvm/vfio.c Pull is not possible because you have unmerged files. Please, fix them up in the work tree, and then use 'git add/rm <file>' as appropriate to mark resolution, or use 'git commit -a'. -- Regards, Varka Bhadram. ------------------------------------------------------------------------------ Want fast and easy access to all the code in your enterprise? Index and search up to 200,000 lines of code with a free copy of Black Duck® Code Sight™ - the same software that powers the world's largest code search on Ohloh, the Black Duck Open Hub! Try it now. http://p.sf.net/sfu/bds _______________________________________________ Linux-zigbee-devel mailing list Linux-zigbee-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linux-zigbee-devel
