Re: linux-next: manual merge of the net tree with Linus' tree
From: David Miller
Date: Mon Jul 18 2011 - 15:35:49 EST
From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Mon, 18 Jul 2011 14:41:38 +1000
> Today's linux-next merge of the net tree got a conflict in
> net/bluetooth/l2cap_core.c between commit 9191e6ad897a ("Bluetooth: Fix
> regression in L2CAP connection procedure") from Linus' tree and commit
> e2fd318e3a92 ("Bluetooth: Fixes l2cap "command reject" reply according to
> spec") from the net tree.
> I fixed it up (see below) and can carry the fix as necessary.
Thanks Stephen, I'll sort this out next time I do a merge between
net-2.6 and net-next-2.6.
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/