I did a pull first and after the merge my patch is still at the top of the log.
martin@martin-HP-ProDesk-490-G1-MT:~/workspace/bluetooth-next$ git pull
Already up-to-date.
martin@martin-HP-ProDesk-490-G1-MT:~/workspace/bluetooth-next$ git log
commit e3964f42db0e58e0ad289b89af0235af0db1f141
Author: Martin Townsend <martin.townsend@xxxxxxxxxx>
Date: Fri Aug 1 15:59:57 2014 +0100
Simplify lowpan receive path so skb is freed in lowpan_rcv when dropped.
Signed-off-by: Martin Townsend <martin.townsend@xxxxxxxxxx>
commit 751c8445fff787ad1fdb2a9285e8cf8ef865446d
Merge: 2ab17e7 dc6be9f
Author: Martin Townsend <martin.townsend@xxxxxxxxxx>
Date: Fri Aug 1 15:15:06 2014 +0100
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
commit 2ab17e768aa38426ec39a66a411b4f533dafa8c1
Author: Martin Townsend <martin.townsend@xxxxxxxxxx>
Date: Fri Aug 1 10:08:05 2014 +0100
Remove dev parameter from skb_delivery_cb in 6lowpan.
This parameter is never used by any function implementing this callback.
Signed-off-by: Martin Townsend <martin.townsend@xxxxxxxxxx>
...
I'll check the patch hasn't been mangled by my email client somehow.
- Martin
On 04/08/14 10:36, 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/
>
> - Alex
--
To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
