From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756818Ab1D1DgP (ORCPT ); Wed, 27 Apr 2011 23:36:15 -0400 Received: from mail-yw0-f46.google.com ([209.85.213.46]:42281 "EHLO mail-yw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751836Ab1D1DgN (ORCPT ); Wed, 27 Apr 2011 23:36:13 -0400 Date: Thu, 28 Apr 2011 00:36:27 -0300 From: "Gustavo F. Padovan" To: Stephen Rothwell Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Lucas De Marchi Subject: Re: linux-next: manual merge of the bluetooth tree with Linus' tree Message-ID: <20110428033626.GA2214@joana> Mail-Followup-To: Stephen Rothwell , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Lucas De Marchi References: <20110428113404.081a74a5.sfr@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20110428113404.081a74a5.sfr@canb.auug.org.au> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Stephen, * Stephen Rothwell [2011-04-28 11:34:04 +1000]: > Hi Gustavo, > > Today's linux-next merge of the bluetooth tree got a conflict in > net/bluetooth/l2cap_sock.c between commit 25985edcedea ("Fix common > misspellings") from Linus' tree and commit dbe1c0aea650 ("Bluetooth: Move > conn to struct l2cap_chan") from the bluetooth tree. > > Just context changes. I fxied it up (see below) and can carry the fix as > necessary. > -- > Cheers, > Stephen Rothwell sfr@canb.auug.org.au > > diff --cc net/bluetooth/l2cap_sock.c > index 47394a1,09cc7a0..0000000 > --- a/net/bluetooth/l2cap_sock.c > +++ b/net/bluetooth/l2cap_sock.c > @@@ -678,8 -692,8 +692,8 @@@ static int l2cap_sock_setsockopt(struc > } > > if (opt == BT_FLUSHABLE_OFF) { > - struct l2cap_conn *conn = l2cap_pi(sk)->conn; > + struct l2cap_conn *conn = chan->conn; > - /* proceed futher only when we have l2cap_conn and > + /* proceed further only when we have l2cap_conn and > No Flush support in the LM */ > if (!conn || !lmp_no_flush_capable(conn->hcon->hdev)) { > err = -EINVAL; Thanks for the fix. -- Gustavo F. Padovan http://profusion.mobi