From: "John W. Linville" <linville@tuxdriver.com>
To: linux-wireless@vger.kernel.org, linux-bluetooth@vger.kernel.org
Subject: Re: pull request: bluetooth-2.6 2011-04-20
Date: Wed, 20 Apr 2011 20:18:37 -0400 [thread overview]
Message-ID: <20110421001836.GB2437@tuxdriver.com> (raw)
In-Reply-To: <20110420202015.GA2311@joana>
On Wed, Apr 20, 2011 at 05:20:15PM -0300, Gustavo F. Padovan wrote:
> Hi John,
>
> * Gustavo F. Padovan <padovan@profusion.mobi> [2011-04-20 14:04:32 -0300]:
>
> > Hi John,
> >
> > Four small fixes for 2.6.39. An incorrect refcnt balance for hci connection by
> > Ville Tervo, a warning fix in the command timer by Vinicius Gomes, an ERTM
> > fix by Ruiyi Zhang, and SCO synchronization fix by Luiz Augusto von Dentz.
> >
> > Please pull or let me know any problems. Thanks.
>
> Hold on with the pull! I've found a merge conflict with -next. (I tested the
> merge with --dry-run, but it doesn't check for check conflicts). I'll do the
> right thing now and send a new pull request to you soon.
>
> Regards,
>
> --
> Gustavo F. Padovan
> http://profusion.mobi
FWIW, I already did the pull into wireless-2.6 and pushed it out
for some soak time. If there is a merge conflict with -next, then
please let me know how to fix it and I'll pull wireless-2.6 into
wireless-next-2.6 as soon as possible to eliminate the conflict.
John
--
John W. Linville Someday the world will need a hero, and you
linville@tuxdriver.com might be all we have. Be ready.
next prev parent reply other threads:[~2011-04-21 0:18 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-20 17:04 pull request: bluetooth-2.6 2011-04-20 Gustavo F. Padovan
2011-04-20 20:20 ` Gustavo F. Padovan
2011-04-21 0:18 ` John W. Linville [this message]
2011-04-21 1:00 ` Gustavo F. 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=20110421001836.GB2437@tuxdriver.com \
--to=linville@tuxdriver.com \
--cc=linux-bluetooth@vger.kernel.org \
--cc=linux-wireless@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;
as well as URLs for NNTP newsgroup(s).