* bluetooth-next rebased on top of wireless-next
@ 2012-05-09 4:04 Gustavo Padovan
2012-05-09 17:52 ` Mat Martineau
0 siblings, 1 reply; 3+ messages in thread
From: Gustavo Padovan @ 2012-05-09 4:04 UTC (permalink / raw)
To: linux-bluetooth
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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: bluetooth-next rebased on top of wireless-next
2012-05-09 4:04 bluetooth-next rebased on top of wireless-next Gustavo Padovan
@ 2012-05-09 17:52 ` Mat Martineau
2012-05-09 18:19 ` Gustavo Padovan
0 siblings, 1 reply; 3+ messages in thread
From: Mat Martineau @ 2012-05-09 17:52 UTC (permalink / raw)
To: Gustavo Padovan; +Cc: linux-bluetooth
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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: bluetooth-next rebased on top of wireless-next
2012-05-09 17:52 ` Mat Martineau
@ 2012-05-09 18:19 ` Gustavo Padovan
0 siblings, 0 replies; 3+ messages in thread
From: Gustavo Padovan @ 2012-05-09 18:19 UTC (permalink / raw)
To: Mat Martineau; +Cc: linux-bluetooth
Hi Mat,
* Mat Martineau <mathewm@codeaurora.org> [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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-05-09 18:19 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-05-09 4:04 bluetooth-next rebased on top of wireless-next Gustavo Padovan
2012-05-09 17:52 ` Mat Martineau
2012-05-09 18:19 ` Gustavo Padovan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).