Hi Marcel, On Mon, Aug 04, 2014 at 08:35:48AM -0700, Marcel Holtmann wrote: > Hi Alex, > > >>>> The changes were made to a clone of bluetooth-next, do I have the right > >>>> repository? > >>>> > >>>> martin@martin-HP-ProDesk-490-G1-MT:~/workspace/bluetooth-next$ git > >>>> ls-remote > >>>> From > >>>> git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git > >>>> > >>> yes, but maybe it's a little bit outdated. Try to update it, on top of > >>> git log should be the patches: > >>> > >>> http://git.kernel.org/cgit/linux/kernel/git/bluetooth/bluetooth-next.git/log/ > >>> > >> > >> I think I know now why it fails. This patch depends on your previous patch > >> ("6lowpan: Remove ununsed dev parameter from skb_delivery_cb > >> callback."), otherwise I get merge conflicts. > >> > >> Normally you need to send this in a series of patches to avoid something > >> like this. Now you need to wait until your patch ("6lowpan: Remove > >> ununsed dev parameter from skb_delivery_cb callback.") go into the > >> bluetooth-next tree. > >> > > > > Or write in the patch file under the "---" lines: > > > > "This patch depends on..." if Marcel can deal with this kind of > > dependency notification. > > > > Otherwise nobody knows what's going on now and want to apply it on > > bluetooth-next, like me... > > > > > > btw. lines after "---" will be ignored by applying. > > so I am fine either way. You can mention this in the section after --- or you > just send a patch set that is versioned [PATCH x/y]. > > Just right now I am delaying applying net/6lowpan/ patches until John, Dave > and I have resolved the merge conflicts for getting the current patches into > net-next. After that I will start actively applying these patches. >
Thanks for explanation and carry about the merge conflicts. Sorry about that there exists now a huge merge conflicts, but this should never happen if all 802.15.4/6lowpan stuff goes into bluetooth. - Alex ------------------------------------------------------------------------------ Infragistics Professional Build stunning WinForms apps today! Reboot your WinForms applications with our WinForms controls. Build a bridge from your legacy apps to the future. http://pubads.g.doubleclick.net/gampad/clk?id=153845071&iu=/4140/ostg.clktrk _______________________________________________ Linux-zigbee-devel mailing list Linux-zigbee-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linux-zigbee-devel
