From: Marcel Holtmann <marcel@holtmann.org>
To: David Miller <davem@davemloft.net>
Cc: netdev@vger.kernel.org
Subject: Pull request: bluetooth-next-2.6 2010-02-27
Date: Sat, 27 Feb 2010 23:38:29 +0100 [thread overview]
Message-ID: <cover.1267276098.git.marcel@holtmann.org> (raw)
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain, Size: 2496 bytes --]
I was hoping to get the Enhanced L2CAP updates ready for this merge window,
but in the end they were not stable enough. So I removed all the L2CAP
changes out of this merge request.
The leftovers are small updates and bug fixes. The only bigger change is
a patch that adds per controller debugfs. That way drivers don't have to
deal with it on their own. This avoids clashes with multiple controllers
attached to the same system. The Marvell driver is one of the examples
where this is needed. Their debugfs support and multiple controllers was
not done properly.
Regards
Marcel
Please pull from
git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-next-2.6.git master
This will update the following files:
drivers/bluetooth/ath3k.c | 2 +
drivers/bluetooth/bcm203x.c | 2 +-
drivers/bluetooth/bfusb.c | 2 +-
drivers/bluetooth/bluecard_cs.c | 2 +-
drivers/bluetooth/bpa10x.c | 2 +-
drivers/bluetooth/bt3c_cs.c | 2 +-
drivers/bluetooth/btmrvl_debugfs.c | 14 ++--
drivers/bluetooth/btmrvl_main.c | 2 +-
drivers/bluetooth/btmrvl_sdio.c | 4 +-
drivers/bluetooth/btsdio.c | 2 +-
drivers/bluetooth/btuart_cs.c | 2 +-
drivers/bluetooth/btusb.c | 2 +-
drivers/bluetooth/dtl1_cs.c | 2 +-
drivers/bluetooth/hci_ldisc.c | 2 +-
drivers/bluetooth/hci_vhci.c | 2 +-
include/net/bluetooth/hci.h | 6 ++-
include/net/bluetooth/hci_core.h | 5 +-
net/bluetooth/hci_core.c | 12 +++-
net/bluetooth/hci_event.c | 1 +
net/bluetooth/hci_sock.c | 2 +-
net/bluetooth/hci_sysfs.c | 122 +++++++++++++++++++++++++----------
21 files changed, 129 insertions(+), 63 deletions(-)
through these ChangeSets:
Dan Carpenter (1):
Bluetooth: Add missing kfree() on error path in Atheros driver
Johann Felix Soden (1):
Bluetooth: Fix out of scope variable access in hci_sock_cmsg()
Marcel Holtmann (4):
Bluetooth: Convert controller hdev->type to hdev->bus
Bluetooth: Convert inquiry cache to use debugfs instead of sysfs
Bluetooth: Convert Marvell driver to use per adapter debugfs
Bluetooth: Add controller types for BR/EDR and 802.11 AMP
Márton Németh (1):
Bluetooth: Make USB device id constant
Peter Huewe (1):
Bluetooth: Add __init/__exit macros to Marvell SDIO driver
Stephen Coe (1):
Bluetooth: Add SCO fallback for unsupported feature error
next reply other threads:[~2010-02-27 22:40 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-27 22:38 Marcel Holtmann [this message]
2010-02-27 22:38 ` [PATCH 1/9] Bluetooth: Add __init/__exit macros to Marvell SDIO driver Marcel Holtmann
2010-02-27 22:38 ` [PATCH 2/9] Bluetooth: Make USB device id constant Marcel Holtmann
2010-02-27 22:38 ` [PATCH 3/9] Bluetooth: Add missing kfree() on error path in Atheros driver Marcel Holtmann
2010-02-27 22:38 ` [PATCH 4/9] Bluetooth: Convert controller hdev->type to hdev->bus Marcel Holtmann
2010-02-27 22:38 ` [PATCH 5/9] Bluetooth: Convert inquiry cache to use debugfs instead of sysfs Marcel Holtmann
2010-02-27 22:38 ` [PATCH 6/9] Bluetooth: Convert Marvell driver to use per adapter debugfs Marcel Holtmann
2010-02-27 22:38 ` [PATCH 7/9] Bluetooth: Add controller types for BR/EDR and 802.11 AMP Marcel Holtmann
2010-02-27 22:38 ` [PATCH 8/9] Bluetooth: Add SCO fallback for unsupported feature error Marcel Holtmann
2010-02-27 22:38 ` [PATCH 9/9] Bluetooth: Fix out of scope variable access in hci_sock_cmsg() Marcel Holtmann
2010-02-28 8:19 ` Pull request: bluetooth-next-2.6 2010-02-27 David Miller
2010-02-28 8:33 ` Marcel Holtmann
2010-02-28 8:41 ` David Miller
2010-02-28 8:52 ` Marcel Holtmann
2010-02-28 8:58 ` David Miller
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=cover.1267276098.git.marcel@holtmann.org \
--to=marcel@holtmann.org \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
/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).