2012-01-03 03:33:20

by Gustavo Padovan

[permalink] [raw]
Subject: pull request: bluetooth-next 2012-01-03

Hi John,

A couple of fixes for the 3.3 release. The majority of the fixes are related
to the change from tasklets to workqueue in the Bluetooth Core. The rest are
important fixes over the tree. Exception is "Bluetooth: Rename extfeatures?,
as the name says it is just a rename and no harm, but it is a preparation for
a following fix.

Please pull, or let me know any concerns you have!

Gustavo

--
The following changes since commit dc0d633e35643662f27a0b1c531da3cd6b204b9c:

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-next (2012-01-02 16:43:54 -0500)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-next master

Andre Guedes (5):
Bluetooth: Rename extfeatures
Bluetooth: Fix hci_cc_read_local_ext_features()
Bluetooth: Fix adv_work delay
Bluetooth: Queue adv_work on system workqueue
Bluetooth: Fix mgmt_stop_discovery_failed()

Andrei Emeltchenko (1):
Bluetooth: Correct packet len calculation

Gustavo F. Padovan (8):
Bluetooth: Fix bacpy in l2cap_core.c
Bluetooth: Fix context in rfcomm_sock_lock
Bluetooth: Fix context in RFCOMM tty
Bluetooth: Remove *_bh locks from SCO
Bluetooth: Remove local_bh_disable() from hci_sock.c
Bluetooth: Remove *_bh from socket list lock.
Bluetooth: Don't use *_bh locks anymore
Bluetooth: Keep chan->state and sk->sk_state in sync

include/net/bluetooth/hci_core.h | 4 ++--
net/bluetooth/af_bluetooth.c | 8 ++++----
net/bluetooth/hci_event.c | 22 +++++++++++++---------
net/bluetooth/hci_sock.c | 2 --
net/bluetooth/l2cap_core.c | 26 +++++++++++++-------------
net/bluetooth/l2cap_sock.c | 2 ++
net/bluetooth/mgmt.c | 4 ++--
net/bluetooth/rfcomm/sock.c | 12 ++++++------
net/bluetooth/rfcomm/tty.c | 22 +++++++++++-----------
net/bluetooth/sco.c | 8 ++++----
10 files changed, 57 insertions(+), 53 deletions(-)


2012-01-23 15:10:14

by John W. Linville

[permalink] [raw]
Subject: Re: pull request: bluetooth-next 2012-01-03

I have a day off today. I'll get back to merging tomorrow, including
this request from Gustavo.

Thanks,

John

On Mon, Jan 23, 2012 at 02:56:55PM +0200, Johan Hedberg wrote:
> Hi John,
>
> On Tue, Jan 03, 2012, Gustavo Padovan wrote:
> > A couple of fixes for the 3.3 release. The majority of the fixes are related
> > to the change from tasklets to workqueue in the Bluetooth Core. The rest are
> > important fixes over the tree. Exception is "Bluetooth: Rename extfeatures?,
> > as the name says it is just a rename and no harm, but it is a preparation for
> > a following fix.
> >
> > Please pull, or let me know any concerns you have!
> >
> > Gustavo
> >
> > --
> > The following changes since commit dc0d633e35643662f27a0b1c531da3cd6b204b9c:
> >
> > Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-next (2012-01-02 16:43:54 -0500)
> >
> > are available in the git repository at:
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-next master
> >
> > Andre Guedes (5):
> > Bluetooth: Rename extfeatures
> > Bluetooth: Fix hci_cc_read_local_ext_features()
> > Bluetooth: Fix adv_work delay
> > Bluetooth: Queue adv_work on system workqueue
> > Bluetooth: Fix mgmt_stop_discovery_failed()
> >
> > Andrei Emeltchenko (1):
> > Bluetooth: Correct packet len calculation
> >
> > Gustavo F. Padovan (8):
> > Bluetooth: Fix bacpy in l2cap_core.c
> > Bluetooth: Fix context in rfcomm_sock_lock
> > Bluetooth: Fix context in RFCOMM tty
> > Bluetooth: Remove *_bh locks from SCO
> > Bluetooth: Remove local_bh_disable() from hci_sock.c
> > Bluetooth: Remove *_bh from socket list lock.
> > Bluetooth: Don't use *_bh locks anymore
> > Bluetooth: Keep chan->state and sk->sk_state in sync
> >
> > include/net/bluetooth/hci_core.h | 4 ++--
> > net/bluetooth/af_bluetooth.c | 8 ++++----
> > net/bluetooth/hci_event.c | 22 +++++++++++++---------
> > net/bluetooth/hci_sock.c | 2 --
> > net/bluetooth/l2cap_core.c | 26 +++++++++++++-------------
> > net/bluetooth/l2cap_sock.c | 2 ++
> > net/bluetooth/mgmt.c | 4 ++--
> > net/bluetooth/rfcomm/sock.c | 12 ++++++------
> > net/bluetooth/rfcomm/tty.c | 22 +++++++++++-----------
> > net/bluetooth/sco.c | 8 ++++----
> > 10 files changed, 57 insertions(+), 53 deletions(-)
> > --
>
> Are you planing to pull this? I've been waiting for that before making
> any new pull requests from my (temporary) bluetooth-next tree[1]. If
> that's not gonna happen I'll go ahead rebase my tree against latest
> wireless-next (including these patches and all other ones that Marcel
> has acked since Gustavo started his break), and make a new pull request
> to you in the near future.
>
> Johan
>
> [1] http://git.kernel.org/?p=linux/kernel/git/jh/bluetooth-next.git;a=summary
>

--
John W. Linville Someday the world will need a hero, and you
[email protected] might be all we have. Be ready.

2012-01-23 12:56:55

by Johan Hedberg

[permalink] [raw]
Subject: Re: pull request: bluetooth-next 2012-01-03

Hi John,

On Tue, Jan 03, 2012, Gustavo Padovan wrote:
> A couple of fixes for the 3.3 release. The majority of the fixes are related
> to the change from tasklets to workqueue in the Bluetooth Core. The rest are
> important fixes over the tree. Exception is "Bluetooth: Rename extfeatures?,
> as the name says it is just a rename and no harm, but it is a preparation for
> a following fix.
>
> Please pull, or let me know any concerns you have!
>
> Gustavo
>
> --
> The following changes since commit dc0d633e35643662f27a0b1c531da3cd6b204b9c:
>
> Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-next (2012-01-02 16:43:54 -0500)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-next master
>
> Andre Guedes (5):
> Bluetooth: Rename extfeatures
> Bluetooth: Fix hci_cc_read_local_ext_features()
> Bluetooth: Fix adv_work delay
> Bluetooth: Queue adv_work on system workqueue
> Bluetooth: Fix mgmt_stop_discovery_failed()
>
> Andrei Emeltchenko (1):
> Bluetooth: Correct packet len calculation
>
> Gustavo F. Padovan (8):
> Bluetooth: Fix bacpy in l2cap_core.c
> Bluetooth: Fix context in rfcomm_sock_lock
> Bluetooth: Fix context in RFCOMM tty
> Bluetooth: Remove *_bh locks from SCO
> Bluetooth: Remove local_bh_disable() from hci_sock.c
> Bluetooth: Remove *_bh from socket list lock.
> Bluetooth: Don't use *_bh locks anymore
> Bluetooth: Keep chan->state and sk->sk_state in sync
>
> include/net/bluetooth/hci_core.h | 4 ++--
> net/bluetooth/af_bluetooth.c | 8 ++++----
> net/bluetooth/hci_event.c | 22 +++++++++++++---------
> net/bluetooth/hci_sock.c | 2 --
> net/bluetooth/l2cap_core.c | 26 +++++++++++++-------------
> net/bluetooth/l2cap_sock.c | 2 ++
> net/bluetooth/mgmt.c | 4 ++--
> net/bluetooth/rfcomm/sock.c | 12 ++++++------
> net/bluetooth/rfcomm/tty.c | 22 +++++++++++-----------
> net/bluetooth/sco.c | 8 ++++----
> 10 files changed, 57 insertions(+), 53 deletions(-)
> --

Are you planing to pull this? I've been waiting for that before making
any new pull requests from my (temporary) bluetooth-next tree[1]. If
that's not gonna happen I'll go ahead rebase my tree against latest
wireless-next (including these patches and all other ones that Marcel
has acked since Gustavo started his break), and make a new pull request
to you in the near future.

Johan

[1] http://git.kernel.org/?p=linux/kernel/git/jh/bluetooth-next.git;a=summary