linux-kernel - linux-next: build failure after merge of the acpi tree

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-next>] [day] [month] [year] [list]

Message-Id: <20101202112239.c7d05518.sfr@canb.auug.org.au>
Date:	Thu, 2 Dec 2010 11:22:39 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Len Brown <lenb@...nel.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: linux-next: build failure after merge of the acpi tree

Hi Len,

After merging the acpi tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

In file included from drivers/video/output.c:25:
include/linux/video_output.h: In function 'video_output_register':
include/linux/video_output.h:49: error: implicit declaration of function 'ERR_PTR'
include/linux/video_output.h:49: warning: return makes pointer from integer without a cast
In file included from drivers/video/output.c:27:
include/linux/err.h: At top level:
include/linux/err.h:22: error: conflicting types for 'ERR_PTR'
include/linux/video_output.h:49: note: previous implicit declaration of 'ERR_PTR' was here
drivers/video/output.c:84: error: redefinition of 'video_output_register'
include/linux/video_output.h:44: note: previous definition of 'video_output_register' was here
drivers/video/output.c:114: error: redefinition of 'video_output_unregister'
include/linux/video_output.h:51: note: previous definition of 'video_output_unregister' was here

Caused by commit 16d21716c8849c3283d1b9e590e6fe8d1966f4b7 ("ACPI: video:
fix build for VIDEO_OUTPUT_CONTROL=n").  See Rule 1 in
Documentation/SubmitChecklist.

I have used the version of the acpi tree from next-20101201 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped