From: Mat Martineau <mathewm@codeaurora.org>
To: Gustavo Padovan <gustavo@padovan.org>
Cc: linux-bluetooth@vger.kernel.org
Subject: Re: bluetooth-next rebased on top of wireless-next
Date: Wed, 9 May 2012 10:52:47 -0700 (PDT) [thread overview]
Message-ID: <alpine.DEB.2.02.1205091037080.2090@mathewm-linux> (raw)
In-Reply-To: <20120509040426.GB2362@joana>
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
next prev parent reply other threads:[~2012-05-09 17:52 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-09 4:04 bluetooth-next rebased on top of wireless-next Gustavo Padovan
2012-05-09 17:52 ` Mat Martineau [this message]
2012-05-09 18:19 ` Gustavo Padovan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=alpine.DEB.2.02.1205091037080.2090@mathewm-linux \
--to=mathewm@codeaurora.org \
--cc=gustavo@padovan.org \
--cc=linux-bluetooth@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox