lkml.org 
[lkml]   [2013]   [Sep]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: pull request: bluetooth 2013-09-23
On Fri, Sep 27, 2013 at 12:24:13PM -0300, Gustavo Padovan wrote:
> Hi John,
>
> 2013-09-26 John W. Linville <linville@tuxdriver.com>:
>
> > On Mon, Sep 23, 2013 at 06:00:49PM -0300, Gustavo Padovan wrote:

> > > The following changes since commit f4e1a4d3ecbb9e42bdf8e7869ee8a4ebfa27fb20:
> > >
> > > rt2800: change initialization sequence to fix system freeze (2013-09-09 14:44:34 -0400)
> > >
> > > are available in the git repository at:
> > >
> > > git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth master
> > >
> > > for you to fetch changes up to 5bcecf325378218a8e248bb6bcae96ec7362f8ef:
> > >
> > > Bluetooth: btusb: Add support for Belkin F8065bf (2013-09-23 17:44:25 -0300)
> >
> > Pulling now...
>
> Thanks for pulling. However as Stephen pointed out in the linux-next merge
> conflict email from today we have a style issue, a closing brace bad indented.
> This is from conflict resolution I made last week. I fixed it when merging
> bluetooth.git into bluetooth-next.git.
>
> So when pushing this to Dave could you please tell him about this issue and
> that the fix is already provided by bluetooth-next. Do you agree with this
> solution?

I fixed it in my merge for Dave -- I think that will be fine.

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


\
 
 \ /
  Last update: 2013-09-27 20:21    [W:0.035 / U:1.148 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site