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,
Joe Perches <joe@perches.com>,
Andrew Morton <akpm@linux-foundation.org>,
Mat Martineau <mathewm@codeaurora.org>
Subject: linux-next: manual merge of the bluetooth tree with Linus' tree
Date: Fri, 4 Nov 2011 13:55:23 +1100 [thread overview]
Message-ID: <20111104135523.e82306ceccecef3e4687f58f@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 2028 bytes --]
Hi Gustavo,
Today's linux-next merge of the bluetooth tree got a conflict in
include/net/bluetooth/bluetooth.h between commit b9075fa968a0 ("treewide:
use __printf not __attribute__((format(printf,...)))") from Linus' tree
and commit 5254c96d4e25 ("Bluetooth: Add BT_CHANNEL_POLICY socket
option") from the bluetooth tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc include/net/bluetooth/bluetooth.h
index e86af08,38cd3da..0000000
--- a/include/net/bluetooth/bluetooth.h
+++ b/include/net/bluetooth/bluetooth.h
@@@ -77,7 -77,34 +77,34 @@@ struct bt_power
#define BT_POWER_FORCE_ACTIVE_OFF 0
#define BT_POWER_FORCE_ACTIVE_ON 1
+ #define BT_CHANNEL_POLICY 10
+
+ /* BR/EDR only (default policy)
+ * AMP controllers cannot be used.
+ * Channel move requests from the remote device are denied.
+ * If the L2CAP channel is currently using AMP, move the channel to BR/EDR.
+ */
+ #define BT_CHANNEL_POLICY_BREDR_ONLY 0
+
+ /* BR/EDR Preferred
+ * Allow use of AMP controllers.
+ * If the L2CAP channel is currently on AMP, move it to BR/EDR.
+ * Channel move requests from the remote device are allowed.
+ */
+ #define BT_CHANNEL_POLICY_BREDR_PREFERRED 1
+
+ /* AMP Preferred
+ * Allow use of AMP controllers
+ * If the L2CAP channel is currently on BR/EDR and AMP controller
+ * resources are available, initiate a channel move to AMP.
+ * Channel move requests from the remote device are allowed.
+ * If the L2CAP socket has not been connected yet, try to create
+ * and configure the channel directly on an AMP controller rather
+ * than BR/EDR.
+ */
+ #define BT_CHANNEL_POLICY_AMP_PREFERRED 2
+
-__attribute__((format (printf, 2, 3)))
+__printf(2, 3)
int bt_printk(const char *level, const char *fmt, ...);
#define BT_INFO(fmt, arg...) bt_printk(KERN_INFO, pr_fmt(fmt), ##arg)
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2011-11-04 2:55 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-04 2:55 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2014-05-09 1:41 linux-next: manual merge of the bluetooth tree with Linus' tree Stephen Rothwell
2013-03-01 1:54 Stephen Rothwell
2011-11-08 1:58 linux-next: manual merge of the bluetooth tree with Linus tree Stephen Rothwell
2011-10-25 6:25 linux-next: manual merge of the bluetooth tree with Linus' tree Stephen Rothwell
2011-04-28 1:34 Stephen Rothwell
2011-04-28 3:36 ` Gustavo F. Padovan
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=20111104135523.e82306ceccecef3e4687f58f@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=akpm@linux-foundation.org \
--cc=joe@perches.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mathewm@codeaurora.org \
--cc=padovan@profusion.mobi \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).