From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Anton Vorontsov <cbouatmailru@gmail.com>
Cc: Len Brown <lenb@kernel.org>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Durgadoss R <durgadoss.r@intel.com>,
Jenny TC <jenny.tc@intel.com>
Subject: Re: linux-next: build failure after merge of the final tree (acpi and battery trees related)
Date: Tue, 19 Jun 2012 15:37:05 +1000 [thread overview]
Message-ID: <20120619153705.bc20359d73d6139e2cb4c1f5@canb.auug.org.au> (raw)
In-Reply-To: <20120619051032.GB16286@lizard>
[-- Attachment #1: Type: text/plain, Size: 714 bytes --]
Hi Anton,
On Mon, 18 Jun 2012 22:10:32 -0700 Anton Vorontsov <cbouatmailru@gmail.com> wrote:
>
> Thanks for noticing, Stephen! Although, I wonder what would be the
> best way to fix this?.. I would happily cherry-pick the ACPI change
> into my tree and then re-apply the battery thermal zone support patch,
> but ACPI change doesn't apply cleanly on the battery tree. Heh.
>
> Is there thermal zone git tree? Or maybe I would just let ACPI
> folks take the battery patch in question?
Just wait until the next merge window and then who ever get's Linus to
merge their tree last can tell him to fix this in the merge commit.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
prev parent reply other threads:[~2012-06-19 5:37 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-19 4:54 linux-next: build failure after merge of the final tree (acpi and battery trees related) Stephen Rothwell
2012-06-19 5:10 ` Anton Vorontsov
2012-06-19 5:37 ` Stephen Rothwell [this message]
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=20120619153705.bc20359d73d6139e2cb4c1f5@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=cbouatmailru@gmail.com \
--cc=durgadoss.r@intel.com \
--cc=jenny.tc@intel.com \
--cc=lenb@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.