linux-kernel - Re: linux-next: build failure after merge of the final tree (acpi and battery trees related)

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:	Tue, 19 Jun 2012 15:37:05 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Anton Vorontsov <cbouatmailru@...il.com>
Cc:	Len Brown <lenb@...nel.org>, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org, Durgadoss R <durgadoss.r@...el.com>,
	Jenny TC <jenny.tc@...el.com>
Subject: Re: linux-next: build failure after merge of the final tree (acpi
 and battery trees related)

Hi Anton,

On Mon, 18 Jun 2012 22:10:32 -0700 Anton Vorontsov <cbouatmailru@...il.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@...b.auug.org.au

Content of type "application/pgp-signature" skipped