Re: linux-next: manual merge of the bluetooth tree with the net/net-next trees

2014-01-27 Thread David Miller
From: Stephen Rothwell Date: Tue, 28 Jan 2014 09:54:15 +1100 > On Tue, 7 Jan 2014 12:54:18 +1100 Stephen Rothwell > wrote: ... >> From: Stephen Rothwell >> Date: Tue, 7 Jan 2014 12:52:43 +1100 >> Subject: [PATCH] net: 6lowpan: fixup for code movement >> >> Signed-off-by: Stephen Rothwell .

Re: linux-next: manual merge of the bluetooth tree with the net/net-next trees

2014-01-27 Thread Stephen Rothwell
Hi all, On Tue, 7 Jan 2014 12:54:18 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the bluetooth tree got a conflict in > net/ieee802154/6lowpan.c between commit 965801e1eb62 ("net: 6lowpan: fix > lowpan_header_create non-compression memcpy call") from the tree and > commit 8df8c

Re: linux-next: manual merge of the bluetooth tree with the net/net-next trees

2014-01-07 Thread Daniel Borkmann
On 01/07/2014 02:54 AM, Stephen Rothwell wrote: Hi Gustavo, Today's linux-next merge of the bluetooth tree got a conflict in net/ieee802154/6lowpan.c between commit 965801e1eb62 ("net: 6lowpan: fix lowpan_header_create non-compression memcpy call") from the tree and commit 8df8c56a5abc ("6lowpa

linux-next: manual merge of the bluetooth tree with the net/net-next trees

2014-01-06 Thread Stephen Rothwell
Hi Gustavo, Today's linux-next merge of the bluetooth tree got a conflict in net/ieee802154/6lowpan.c between commit 965801e1eb62 ("net: 6lowpan: fix lowpan_header_create non-compression memcpy call") from the tree and commit 8df8c56a5abc ("6lowpan: Moving generic compression code into 6lowpan_ip