2012-05-09 04:04:26

by Gustavo Padovan

[permalink] [raw]
Subject: bluetooth-next rebased on top of wireless-next

Hi Everyone,

Unfortunately we were forced to rebase the bluetooth-next tree on top of the
wireless-next tree of today (commit 341352d), we apologize for the problems
this may cause to you.

And there is more, I also had to edit some commits to fix coding style issues.
So don't worry if some piece of the code looks slightly different from what
you wrote, it was just style fix.

Our apologizes!

Gustavo


2012-05-09 18:19:29

by Gustavo Padovan

[permalink] [raw]
Subject: Re: bluetooth-next rebased on top of wireless-next

Hi Mat,

* Mat Martineau <[email protected]> [2012-05-09 10:52:47 -0700]:

>
> Gustavo -
>
> On Wed, 9 May 2012, Gustavo Padovan wrote:
>
> >Hi Everyone,
> >
> >Unfortunately we were forced to rebase the bluetooth-next tree on top of the
> >wireless-next tree of today (commit 341352d), we apologize for the problems
> >this may cause to you.
> >
> >And there is more, I also had to edit some commits to fix coding style issues.
> >So don't worry if some piece of the code looks slightly different from what
> >you wrote, it was just style fix.
> >
> >Our apologizes!
>
> Any plans for merging bluetooth in to bluetooth-next? I assume
> you're waiting for John to pull the bluetooth branch.

Exactly, this should happen soon.

Gustavo

2012-05-09 17:52:47

by Mat Martineau

[permalink] [raw]
Subject: Re: bluetooth-next rebased on top of wireless-next


Gustavo -

On Wed, 9 May 2012, Gustavo Padovan wrote:

> Hi Everyone,
>
> Unfortunately we were forced to rebase the bluetooth-next tree on top of the
> wireless-next tree of today (commit 341352d), we apologize for the problems
> this may cause to you.
>
> And there is more, I also had to edit some commits to fix coding style issues.
> So don't worry if some piece of the code looks slightly different from what
> you wrote, it was just style fix.
>
> Our apologizes!

Any plans for merging bluetooth in to bluetooth-next? I assume you're
waiting for John to pull the bluetooth branch.

I have an upcoming patch set for bluetooth-next that depends on
patches in the bluetooth branch.

--
Mat Martineau
Employee of Qualcomm Innovation Center, Inc.
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum