From: Stephen Rothwell <sfr@canb•auug.org.au>
To: "Gustavo F. Padovan" <padovan@profusion•mobi>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Lucas De Marchi <lucas.demarchi@profusion•mobi>
Subject: linux-next: manual merge of the bluetooth tree with Linus' tree
Date: Thu, 28 Apr 2011 11:34:04 +1000 [thread overview]
Message-ID: <20110428113404.081a74a5.sfr@canb.auug.org.au> (raw)
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;
next reply other threads:[~2011-04-28 1:34 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-28 1:34 Stephen Rothwell [this message]
2011-04-28 3:36 ` linux-next: manual merge of the bluetooth tree with Linus' tree Gustavo F. Padovan
-- strict thread matches above, loose matches on Subject: below --
2011-10-25 6:25 Stephen Rothwell
2011-11-04 2:55 Stephen Rothwell
2011-11-08 1:58 linux-next: manual merge of the bluetooth tree with Linus tree Stephen Rothwell
2013-03-01 1:54 linux-next: manual merge of the bluetooth tree with Linus' tree Stephen Rothwell
2014-05-09 1:41 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110428113404.081a74a5.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=lucas.demarchi@profusion$(echo .)mobi \
--cc=padovan@profusion$(echo .)mobi \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox