pull request: bluetooth 2014-04-24

pull request: bluetooth 2014-04-24

[Gustavo Padovan]

[-- Attachment #1: Type: text/plain, Size: 1421 bytes --]

Hi John,

Some fixes for 3.15. There is a revert for the intel driver, a new device id,
and two important SSP fixes from Johan.
Also we've noticed that your wireless.git tree is not up to date, so this pull
was rebased on top of net.git. If you pull from this you'll will be pulling
net/master from yesterday as well.

Please pull or let me know of any concerns you have. Thanks!

	Gustavo

---
The following changes since commit 6a51b5e4d59e00051e65e836520912cd7c717be1:

  hisax/icc: add missing semicolon after label (2014-04-22 21:22:47 -0400)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth.git for-upstream

for you to fetch changes up to b66a81831359495b3768ace72452209cdf5d6614:

  Bluetooth: Add support for Lite-on [04ca:3007] (2014-04-24 12:43:33 +0300)

----------------------------------------------------------------
Johan Hedberg (2):
      Bluetooth: Fix triggering BR/EDR L2CAP Connect too early
      Bluetooth: Fix redundant encryption request for reauthentication

Marcel Holtmann (1):
      Revert "Bluetooth: Enable autosuspend for Intel Bluetooth device"

Mohammed Habibulla (1):
      Bluetooth: Add support for Lite-on [04ca:3007]

 drivers/bluetooth/ath3k.c | 2 ++
 drivers/bluetooth/btusb.c | 5 ++---
 net/bluetooth/hci_conn.c  | 9 ++++++---
 net/bluetooth/hci_event.c | 6 ++++++
 4 files changed, 16 insertions(+), 6 deletions(-)


[-- Attachment #2: Type: application/pgp-signature, Size: 819 bytes --]

Re: pull request: bluetooth 2014-04-24

[John W. Linville]

This tag has a lot of stuff in it not in the wireless tree.
Please only send me pull requests that only include patches related
to Bluetooth.

John

On Thu, Apr 24, 2014 at 11:53:29AM -0300, Gustavo Padovan wrote:
> Hi John,
> 
> Some fixes for 3.15. There is a revert for the intel driver, a new device id,
> and two important SSP fixes from Johan.
> Also we've noticed that your wireless.git tree is not up to date, so this pull
> was rebased on top of net.git. If you pull from this you'll will be pulling
> net/master from yesterday as well.
> 
> Please pull or let me know of any concerns you have. Thanks!
> 
> 	Gustavo
> 
> ---
> The following changes since commit 6a51b5e4d59e00051e65e836520912cd7c717be1:
> 
>   hisax/icc: add missing semicolon after label (2014-04-22 21:22:47 -0400)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth.git for-upstream
> 
> for you to fetch changes up to b66a81831359495b3768ace72452209cdf5d6614:
> 
>   Bluetooth: Add support for Lite-on [04ca:3007] (2014-04-24 12:43:33 +0300)
> 
> ----------------------------------------------------------------
> Johan Hedberg (2):
>       Bluetooth: Fix triggering BR/EDR L2CAP Connect too early
>       Bluetooth: Fix redundant encryption request for reauthentication
> 
> Marcel Holtmann (1):
>       Revert "Bluetooth: Enable autosuspend for Intel Bluetooth device"
> 
> Mohammed Habibulla (1):
>       Bluetooth: Add support for Lite-on [04ca:3007]
> 
>  drivers/bluetooth/ath3k.c | 2 ++
>  drivers/bluetooth/btusb.c | 5 ++---
>  net/bluetooth/hci_conn.c  | 9 ++++++---
>  net/bluetooth/hci_event.c | 6 ++++++
>  4 files changed, 16 insertions(+), 6 deletions(-)
> 



-- 
John W. Linville		Someday the world will need a hero, and you
linville@tuxdriver.com			might be all we have.  Be ready.

Re: pull request: bluetooth 2014-04-24

[Marcel Holtmann]

Hi John,

> This tag has a lot of stuff in it not in the wireless tree.
> Please only send me pull requests that only include patches related
> to Bluetooth.
> 
>> Some fixes for 3.15. There is a revert for the intel driver, a new device id,
>> and two important SSP fixes from Johan.
>> Also we've noticed that your wireless.git tree is not up to date, so this pull
>> was rebased on top of net.git. If you pull from this you'll will be pulling
>> net/master from yesterday as well.

as Gustavo explained, this is against net.git since wireless.git has not yet been rebased.

Regards

Marcel

Re: pull request: bluetooth 2014-04-24

[John W. Linville]

On Thu, Apr 24, 2014 at 06:51:13PM -0700, Marcel Holtmann wrote:
> Hi John,
> 
> > This tag has a lot of stuff in it not in the wireless tree.
> > Please only send me pull requests that only include patches related
> > to Bluetooth.
> > 
> >> Some fixes for 3.15. There is a revert for the intel driver, a new device id,
> >> and two important SSP fixes from Johan.
> >> Also we've noticed that your wireless.git tree is not up to date, so this pull
> >> was rebased on top of net.git. If you pull from this you'll will be pulling
> >> net/master from yesterday as well.
> 
> as Gustavo explained, this is against net.git since wireless.git has not yet been rebased.
> 
> Regards
> 
> Marcel

wireless.git is where it is going to be.  It is based from a few dozen
commits before -rc1, which was what Dave had as the base of his tree
when I started merging post -rc1 fixes into wireless.git.

I'm sorry if this is inconvenient, but among other things this keeps
net.git and linux.git stuff from getting into wireless-testing.git
prematurely.

John
-- 
John W. Linville		Someday the world will need a hero, and you
linville@tuxdriver.com			might be all we have.  Be ready.