Re: Small Bluetooth fix for 2.6.27-rc6

Re: Small Bluetooth fix for 2.6.27-rc6

[David Miller]

From: Marcel Holtmann <marcel@holtmann.org>
Date: Fri, 12 Sep 2008 05:56:44 +0200

> Please pull from
> 
>     git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6.git master

You did your work against Linus's tree, so I can't pull this,
it will bring in tons of irrelevant stuff into net-2.6.

Please send me pull requests using net-2.6 as your base.

Re: Small Bluetooth fix for 2.6.27-rc6

[Marcel Holtmann]

Hi Dave,

> > Please pull from
> > 
> >     git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6.git master
> 
> You did your work against Linus's tree, so I can't pull this,
> it will bring in tons of irrelevant stuff into net-2.6.
> 
> Please send me pull requests using net-2.6 as your base.

I re-based the tree on net-2.6 now. Please pull.

Regards

Marcel

Re: Small Bluetooth fix for 2.6.27-rc6

[David Miller]

From: Marcel Holtmann <marcel@holtmann.org>
Date: Fri, 12 Sep 2008 04:11:32 +0200

> > > Please pull from
> > > 
> > >     git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6.git master
> > 
> > You did your work against Linus's tree, so I can't pull this,
> > it will bring in tons of irrelevant stuff into net-2.6.
> > 
> > Please send me pull requests using net-2.6 as your base.
> 
> I re-based the tree on net-2.6 now. Please pull.

Pulled, thanks.

Re: Small Bluetooth fix for 2.6.27-rc6

[Marcel Holtmann]

Hi Dave,

> > > > Please pull from
> > > > 
> > > >     git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6.git master
> > > 
> > > You did your work against Linus's tree, so I can't pull this,
> > > it will bring in tons of irrelevant stuff into net-2.6.
> > > 
> > > Please send me pull requests using net-2.6 as your base.
> > 
> > I re-based the tree on net-2.6 now. Please pull.
> 
> Pulled, thanks.

I assume you want me to queue the compiler warning fix for the next
merge window, right?

Regards

Marcel

Re: Small Bluetooth fix for 2.6.27-rc6

[David Miller]

From: Marcel Holtmann <marcel@holtmann.org>
Date: Fri, 12 Sep 2008 04:15:02 +0200

> > > > > Please pull from
> > > > > 
> > > > >     git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6.git master
> > > > 
> > > > You did your work against Linus's tree, so I can't pull this,
> > > > it will bring in tons of irrelevant stuff into net-2.6.
> > > > 
> > > > Please send me pull requests using net-2.6 as your base.
> > > 
> > > I re-based the tree on net-2.6 now. Please pull.
> > 
> > Pulled, thanks.
> 
> I assume you want me to queue the compiler warning fix for the next
> merge window, right?

Which one?

Re: Small Bluetooth fix for 2.6.27-rc6

[Marcel Holtmann]

Hi Dave,

> > > > > > Please pull from
> > > > > > 
> > > > > >     git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6.git master
> > > > > 
> > > > > You did your work against Linus's tree, so I can't pull this,
> > > > > it will bring in tons of irrelevant stuff into net-2.6.
> > > > > 
> > > > > Please send me pull requests using net-2.6 as your base.
> > > > 
> > > > I re-based the tree on net-2.6 now. Please pull.
> > > 
> > > Pulled, thanks.
> > 
> > I assume you want me to queue the compiler warning fix for the next
> > merge window, right?
> 
> Which one?

the one for this warning:

  CC [M]  net/bluetooth/af_bluetooth.o
net/bluetooth/af_bluetooth.c:60: warning: ‘bt_key_strings’ defined but not used
net/bluetooth/af_bluetooth.c:71: warning: ‘bt_slock_key_strings’ defined but not used

It is not a new one, it just got ignored by everybody and now I got
annoyed enough to fix it. I just don't know what's that take on compiler
warning fixes after the merge window. Do we want them or not. I can
queue this up for 2.6.28.

Regards

Marcel

Re: Small Bluetooth fix for 2.6.27-rc6

[David Miller]

From: Marcel Holtmann <marcel@holtmann.org>
Date: Fri, 12 Sep 2008 04:59:10 +0200

> the one for this warning:
> 
>   CC [M]  net/bluetooth/af_bluetooth.o
> net/bluetooth/af_bluetooth.c:60: warning: ‘bt_key_strings’ defined but not used
> net/bluetooth/af_bluetooth.c:71: warning: ‘bt_slock_key_strings’ defined but not used
> 
> It is not a new one, it just got ignored by everybody and now I got
> annoyed enough to fix it. I just don't know what's that take on compiler
> warning fixes after the merge window. Do we want them or not. I can
> queue this up for 2.6.28.

This is 2.6.28 material.

Small Bluetooth fix for 2.6.27-rc6

[Marcel Holtmann]

Hi Dave,

we discovered one tiny regression that was introduced with the default
link policy change in 2.6.27-rc1. This small patch fixes it and I hope
the commit message is detailed and clear enough to understand what went
wrong.

I also got pretty much annoyed by the following compiler warning:

  CC [M]  net/bluetooth/af_bluetooth.o
net/bluetooth/af_bluetooth.c:60: warning: ‘bt_key_strings’ defined but not used
net/bluetooth/af_bluetooth.c:71: warning: ‘bt_slock_key_strings’ defined but not used

So I finally fixed it (even if I didn't cause it), but I don't know
what's your take on fixing compiler warnings in -rc phase. It can
certainly wait for the next merge window.

Regards

Marcel


Please pull from

    git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6.git master

This will update the following files:

 net/bluetooth/hci_core.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

through these ChangeSets:

Marcel Holtmann (1):
    [Bluetooth] Fix regression from using default link policy