On Mon, Aug 04, 2014 at 11:41:47AM +0200, Alexander Aring wrote: > Martin, > > On Mon, Aug 04, 2014 at 11:36:30AM +0200, Alexander Aring wrote: > > On Mon, Aug 04, 2014 at 10:16:43AM +0100, Martin Townsend wrote: > > > 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 appling. - Alex -- To unsubscribe from this list: send the line "unsubscribe linux-wpan" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
