* Re: [PATCH upstream build breakage] acpi: several drivers depend on NET
From: Randy Dunlap @ 2011-03-01 0:00 UTC (permalink / raw)
To: Rafael J. Wysocki
Cc: Ingo Molnar, Len Brown, Stephen Rothwell, Luming Yu, linux-next,
LKML, linux-acpi, Linus Torvalds, Andrew Morton
In-Reply-To: <201102282342.59407.rjw@sisk.pl>
On 02/28/11 14:42, Rafael J. Wysocki wrote:
> On Monday, February 28, 2011, Rafael J. Wysocki wrote:
>> On Monday, February 28, 2011, Randy Dunlap wrote:
>>> On Tue, 1 Feb 2011 13:03:23 +0100 Ingo Molnar wrote:
>>>
>>>> * Ingo Molnar <mingo@elte.hu> wrote:
>>>>
>>>>> * Randy Dunlap <randy.dunlap@oracle.com> wrote:
>>>>>
>>>>>> On Mon, 20 Dec 2010 20:00:13 +1100 Stephen Rothwell wrote:
>>>>>>
>>>>>>> Hi all,
>>>>>>>
>>>>>>> [The mirroring on kernel.org is running slowly]
>>>>>>>
>>>>>>> Changes since 20101217:
>>>>>>
>>>>>> ERROR: "thermal_cooling_device_register" [drivers/acpi/video.ko] undefined!
>>>>>> ERROR: "thermal_cooling_device_unregister" [drivers/acpi/video.ko] undefined!
>>>>>
>>>>> This bug has been reported two months ago, one month ago, it has been ignored twice
>>>>> and now the bug has been pushed upstream and it's triggering there as well.
>>>>>
>>>>> What's going on?
>>>>
>>>> *Tap*, *tap*, is this thing on? :)
>>>>
>>>> acpi-video is still build-broken upstream, as of .38-rc3:
>>>>
>>>> MODPOST 651 modules
>>>> ERROR: "thermal_cooling_device_register" [drivers/acpi/video.ko] undefined!
>>>> ERROR: "thermal_cooling_device_unregister" [drivers/acpi/video.ko] undefined!
>>>> WARNING: modpost: Found 37 section mismatch(es).
>>>> To see full details build your kernel with:
>>>> 'make CONFIG_DEBUG_SECTION_MISMATCH=y'
>>>> make[1]: *** [__modpost] Error 1
>>>> make: *** [modules] Error 2
>>>>
>>>> Triggers in about 10% of all randconfig builds. Config attached.
>>>
>>>
>>> From: Randy Dunlap <randy.dunlap@oracle.com>
>>>
>>> Several ACPI drivers select THERMAL, but THERMAL depends on NET
>>> (for netlink). Fix build breakage by making the ACPI drivers
>>> also depend on NET.
>>
>> Well, making ACPI_FAN depend on NET seems to be a kind of an overstretch to me.
>> A proper fix would be to disable the netlink interface in THERMAL when
>> NET is unset, I guess. I'll see what can be done to that end (although I had
>> hoped that the people who introduced the breakage would handle it).
>
> OK, please check if the appended patch helps. Admittedly, I only built it
> with CONFIG_NET set, so caveat emptor.
Looks good, built both with NET=y and NET disabled.
Acked-by: Randy Dunlap <randy.dunlap@oracle.com>
Thanks.
> Thanks,
> Rafael
>
>
> ---
> drivers/thermal/Kconfig | 1 -
> drivers/thermal/thermal_sys.c | 40 +++++++++++++++++++++-------------------
> include/linux/thermal.h | 8 ++++++++
> 3 files changed, 29 insertions(+), 20 deletions(-)
>
> Index: linux-2.6/drivers/thermal/thermal_sys.c
> ===================================================================
> --- linux-2.6.orig/drivers/thermal/thermal_sys.c
> +++ linux-2.6/drivers/thermal/thermal_sys.c
> @@ -62,20 +62,6 @@ static DEFINE_MUTEX(thermal_list_lock);
>
> static unsigned int thermal_event_seqnum;
>
> -static struct genl_family thermal_event_genl_family = {
> - .id = GENL_ID_GENERATE,
> - .name = THERMAL_GENL_FAMILY_NAME,
> - .version = THERMAL_GENL_VERSION,
> - .maxattr = THERMAL_GENL_ATTR_MAX,
> -};
> -
> -static struct genl_multicast_group thermal_event_mcgrp = {
> - .name = THERMAL_GENL_MCAST_GROUP_NAME,
> -};
> -
> -static int genetlink_init(void);
> -static void genetlink_exit(void);
> -
> static int get_idr(struct idr *idr, struct mutex *lock, int *id)
> {
> int err;
> @@ -1225,6 +1211,18 @@ void thermal_zone_device_unregister(stru
>
> EXPORT_SYMBOL(thermal_zone_device_unregister);
>
> +#ifdef CONFIG_NET
> +static struct genl_family thermal_event_genl_family = {
> + .id = GENL_ID_GENERATE,
> + .name = THERMAL_GENL_FAMILY_NAME,
> + .version = THERMAL_GENL_VERSION,
> + .maxattr = THERMAL_GENL_ATTR_MAX,
> +};
> +
> +static struct genl_multicast_group thermal_event_mcgrp = {
> + .name = THERMAL_GENL_MCAST_GROUP_NAME,
> +};
> +
> int generate_netlink_event(u32 orig, enum events event)
> {
> struct sk_buff *skb;
> @@ -1301,6 +1299,15 @@ static int genetlink_init(void)
> return result;
> }
>
> +static void genetlink_exit(void)
> +{
> + genl_unregister_family(&thermal_event_genl_family);
> +}
> +#else /* !CONFIG_NET */
> +static inline int genetlink_init(void) { return 0; }
> +static inline void genetlink_exit(void) {}
> +#endif /* !CONFIG_NET */
> +
> static int __init thermal_init(void)
> {
> int result = 0;
> @@ -1316,11 +1323,6 @@ static int __init thermal_init(void)
> return result;
> }
>
> -static void genetlink_exit(void)
> -{
> - genl_unregister_family(&thermal_event_genl_family);
> -}
> -
> static void __exit thermal_exit(void)
> {
> class_unregister(&thermal_class);
> Index: linux-2.6/include/linux/thermal.h
> ===================================================================
> --- linux-2.6.orig/include/linux/thermal.h
> +++ linux-2.6/include/linux/thermal.h
> @@ -172,6 +172,14 @@ void thermal_zone_device_update(struct t
> struct thermal_cooling_device *thermal_cooling_device_register(char *, void *,
> const struct thermal_cooling_device_ops *);
> void thermal_cooling_device_unregister(struct thermal_cooling_device *);
> +
> +#ifdef CONFIG_NET
> extern int generate_netlink_event(u32 orig, enum events event);
> +#else
> +static inline int generate_netlink_event(u32 orig, enum events event)
> +{
> + return 0;
> +}
> +#endif
>
> #endif /* __THERMAL_H__ */
> Index: linux-2.6/drivers/thermal/Kconfig
> ===================================================================
> --- linux-2.6.orig/drivers/thermal/Kconfig
> +++ linux-2.6/drivers/thermal/Kconfig
> @@ -4,7 +4,6 @@
>
> menuconfig THERMAL
> tristate "Generic Thermal sysfs driver"
> - depends on NET
> help
> Generic Thermal Sysfs driver offers a generic mechanism for
> thermal management. Usually it's made up of one or more thermal
--
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
^ permalink raw reply
* Re: Elimination of of_platform_bus_type remains in devicetree/next
From: Stephen Rothwell @ 2011-02-28 23:47 UTC (permalink / raw)
To: Grant Likely; +Cc: linux-next, devicetree-discuss, Benjamin Herrenschmidt
In-Reply-To: <AANLkTim6fuYhPLRjwt814RjxV4Yp-tv4LQ6DBhdgGiDP@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 1099 bytes --]
Hi Grant,
On Mon, 28 Feb 2011 13:59:37 -0700 Grant Likely <grant.likely@secretlab.ca> wrote:
>
> I've just pushed a big change out to my devicetree/next branch which
> removes most users of of_platform_driver. This gets rid of almost all
> the remaining users. ibmebus and macintosh are the last holdouts, but
> they're pretty isolated and don't use the ugly shim that was in
> drivers/of/platform.c.
Yeah, I saw all those patches - looked pretty good.
> This change very likely will break a few things. I've done my best to
> test it over many configurations, but I make no guarantees. I've also
> performed a test merge with linux-next, and am checking it for
> breakage now. You might want to move devicetree/next to the back of
> the queue for your merge tonight (or whatever else you like to do to
> mitigate damage). :)
>
> Let me know if it causes you any problems.
I will just use yesterday's tree if it breaks obviously. Thanks for the
heads up.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* Re: [PATCH upstream build breakage] acpi: several drivers depend on NET
From: Rafael J. Wysocki @ 2011-02-28 22:42 UTC (permalink / raw)
To: Randy Dunlap
Cc: Ingo Molnar, Len Brown, Stephen Rothwell, Luming Yu, linux-next,
LKML, linux-acpi, Linus Torvalds, Andrew Morton
In-Reply-To: <201102282137.15390.rjw@sisk.pl>
On Monday, February 28, 2011, Rafael J. Wysocki wrote:
> On Monday, February 28, 2011, Randy Dunlap wrote:
> > On Tue, 1 Feb 2011 13:03:23 +0100 Ingo Molnar wrote:
> >
> > > * Ingo Molnar <mingo@elte.hu> wrote:
> > >
> > > > * Randy Dunlap <randy.dunlap@oracle.com> wrote:
> > > >
> > > > > On Mon, 20 Dec 2010 20:00:13 +1100 Stephen Rothwell wrote:
> > > > >
> > > > > > Hi all,
> > > > > >
> > > > > > [The mirroring on kernel.org is running slowly]
> > > > > >
> > > > > > Changes since 20101217:
> > > > >
> > > > > ERROR: "thermal_cooling_device_register" [drivers/acpi/video.ko] undefined!
> > > > > ERROR: "thermal_cooling_device_unregister" [drivers/acpi/video.ko] undefined!
> > > >
> > > > This bug has been reported two months ago, one month ago, it has been ignored twice
> > > > and now the bug has been pushed upstream and it's triggering there as well.
> > > >
> > > > What's going on?
> > >
> > > *Tap*, *tap*, is this thing on? :)
> > >
> > > acpi-video is still build-broken upstream, as of .38-rc3:
> > >
> > > MODPOST 651 modules
> > > ERROR: "thermal_cooling_device_register" [drivers/acpi/video.ko] undefined!
> > > ERROR: "thermal_cooling_device_unregister" [drivers/acpi/video.ko] undefined!
> > > WARNING: modpost: Found 37 section mismatch(es).
> > > To see full details build your kernel with:
> > > 'make CONFIG_DEBUG_SECTION_MISMATCH=y'
> > > make[1]: *** [__modpost] Error 1
> > > make: *** [modules] Error 2
> > >
> > > Triggers in about 10% of all randconfig builds. Config attached.
> >
> >
> > From: Randy Dunlap <randy.dunlap@oracle.com>
> >
> > Several ACPI drivers select THERMAL, but THERMAL depends on NET
> > (for netlink). Fix build breakage by making the ACPI drivers
> > also depend on NET.
>
> Well, making ACPI_FAN depend on NET seems to be a kind of an overstretch to me.
> A proper fix would be to disable the netlink interface in THERMAL when
> NET is unset, I guess. I'll see what can be done to that end (although I had
> hoped that the people who introduced the breakage would handle it).
OK, please check if the appended patch helps. Admittedly, I only built it
with CONFIG_NET set, so caveat emptor.
Thanks,
Rafael
---
drivers/thermal/Kconfig | 1 -
drivers/thermal/thermal_sys.c | 40 +++++++++++++++++++++-------------------
include/linux/thermal.h | 8 ++++++++
3 files changed, 29 insertions(+), 20 deletions(-)
Index: linux-2.6/drivers/thermal/thermal_sys.c
===================================================================
--- linux-2.6.orig/drivers/thermal/thermal_sys.c
+++ linux-2.6/drivers/thermal/thermal_sys.c
@@ -62,20 +62,6 @@ static DEFINE_MUTEX(thermal_list_lock);
static unsigned int thermal_event_seqnum;
-static struct genl_family thermal_event_genl_family = {
- .id = GENL_ID_GENERATE,
- .name = THERMAL_GENL_FAMILY_NAME,
- .version = THERMAL_GENL_VERSION,
- .maxattr = THERMAL_GENL_ATTR_MAX,
-};
-
-static struct genl_multicast_group thermal_event_mcgrp = {
- .name = THERMAL_GENL_MCAST_GROUP_NAME,
-};
-
-static int genetlink_init(void);
-static void genetlink_exit(void);
-
static int get_idr(struct idr *idr, struct mutex *lock, int *id)
{
int err;
@@ -1225,6 +1211,18 @@ void thermal_zone_device_unregister(stru
EXPORT_SYMBOL(thermal_zone_device_unregister);
+#ifdef CONFIG_NET
+static struct genl_family thermal_event_genl_family = {
+ .id = GENL_ID_GENERATE,
+ .name = THERMAL_GENL_FAMILY_NAME,
+ .version = THERMAL_GENL_VERSION,
+ .maxattr = THERMAL_GENL_ATTR_MAX,
+};
+
+static struct genl_multicast_group thermal_event_mcgrp = {
+ .name = THERMAL_GENL_MCAST_GROUP_NAME,
+};
+
int generate_netlink_event(u32 orig, enum events event)
{
struct sk_buff *skb;
@@ -1301,6 +1299,15 @@ static int genetlink_init(void)
return result;
}
+static void genetlink_exit(void)
+{
+ genl_unregister_family(&thermal_event_genl_family);
+}
+#else /* !CONFIG_NET */
+static inline int genetlink_init(void) { return 0; }
+static inline void genetlink_exit(void) {}
+#endif /* !CONFIG_NET */
+
static int __init thermal_init(void)
{
int result = 0;
@@ -1316,11 +1323,6 @@ static int __init thermal_init(void)
return result;
}
-static void genetlink_exit(void)
-{
- genl_unregister_family(&thermal_event_genl_family);
-}
-
static void __exit thermal_exit(void)
{
class_unregister(&thermal_class);
Index: linux-2.6/include/linux/thermal.h
===================================================================
--- linux-2.6.orig/include/linux/thermal.h
+++ linux-2.6/include/linux/thermal.h
@@ -172,6 +172,14 @@ void thermal_zone_device_update(struct t
struct thermal_cooling_device *thermal_cooling_device_register(char *, void *,
const struct thermal_cooling_device_ops *);
void thermal_cooling_device_unregister(struct thermal_cooling_device *);
+
+#ifdef CONFIG_NET
extern int generate_netlink_event(u32 orig, enum events event);
+#else
+static inline int generate_netlink_event(u32 orig, enum events event)
+{
+ return 0;
+}
+#endif
#endif /* __THERMAL_H__ */
Index: linux-2.6/drivers/thermal/Kconfig
===================================================================
--- linux-2.6.orig/drivers/thermal/Kconfig
+++ linux-2.6/drivers/thermal/Kconfig
@@ -4,7 +4,6 @@
menuconfig THERMAL
tristate "Generic Thermal sysfs driver"
- depends on NET
help
Generic Thermal Sysfs driver offers a generic mechanism for
thermal management. Usually it's made up of one or more thermal
^ permalink raw reply
* Re: [PATCH] rtlwifi: usb parts should depend on CONFIG_USB
From: Larry Finger @ 2011-02-28 21:27 UTC (permalink / raw)
To: Johannes Berg
Cc: John W. Linville, linux-wireless-u79uwXL29TY76Z2rM5mHXA,
Geert Uytterhoeven, George, linux-next-u79uwXL29TY76Z2rM5mHXA
In-Reply-To: <1298928111.12230.0.camel-8upI4CBIZJIJvtFkdXX2HixXY32XiHfO@public.gmane.org>
On 02/28/2011 03:21 PM, Johannes Berg wrote:
> On Mon, 2011-02-28 at 15:16 -0600, Larry Finger wrote:
>> On 02/28/2011 02:13 PM, John W. Linville wrote:
>>> On Mon, Feb 28, 2011 at 09:08:51PM +0100, Johannes Berg wrote:
>>>> On Mon, 2011-02-28 at 14:48 -0500, John W. Linville wrote:
>>>>>
>>>>> +ifeq ($(CONFIG_USB),y)
>>>>> +rtlwifi-objs += usb.o
>>>>> +endif
>>>>
>>>> That reads weird, shouldn't
>>>>
>>>> rtlwifi-$(CONFIG_USB) += usb.o
>>>>
>>>> do? Or more likely actually use CONFIG_RTL8192CU?
>>>
>>> Maybe...really just following what Larry already had there for pci...?
>>
>> Yes, and that was wrong too.
>>
>> It could be either as Johannes wrote it, or
>
> No, what I said won't work for m either, since you'd get
>
> rtlwifi-m += usb.o
>
> Though you can make that work by adding $(rtlwifi-m) manually to the
> list of objects later.
I just tested it. As you say, your solution only works for y, not m.
I think this is what is needed:
-ifeq ($(CONFIG_PCI),y)
+ifneq ($(CONFIG_PCI),)
rtlwifi-objs += pci.o
endif
+ifneq ($(CONFIG_USB),)
+rtlwifi-objs += usb.o
+endif
+
At least it works wit PCI=y and USB=m.
Larry
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply
* Re: [PATCH] rtlwifi: usb parts should depend on CONFIG_USB
From: Johannes Berg @ 2011-02-28 21:21 UTC (permalink / raw)
To: Larry Finger
Cc: John W. Linville, linux-wireless, Geert Uytterhoeven, George,
linux-next
In-Reply-To: <4D6C10B0.2090402@lwfinger.net>
On Mon, 2011-02-28 at 15:16 -0600, Larry Finger wrote:
> On 02/28/2011 02:13 PM, John W. Linville wrote:
> > On Mon, Feb 28, 2011 at 09:08:51PM +0100, Johannes Berg wrote:
> >> On Mon, 2011-02-28 at 14:48 -0500, John W. Linville wrote:
> >>>
> >>> +ifeq ($(CONFIG_USB),y)
> >>> +rtlwifi-objs += usb.o
> >>> +endif
> >>
> >> That reads weird, shouldn't
> >>
> >> rtlwifi-$(CONFIG_USB) += usb.o
> >>
> >> do? Or more likely actually use CONFIG_RTL8192CU?
> >
> > Maybe...really just following what Larry already had there for pci...?
>
> Yes, and that was wrong too.
>
> It could be either as Johannes wrote it, or
No, what I said won't work for m either, since you'd get
rtlwifi-m += usb.o
Though you can make that work by adding $(rtlwifi-m) manually to the
list of objects later.
johannes
^ permalink raw reply
* Re: [PATCH] rtlwifi: usb parts should depend on CONFIG_USB
From: Larry Finger @ 2011-02-28 21:16 UTC (permalink / raw)
To: John W. Linville
Cc: Johannes Berg, linux-wireless-u79uwXL29TY76Z2rM5mHXA,
Geert Uytterhoeven, George, linux-next-u79uwXL29TY76Z2rM5mHXA
In-Reply-To: <20110228201357.GF2515-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org>
On 02/28/2011 02:13 PM, John W. Linville wrote:
> On Mon, Feb 28, 2011 at 09:08:51PM +0100, Johannes Berg wrote:
>> On Mon, 2011-02-28 at 14:48 -0500, John W. Linville wrote:
>>>
>>> +ifeq ($(CONFIG_USB),y)
>>> +rtlwifi-objs += usb.o
>>> +endif
>>
>> That reads weird, shouldn't
>>
>> rtlwifi-$(CONFIG_USB) += usb.o
>>
>> do? Or more likely actually use CONFIG_RTL8192CU?
>
> Maybe...really just following what Larry already had there for pci...?
Yes, and that was wrong too.
It could be either as Johannes wrote it, or
ifneq ($(CONFIG_USB),)
rtlwifi-objs += usb.o
endif
Yhe PCI entry will also fail if CONFIG_PCI=m.
Larry
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply
* Re: [PATCH] rtlwifi: usb parts should depend on CONFIG_USB
From: Larry Finger @ 2011-02-28 21:01 UTC (permalink / raw)
To: John W. Linville; +Cc: linux-wireless, Geert Uytterhoeven, George, linux-next
In-Reply-To: <1298922500-21632-1-git-send-email-linville@tuxdriver.com>
On 02/28/2011 01:48 PM, John W. Linville wrote:
> ERROR: "usb_unanchor_urb" [drivers/net/wireless/rtlwifi/rtlwifi.ko] undefined!
> ERROR: "usb_control_msg" [drivers/net/wireless/rtlwifi/rtlwifi.ko] undefined!
> ERROR: "usb_submit_urb" [drivers/net/wireless/rtlwifi/rtlwifi.ko] undefined!
> ERROR: "usb_get_dev" [drivers/net/wireless/rtlwifi/rtlwifi.ko] undefined!
> ERROR: "usb_kill_anchored_urbs" [drivers/net/wireless/rtlwifi/rtlwifi.ko] undefined!
> ERROR: "usb_put_dev" [drivers/net/wireless/rtlwifi/rtlwifi.ko] undefined!
> ERROR: "usb_free_urb" [drivers/net/wireless/rtlwifi/rtlwifi.ko] undefined!
> ERROR: "usb_anchor_urb" [drivers/net/wireless/rtlwifi/rtlwifi.ko] undefined!
> ERROR: "usb_alloc_urb" [drivers/net/wireless/rtlwifi/rtlwifi.ko] undefined!
> make[2]: *** [__modpost] Error 1
> make[1]: *** [modules] Error 2
> make: *** [sub-make] Error 2
>
> The USB-part of rtlwifi should depend on CONFIG_USB.
>
> Reported-by: Geert Uytterhoeven<geert@linux-m68k.org>
> Signed-off-by: John W. Linville<linville@tuxdriver.com>
> ---
> drivers/net/wireless/rtlwifi/Makefile | 7 +++++--
> 1 files changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/wireless/rtlwifi/Makefile b/drivers/net/wireless/rtlwifi/Makefile
> index 9192fd5..27355be 100644
> --- a/drivers/net/wireless/rtlwifi/Makefile
> +++ b/drivers/net/wireless/rtlwifi/Makefile
> @@ -7,8 +7,7 @@ rtlwifi-objs := \
> efuse.o \
> ps.o \
> rc.o \
> - regd.o \
> - usb.o
> + regd.o
>
> rtl8192c_common-objs += \
>
> @@ -16,6 +15,10 @@ ifeq ($(CONFIG_PCI),y)
> rtlwifi-objs += pci.o
> endif
>
> +ifeq ($(CONFIG_USB),y)
> +rtlwifi-objs += usb.o
> +endif
> +
> obj-$(CONFIG_RTL8192C_COMMON) += rtl8192c/
> obj-$(CONFIG_RTL8192CE) += rtl8192ce/
> obj-$(CONFIG_RTL8192CU) += rtl8192cu/
This fails on my system as CONFIG_USB=m, not y.
Larry
^ permalink raw reply
* Elimination of of_platform_bus_type remains in devicetree/next
From: Grant Likely @ 2011-02-28 20:59 UTC (permalink / raw)
To: Stephen Rothwell, linux-next, devicetree-discuss,
Benjamin Herrenschmidt
Hi Stephen,
I've just pushed a big change out to my devicetree/next branch which
removes most users of of_platform_driver. This gets rid of almost all
the remaining users. ibmebus and macintosh are the last holdouts, but
they're pretty isolated and don't use the ugly shim that was in
drivers/of/platform.c.
This change very likely will break a few things. I've done my best to
test it over many configurations, but I make no guarantees. I've also
performed a test merge with linux-next, and am checking it for
breakage now. You might want to move devicetree/next to the back of
the queue for your merge tonight (or whatever else you like to do to
mitigate damage). :)
Let me know if it causes you any problems.
Thanks,
g.
--
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.
^ permalink raw reply
* Re: [PATCH upstream build breakage] acpi: several drivers depend on NET
From: Rafael J. Wysocki @ 2011-02-28 20:37 UTC (permalink / raw)
To: Randy Dunlap
Cc: Ingo Molnar, Len Brown, Stephen Rothwell, Luming Yu, linux-next,
LKML, linux-acpi, Linus Torvalds, Andrew Morton
In-Reply-To: <20110228090332.9ffe2087.randy.dunlap@oracle.com>
On Monday, February 28, 2011, Randy Dunlap wrote:
> On Tue, 1 Feb 2011 13:03:23 +0100 Ingo Molnar wrote:
>
> > * Ingo Molnar <mingo@elte.hu> wrote:
> >
> > > * Randy Dunlap <randy.dunlap@oracle.com> wrote:
> > >
> > > > On Mon, 20 Dec 2010 20:00:13 +1100 Stephen Rothwell wrote:
> > > >
> > > > > Hi all,
> > > > >
> > > > > [The mirroring on kernel.org is running slowly]
> > > > >
> > > > > Changes since 20101217:
> > > >
> > > > ERROR: "thermal_cooling_device_register" [drivers/acpi/video.ko] undefined!
> > > > ERROR: "thermal_cooling_device_unregister" [drivers/acpi/video.ko] undefined!
> > >
> > > This bug has been reported two months ago, one month ago, it has been ignored twice
> > > and now the bug has been pushed upstream and it's triggering there as well.
> > >
> > > What's going on?
> >
> > *Tap*, *tap*, is this thing on? :)
> >
> > acpi-video is still build-broken upstream, as of .38-rc3:
> >
> > MODPOST 651 modules
> > ERROR: "thermal_cooling_device_register" [drivers/acpi/video.ko] undefined!
> > ERROR: "thermal_cooling_device_unregister" [drivers/acpi/video.ko] undefined!
> > WARNING: modpost: Found 37 section mismatch(es).
> > To see full details build your kernel with:
> > 'make CONFIG_DEBUG_SECTION_MISMATCH=y'
> > make[1]: *** [__modpost] Error 1
> > make: *** [modules] Error 2
> >
> > Triggers in about 10% of all randconfig builds. Config attached.
>
>
> From: Randy Dunlap <randy.dunlap@oracle.com>
>
> Several ACPI drivers select THERMAL, but THERMAL depends on NET
> (for netlink). Fix build breakage by making the ACPI drivers
> also depend on NET.
Well, making ACPI_FAN depend on NET seems to be a kind of an overstretch to me.
A proper fix would be to disable the netlink interface in THERMAL when
NET is unset, I guess. I'll see what can be done to that end (although I had
hoped that the people who introduced the breakage would handle it).
Thanks,
Rafael
> Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
> ---
> drivers/acpi/Kconfig | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> This is what is needed to fix the breakage, but it seems
> that Len does not care.
> It would be better just to eliminate the netlink dependency.
>
>
> --- linux-next-20110228.orig/drivers/acpi/Kconfig
> +++ linux-next-20110228/drivers/acpi/Kconfig
> @@ -163,7 +163,7 @@ config ACPI_BUTTON
> config ACPI_VIDEO
> tristate "Video"
> depends on X86 && BACKLIGHT_CLASS_DEVICE && VIDEO_OUTPUT_CONTROL
> - depends on INPUT
> + depends on INPUT && NET
> select THERMAL
> help
> This driver implements the ACPI Extensions For Display Adapters
> @@ -177,6 +177,7 @@ config ACPI_VIDEO
>
> config ACPI_FAN
> tristate "Fan"
> + depends on NET
> select THERMAL
> default y
> help
> @@ -195,6 +196,7 @@ config ACPI_DOCK
>
> config ACPI_PROCESSOR
> tristate "Processor"
> + depends on NET
> select THERMAL
> select CPU_IDLE
> default y
> @@ -238,7 +240,7 @@ config ACPI_PROCESSOR_AGGREGATOR
>
> config ACPI_THERMAL
> tristate "Thermal Zone"
> - depends on ACPI_PROCESSOR
> + depends on ACPI_PROCESSOR && NET
> select THERMAL
> default y
> help
>
>
^ permalink raw reply
* Re: [PATCH] dnet: fix wrong use of platform_set_drvdata()
From: David Miller @ 2011-02-28 20:22 UTC (permalink / raw)
To: yanok; +Cc: sfr, greg, linux-next, linux-kernel, mkl, netdev
In-Reply-To: <1298319630-18159-1-git-send-email-yanok@emcraft.com>
From: Ilya Yanok <yanok@emcraft.com>
Date: Mon, 21 Feb 2011 21:20:30 +0100
> platform_set_drvdata() was used with argument of incorrect type and
> could cause memory corruption. Moreover, because of not setting drvdata
> in the correct place not all resources were freed upon module unload.
>
> Signed-off-by: Ilya Yanok <yanok@emcraft.com>
Applied.
^ permalink raw reply
* Re: [PATCH] rtlwifi: usb parts should depend on CONFIG_USB
From: John W. Linville @ 2011-02-28 20:13 UTC (permalink / raw)
To: Johannes Berg
Cc: linux-wireless-u79uwXL29TY76Z2rM5mHXA, Geert Uytterhoeven,
Larry Finger, George, linux-next-u79uwXL29TY76Z2rM5mHXA
In-Reply-To: <1298923731.10109.0.camel-8upI4CBIZJIJvtFkdXX2HixXY32XiHfO@public.gmane.org>
On Mon, Feb 28, 2011 at 09:08:51PM +0100, Johannes Berg wrote:
> On Mon, 2011-02-28 at 14:48 -0500, John W. Linville wrote:
> >
> > +ifeq ($(CONFIG_USB),y)
> > +rtlwifi-objs += usb.o
> > +endif
>
> That reads weird, shouldn't
>
> rtlwifi-$(CONFIG_USB) += usb.o
>
> do? Or more likely actually use CONFIG_RTL8192CU?
Maybe...really just following what Larry already had there for pci...?
John
--
John W. Linville Someday the world will need a hero, and you
linville-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org might be all we have. Be ready.
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply
* Re: [PATCH] rtlwifi: usb parts should depend on CONFIG_USB
From: Johannes Berg @ 2011-02-28 20:08 UTC (permalink / raw)
To: John W. Linville
Cc: linux-wireless-u79uwXL29TY76Z2rM5mHXA, Geert Uytterhoeven,
Larry Finger, George, linux-next-u79uwXL29TY76Z2rM5mHXA
In-Reply-To: <1298922500-21632-1-git-send-email-linville-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org>
On Mon, 2011-02-28 at 14:48 -0500, John W. Linville wrote:
>
> +ifeq ($(CONFIG_USB),y)
> +rtlwifi-objs += usb.o
> +endif
That reads weird, shouldn't
rtlwifi-$(CONFIG_USB) += usb.o
do? Or more likely actually use CONFIG_RTL8192CU?
johannes
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply
* [PATCH] rtlwifi: usb parts should depend on CONFIG_USB
From: John W. Linville @ 2011-02-28 19:48 UTC (permalink / raw)
To: linux-wireless
Cc: Geert Uytterhoeven, Larry Finger, George, linux-next,
John W. Linville
In-Reply-To: <alpine.DEB.2.00.1102171354200.16788@ayla.of.borg>
ERROR: "usb_unanchor_urb" [drivers/net/wireless/rtlwifi/rtlwifi.ko] undefined!
ERROR: "usb_control_msg" [drivers/net/wireless/rtlwifi/rtlwifi.ko] undefined!
ERROR: "usb_submit_urb" [drivers/net/wireless/rtlwifi/rtlwifi.ko] undefined!
ERROR: "usb_get_dev" [drivers/net/wireless/rtlwifi/rtlwifi.ko] undefined!
ERROR: "usb_kill_anchored_urbs" [drivers/net/wireless/rtlwifi/rtlwifi.ko] undefined!
ERROR: "usb_put_dev" [drivers/net/wireless/rtlwifi/rtlwifi.ko] undefined!
ERROR: "usb_free_urb" [drivers/net/wireless/rtlwifi/rtlwifi.ko] undefined!
ERROR: "usb_anchor_urb" [drivers/net/wireless/rtlwifi/rtlwifi.ko] undefined!
ERROR: "usb_alloc_urb" [drivers/net/wireless/rtlwifi/rtlwifi.ko] undefined!
make[2]: *** [__modpost] Error 1
make[1]: *** [modules] Error 2
make: *** [sub-make] Error 2
The USB-part of rtlwifi should depend on CONFIG_USB.
Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---
drivers/net/wireless/rtlwifi/Makefile | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/net/wireless/rtlwifi/Makefile b/drivers/net/wireless/rtlwifi/Makefile
index 9192fd5..27355be 100644
--- a/drivers/net/wireless/rtlwifi/Makefile
+++ b/drivers/net/wireless/rtlwifi/Makefile
@@ -7,8 +7,7 @@ rtlwifi-objs := \
efuse.o \
ps.o \
rc.o \
- regd.o \
- usb.o
+ regd.o
rtl8192c_common-objs += \
@@ -16,6 +15,10 @@ ifeq ($(CONFIG_PCI),y)
rtlwifi-objs += pci.o
endif
+ifeq ($(CONFIG_USB),y)
+rtlwifi-objs += usb.o
+endif
+
obj-$(CONFIG_RTL8192C_COMMON) += rtl8192c/
obj-$(CONFIG_RTL8192CE) += rtl8192ce/
obj-$(CONFIG_RTL8192CU) += rtl8192cu/
--
1.7.4
^ permalink raw reply related
* [PATCH upstream build breakage] acpi: several drivers depend on NET
From: Randy Dunlap @ 2011-02-28 17:03 UTC (permalink / raw)
To: Ingo Molnar
Cc: Len Brown, Stephen Rothwell, Luming Yu, linux-next, LKML,
linux-acpi, Linus Torvalds, Andrew Morton, Rafael J. Wysocki
In-Reply-To: <20110201120323.GA6714@elte.hu>
On Tue, 1 Feb 2011 13:03:23 +0100 Ingo Molnar wrote:
> * Ingo Molnar <mingo@elte.hu> wrote:
>
> > * Randy Dunlap <randy.dunlap@oracle.com> wrote:
> >
> > > On Mon, 20 Dec 2010 20:00:13 +1100 Stephen Rothwell wrote:
> > >
> > > > Hi all,
> > > >
> > > > [The mirroring on kernel.org is running slowly]
> > > >
> > > > Changes since 20101217:
> > >
> > > ERROR: "thermal_cooling_device_register" [drivers/acpi/video.ko] undefined!
> > > ERROR: "thermal_cooling_device_unregister" [drivers/acpi/video.ko] undefined!
> >
> > This bug has been reported two months ago, one month ago, it has been ignored twice
> > and now the bug has been pushed upstream and it's triggering there as well.
> >
> > What's going on?
>
> *Tap*, *tap*, is this thing on? :)
>
> acpi-video is still build-broken upstream, as of .38-rc3:
>
> MODPOST 651 modules
> ERROR: "thermal_cooling_device_register" [drivers/acpi/video.ko] undefined!
> ERROR: "thermal_cooling_device_unregister" [drivers/acpi/video.ko] undefined!
> WARNING: modpost: Found 37 section mismatch(es).
> To see full details build your kernel with:
> 'make CONFIG_DEBUG_SECTION_MISMATCH=y'
> make[1]: *** [__modpost] Error 1
> make: *** [modules] Error 2
>
> Triggers in about 10% of all randconfig builds. Config attached.
From: Randy Dunlap <randy.dunlap@oracle.com>
Several ACPI drivers select THERMAL, but THERMAL depends on NET
(for netlink). Fix build breakage by making the ACPI drivers
also depend on NET.
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
---
drivers/acpi/Kconfig | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
This is what is needed to fix the breakage, but it seems
that Len does not care.
It would be better just to eliminate the netlink dependency.
--- linux-next-20110228.orig/drivers/acpi/Kconfig
+++ linux-next-20110228/drivers/acpi/Kconfig
@@ -163,7 +163,7 @@ config ACPI_BUTTON
config ACPI_VIDEO
tristate "Video"
depends on X86 && BACKLIGHT_CLASS_DEVICE && VIDEO_OUTPUT_CONTROL
- depends on INPUT
+ depends on INPUT && NET
select THERMAL
help
This driver implements the ACPI Extensions For Display Adapters
@@ -177,6 +177,7 @@ config ACPI_VIDEO
config ACPI_FAN
tristate "Fan"
+ depends on NET
select THERMAL
default y
help
@@ -195,6 +196,7 @@ config ACPI_DOCK
config ACPI_PROCESSOR
tristate "Processor"
+ depends on NET
select THERMAL
select CPU_IDLE
default y
@@ -238,7 +240,7 @@ config ACPI_PROCESSOR_AGGREGATOR
config ACPI_THERMAL
tristate "Thermal Zone"
- depends on ACPI_PROCESSOR
+ depends on ACPI_PROCESSOR && NET
select THERMAL
default y
help
^ permalink raw reply
* Re: linux-next: build failure after merge of the sound and sound-asoc trees
From: Mark Brown @ 2011-02-28 14:34 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Takashi Iwai, Liam Girdwood, linux-next, linux-kernel,
Zeng Zhaoming
In-Reply-To: <20110228141528.00fc4ab4.sfr@canb.auug.org.au>
On Mon, Feb 28, 2011 at 02:15:28PM +1100, Stephen Rothwell wrote:
> After merging the sound tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
I've applied a fix for this from Zjaoming.
^ permalink raw reply
* Re: linux-next: build failure after merge of the final tree (kvm tree related)
From: Avi Kivity @ 2011-02-28 9:36 UTC (permalink / raw)
To: Huang Ying
Cc: Marcelo Tosatti, Stephen Rothwell, linux-next@vger.kernel.org,
linux-kernel@vger.kernel.org, David Miller, Andrew Morton
In-Reply-To: <1298860124.27725.2.camel@yhuang-dev>
On 02/28/2011 04:28 AM, Huang Ying wrote:
> Hi, Avi and Marcelo,
>
> On Mon, 2011-02-28 at 10:15 +0800, Stephen Rothwell wrote:
> > Hi All,
> >
> > On Mon, 21 Feb 2011 17:56:58 +1100 Stephen Rothwell<sfr@canb.auug.org.au> wrote:
> > >
> > > After merging the final tree, today's linux-next build (sparc64 defconfig)
> > > failed like this:
> > >
> > > mm/memory.c: In function '__get_user_pages':
> > > mm/memory.c:1584: error: 'EHWPOISON' undeclared (first use in this function)
> > >
> > > Caused by commit b1c4f2836370f5c8207d4c61e91c93bd6a4ce27a ("mm: make
> > > __get_user_pages return -EHWPOISON for HWPOISON page optionally") from
> > > the kvm tree.
> > >
> > > Not all architectures use include/asm-generic/errno.h ...
> > >
> > > I have reverted that commit (and commits
> > > d47b742c5661385b927c03188549b2d2004b80f4 "KVM: Replace
> > > is_hwpoison_address with __get_user_pages" and
> > > eef8839430b72deac59e9ec51eb56c44512fcc66 "mm: remove is_hwpoison_address"
> > > which depend on it) for today.
> >
> > I am still doing those reverts ...
>
> Can you merge the fixes following the email into my original EHWPOISON
> patch to check if that fixes linux-next issue?
>
I folded this into the original patch, will show up in next linux-next.
--
error compiling committee.c: too many arguments to function
^ permalink raw reply
* Re: linux-next: build failure after merge of the v4l-dvb tree
From: Hans Verkuil @ 2011-02-28 7:28 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Mauro Carvalho Chehab, linux-next, linux-kernel
In-Reply-To: <20110228120501.eb6840e0.sfr@canb.auug.org.au>
On Monday, February 28, 2011 02:05:01 Stephen Rothwell wrote:
> Hi Mauro,
>
> After merging the v4l-dvb tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
>
> drivers/video/matrox/matroxfb_base.c: In function 'matroxfb_ioctl':
> drivers/video/matrox/matroxfb_base.c:1155: error: 'VIDIOC_S_CTRL_OLD' undeclared (first use in this function)
>
> Caused by commit 0ff69fe7cebb65856eba7feb3fd76fb4ba365bf8 ("[media] v4l:
> removal of old, obsolete ioctls"). grep is your friend ...
>
> I have used the v4l-dvb tree from next-20110225 for today.
>
Mauro,
Here is the trivial fix for this. Must remember next time that matrox borrows
some of the V4L2 API.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Regards,
Hans
diff --git a/drivers/video/matrox/matroxfb_base.c b/drivers/video/matrox/matroxfb_base.c
index a082deb..4c49fb2 100644
--- a/drivers/video/matrox/matroxfb_base.c
+++ b/drivers/video/matrox/matroxfb_base.c
@@ -1152,7 +1152,6 @@ static int matroxfb_ioctl(struct fb_info *info,
return -EFAULT;
return err;
}
- case VIDIOC_S_CTRL_OLD:
case VIDIOC_S_CTRL:
{
struct v4l2_control ctrl;
--
Hans Verkuil - video4linux developer - sponsored by Cisco
^ permalink raw reply related
* linux-next: Tree for February 28
From: Stephen Rothwell @ 2011-02-28 7:26 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 10662 bytes --]
Hi all,
Changes since 20110225:
Dropped tree: xen
The v4l-dvb tree gained a build failure so I used the version from
next-20110225.
The kvm tree still has its build failure for which I reverted 3 commits.
The sound and sound-asoc trees gained the same build failure so I used
the versions from next-20110225.
The wireless tree lost its build failure.
The trivial tree gained a conflict against Linus' tree.
The tty tree lost its build failure.
The bkl-config tree gained a conflict against the tty tree.
The powerpc allyesconfig build is still broken by some obscure bloating
of the low memory code.
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/v2.6/next/ ). If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one. You should use "git fetch" as mentioned in the FAQ on the wiki
(see below).
You can see which trees have been included by looking in the Next/Trees
file in the source. There are also quilt-import.log and merge.log files
in the Next directory. Between each merge, the tree was built with
a ppc64_defconfig for powerpc and an allmodconfig for x86_64. After the
final fixups (if any), it is also built with powerpc allnoconfig (32 and
64 bit), ppc44x_defconfig and allyesconfig (minus
CONFIG_PROFILE_ALL_BRANCHES - this fails its final link) and i386, sparc
and sparc64 defconfig. These builds also have
CONFIG_ENABLE_WARN_DEPRECATED, CONFIG_ENABLE_MUST_CHECK and
CONFIG_DEBUG_INFO disabled when necessary.
Below is a summary of the state of the merge.
We are up to 187 trees (counting Linus' and 28 trees of patches pending
for Linus' tree), more are welcome (even if they are currently empty).
Thanks to those who have contributed, and to those who haven't, please do.
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Randy Dunlap for doing many randconfig builds.
There is a wiki covering stuff to do with linux-next at
http://linux.f-seidel.de/linux-next/pmwiki/ . Thanks to Frank Seidel.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
$ git checkout master
$ git reset --hard stable
Merging origin/master
Merging fixes/fixes
Merging kbuild-current/rc-fixes
Merging arm-current/master
Merging m68k-current/for-linus
Merging powerpc-merge/merge
Merging 52xx-and-virtex-current/powerpc/merge
Merging sparc-current/master
Merging scsi-rc-fixes/master
Merging net-current/master
Merging sound-current/for-linus
Merging pci-current/for-linus
Merging wireless-current/master
Merging driver-core.current/driver-core-linus
Merging tty.current/tty-linus
Merging usb.current/usb-linus
Merging staging.current/staging-linus
Merging cpufreq-current/fixes
Merging input-current/for-linus
Merging md-current/for-linus
Merging audit-current/for-linus
Merging crypto-current/master
Merging ide-curent/master
Merging dwmw2/master
Merging sh-current/sh-fixes-for-linus
Merging rmobile-current/rmobile-fixes-for-linus
Merging fbdev-current/fbdev-fixes-for-linus
Merging devicetree-current/devicetree/merge
Merging spi-current/spi/merge
Merging arm/for-next
Merging davinci/davinci-next
Merging i.MX/for-next
Merging linux-spec/for-next
Merging msm/for-next
CONFLICT (content): Merge conflict in arch/arm/mach-msm/board-msm7x27.c
CONFLICT (content): Merge conflict in arch/arm/mach-msm/board-msm7x30.c
CONFLICT (content): Merge conflict in arch/arm/mach-msm/board-qsd8x50.c
CONFLICT (content): Merge conflict in arch/arm/mach-msm/board-sapphire.c
CONFLICT (content): Merge conflict in arch/arm/mach-msm/include/mach/memory.h
Merging omap/for-next
Merging pxa/for-next
Merging samsung/next-samsung
Merging s5p/for-next
Merging tegra/for-next
Merging ux500-core/ux500-core
CONFLICT (content): Merge conflict in arch/arm/mach-ux500/cpu-db8500.c
Merging avr32/avr32-arch
Merging blackfin/for-linus
Merging cris/for-next
Merging ia64/test
Merging m68k/for-next
Merging m68knommu/for-next
Merging microblaze/next
Merging mips/mips-for-linux-next
Merging parisc/for-next
Merging powerpc/next
Merging 4xx/next
Merging 52xx-and-virtex/powerpc/next
Merging galak/next
Merging s390/features
Merging sh/sh-latest
Merging rmobile/rmobile-latest
Merging sparc/master
Merging tile/master
Merging unicore32/unicore32
Merging xtensa/master
CONFLICT (content): Merge conflict in arch/xtensa/configs/iss_defconfig
Merging ceph/for-next
Merging cifs/master
Merging configfs/linux-next
Merging ecryptfs/next
Merging ext3/for_next
Merging ext4/next
CONFLICT (content): Merge conflict in fs/ext4/mballoc.c
Merging fatfs/master
Merging fuse/for-next
Merging gfs2/master
Merging hfsplus/for-next
Merging jfs/next
Merging logfs/master
CONFLICT (content): Merge conflict in fs/logfs/logfs.h
Merging nfs/linux-next
Merging nfsd/nfsd-next
Merging nilfs2/for-next
Merging ocfs2/linux-next
Merging omfs/for-next
Merging squashfs/master
Merging udf/for_next
Merging v9fs/for-next
Merging ubifs/linux-next
Merging xfs/master
Merging vfs/for-next
Merging vfs-scale/vfs-scale-working
Merging pci/linux-next
Merging hid/for-next
Merging quilt/i2c
Merging bjdooks-i2c/next-i2c
Merging quilt/jdelvare-hwmon
Merging hwmon-staging/hwmon-next
CONFLICT (content): Merge conflict in drivers/hwmon/Makefile
Merging quilt/kernel-doc
Merging v4l-dvb/master
$ git reset --hard HEAD^
Merging refs/next/20110225/v4l-dvb
Merging kbuild/for-next
Merging kconfig/for-next
Merging ide/master
Merging libata/NEXT
Merging infiniband/for-next
Merging acpi/test
Merging idle-test/idle-test
Merging powertools/tools-test
Merging ieee1394/for-next
Merging ubi/linux-next
Merging kvm/linux-next
[master e78175a] Revert "mm: remove is_hwpoison_address"
[master 158b873] Revert "KVM: Replace is_hwpoison_address with __get_user_pages"
[master d87b993] Revert "mm: make __get_user_pages return -EHWPOISON for HWPOISON page optionally"
Merging dlm/next
Merging swiotlb/master
Merging ibft/master
Merging scsi/master
CONFLICT (content): Merge conflict in drivers/scsi/libsas/sas_ata.c
CONFLICT (content): Merge conflict in drivers/scsi/libsas/sas_scsi_host.c
Merging async_tx/next
Merging net/master
Merging wireless/master
Merging bluetooth/master
Merging mtd/master
Merging crypto/master
Merging sound/for-next
$ git reset --hard HEAD^
Merging refs/next/20110225/sound
Merging sound-asoc/for-next
$ git reset --hard HEAD^
Merging refs/next/20110225/sound-asoc
Merging cpufreq/next
Merging quilt/rr
Merging input/next
Merging input-mt/next
Merging lsm/for-next
Merging block/for-next
Merging quilt/device-mapper
Merging embedded/master
Merging firmware/master
Merging pcmcia/master
Merging battery/master
Merging leds/for-mm
CONFLICT (content): Merge conflict in drivers/leds/Kconfig
Merging backlight/for-mm
Merging mmc/mmc-next
Merging kgdb/kgdb-next
Merging slab/for-next
Merging uclinux/for-next
Merging md/for-next
Merging mfd/for-next
Merging hdlc/hdlc-next
Merging drm/drm-next
Merging fbdev/master
Merging viafb/viafb-next
Merging omap_dss2/for-next
Merging voltage/for-next
Merging security-testing/next
Merging selinux/master
Merging lblnet/master
Merging agp/agp-next
Merging watchdog/master
Merging bdev/master
Merging dwmw2-iommu/master
Merging cputime/cputime
Merging osd/linux-next
Merging jc_docs/docs-next
Merging nommu/master
Merging trivial/for-next
CONFLICT (content): Merge conflict in MAINTAINERS
CONFLICT (content): Merge conflict in fs/eventpoll.c
Merging audit/for-next
Merging suspend/linux-next
Merging fsnotify/for-next
Merging irda/for-next
Merging catalin/for-next
Merging alacrity/linux-next
CONFLICT (content): Merge conflict in drivers/Makefile
CONFLICT (content): Merge conflict in include/linux/Kbuild
CONFLICT (content): Merge conflict in lib/Kconfig
Merging i7core_edac/linux_next
Merging i7300_edac/linux_next
Merging devicetree/devicetree/next
CONFLICT (content): Merge conflict in drivers/spi/pxa2xx_spi_pci.c
Merging spi/spi/next
Merging tip/auto-latest
CONFLICT (content): Merge conflict in arch/x86/kernel/acpi/sleep.c
Merging rcu/rcu/next
Merging oprofile/for-next
Merging xen-two/linux-next
Merging xen-pvhvm/linux-next
CONFLICT (content): Merge conflict in arch/x86/include/asm/xen/page.h
Merging edac-amd/for-next
CONFLICT (content): Merge conflict in include/linux/pci_ids.h
Merging percpu/for-next
CONFLICT (content): Merge conflict in arch/x86/kernel/vmlinux.lds.S
Merging workqueues/for-next
Merging sfi/sfi-test
Merging asm-generic/next
Merging drivers-x86/linux-next
CONFLICT (content): Merge conflict in drivers/hwmon/lm85.c
Applying: OLPC: fix for removal of run_wake_count
Merging hwpoison/hwpoison
Merging sysctl/master
Merging driver-core/driver-core-next
Merging tty/tty-next
CONFLICT (content): Merge conflict in drivers/tty/serial/Kconfig
CONFLICT (content): Merge conflict in drivers/tty/serial/Makefile
Merging usb/usb-next
CONFLICT (content): Merge conflict in drivers/usb/gadget/Kconfig
Merging staging/staging-next
CONFLICT (content): Merge conflict in drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
Merging slabh/slabh
Merging bkl-trivial/trivial
Merging bkl-llseek/llseek
Merging bkl-vfs/vfs
Merging bkl-config/config
CONFLICT (content): Merge conflict in arch/powerpc/kernel/setup_64.c
CONFLICT (content): Merge conflict in drivers/scsi/pm8001/pm8001_sas.h
CONFLICT (content): Merge conflict in drivers/staging/Kconfig
CONFLICT (delete/modify): drivers/staging/stradis/Kconfig deleted in HEAD and modified in bkl-config/config. Version bkl-config/config of drivers/staging/stradis/Kconfig left in tree.
CONFLICT (content): Merge conflict in fs/nfsd/nfs4state.c
CONFLICT (content): Merge conflict in include/linux/hardirq.h
CONFLICT (content): Merge conflict in include/linux/smp_lock.h
$ git rm -f drivers/staging/stradis/Kconfig
Merging cleancache/linux-next
CONFLICT (content): Merge conflict in fs/ocfs2/super.c
CONFLICT (content): Merge conflict in fs/super.c
CONFLICT (content): Merge conflict in include/linux/fs.h
CONFLICT (content): Merge conflict in mm/Kconfig
Merging scsi-post-merge/merge-base:master
$ git checkout scsi-post-merge/master
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* linux-next: manual merge of the bkl-config tree with the tty tree
From: Stephen Rothwell @ 2011-02-28 6:40 UTC (permalink / raw)
To: Arnd Bergmann; +Cc: linux-next, linux-kernel, Greg KH
Hi Arnd,
Today's linux-next merge of the bkl-config tree got a conflict in
drivers/staging/Kconfig between commits
4a6514e6d096716fb7bedf238efaaca877e2a7e8 ("tty: move obsolete and broken
tty drivers to drivers/staging/tty/") and
4c37705877e74c02c968735c2eee0f84914cf557 ("tty: move obsolete and broken
generic_serial drivers to drivers/staging/generic_serial/") from the tty
tree and commit a3ba01b63468c925518da2da0ac3be11358f60cb ("BKL: move
CONFIG_BKL to staging") from the bkl-config tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/staging/Kconfig
index fc751e3,5adf537..0000000
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@@ -41,10 -41,17 +41,21 @@@ config STAGING_EXCLUDE_BUIL
if !STAGING_EXCLUDE_BUILD
+ config BKL
+ bool "Include drivers that depend on the Big Kernel Lock" if (SMP || PREEMPT)
+ default !(SMP || PREEMPT)
+ help
+ This is the traditional lock that is used in old code instead
+ of proper locking. All drivers that use the BKL should depend
+ on this symbol.
+ A small number of drivers still require this. All drivers that
+ use the BKL should be changed to a better serialisation method
+ or they will be removed in 2.6.39.
+
+source "drivers/staging/tty/Kconfig"
+
+source "drivers/staging/generic_serial/Kconfig"
+
source "drivers/staging/et131x/Kconfig"
source "drivers/staging/slicoss/Kconfig"
^ permalink raw reply
* linux-next: manual merge of the trivial tree with Linus' tree
From: Stephen Rothwell @ 2011-02-28 4:21 UTC (permalink / raw)
To: Jiri Kosina; +Cc: linux-next, linux-kernel, Davide Libenzi, Daniel Baluta
Hi Jiri,
Today's linux-next merge of the trivial tree got a conflict in
fs/eventpoll.c between commit 22bacca48a1755f79b7e0f192ddb9fbb7fc6e64e
("epoll: prevent creating circular epoll structures") from Linus' tree
and commit bf6a41db7726e6c09b9c6ac993457b7260473406 ("fs/eventpoll.c: fix
spelling") from the trivial tree.
Just context. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc fs/eventpoll.c
index 4a09af9,7513066..0000000
--- a/fs/eventpoll.c
+++ b/fs/eventpoll.c
@@@ -62,14 -62,7 +62,14 @@@
* This mutex is acquired by ep_free() during the epoll file
* cleanup path and it is also acquired by eventpoll_release_file()
* if a file has been pushed inside an epoll set and it is then
- * close()d without a previous call toepoll_ctl(EPOLL_CTL_DEL).
+ * close()d without a previous call to epoll_ctl(EPOLL_CTL_DEL).
+ * It is also acquired when inserting an epoll fd onto another epoll
+ * fd. We do this so that we walk the epoll tree and ensure that this
+ * insertion does not create a cycle of epoll file descriptors, which
+ * could lead to deadlock. We need a global mutex to prevent two
+ * simultaneous inserts (A into B and B into A) from racing and
+ * constructing a cycle without either insert observing that it is
+ * going to.
* It is possible to drop the "ep->mtx" and to use the global
* mutex "epmutex" (together with "ep->lock") to have it working,
* but having "ep->mtx" will make the interface more scalable.
^ permalink raw reply
* linux-next: build failure after merge of the sound and sound-asoc trees
From: Stephen Rothwell @ 2011-02-28 3:15 UTC (permalink / raw)
To: Takashi Iwai, Mark Brown, Liam Girdwood
Cc: linux-next, linux-kernel, Zeng Zhaoming
[-- Attachment #1: Type: text/plain, Size: 633 bytes --]
Hi all,
After merging the sound tree, today's linux-next build (x86_64
allmodconfig) failed like this:
sound/soc/codecs/sgtl5000.c:30:27: error: mach/hardware.h: No such file or directory
Caused by commit 9b34e6cc3bc2bf826c078c93c81b46f6c08da25f ("ASoC: Add
Freescale SGTL5000 codec support"). Maybe it needs restricting to a
particular architecture?
I have used the sound tree from next-20110225 for today.
This also affected the sound-asoc tree so I have used the next-20110225
version of that as well.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* Re: linux-next: build failure after merge of the final tree (kvm tree related)
From: Huang Ying @ 2011-02-28 2:28 UTC (permalink / raw)
To: Avi Kivity, Marcelo Tosatti
Cc: Stephen Rothwell, linux-next@vger.kernel.org,
linux-kernel@vger.kernel.org, David Miller, Andrew Morton
In-Reply-To: <20110228131556.3822f3ca.sfr@canb.auug.org.au>
Hi, Avi and Marcelo,
On Mon, 2011-02-28 at 10:15 +0800, Stephen Rothwell wrote:
> Hi All,
>
> On Mon, 21 Feb 2011 17:56:58 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > After merging the final tree, today's linux-next build (sparc64 defconfig)
> > failed like this:
> >
> > mm/memory.c: In function '__get_user_pages':
> > mm/memory.c:1584: error: 'EHWPOISON' undeclared (first use in this function)
> >
> > Caused by commit b1c4f2836370f5c8207d4c61e91c93bd6a4ce27a ("mm: make
> > __get_user_pages return -EHWPOISON for HWPOISON page optionally") from
> > the kvm tree.
> >
> > Not all architectures use include/asm-generic/errno.h ...
> >
> > I have reverted that commit (and commits
> > d47b742c5661385b927c03188549b2d2004b80f4 "KVM: Replace
> > is_hwpoison_address with __get_user_pages" and
> > eef8839430b72deac59e9ec51eb56c44512fcc66 "mm: remove is_hwpoison_address"
> > which depend on it) for today.
>
> I am still doing those reverts ...
Can you merge the fixes following the email into my original EHWPOISON
patch to check if that fixes linux-next issue?
Or you prefer I resend the patchset?
Best Regards,
Huang Ying
---
arch/alpha/include/asm/errno.h | 2 ++
arch/mips/include/asm/errno.h | 2 ++
arch/parisc/include/asm/errno.h | 2 ++
arch/sparc/include/asm/errno.h | 2 ++
4 files changed, 8 insertions(+)
--- a/arch/parisc/include/asm/errno.h
+++ b/arch/parisc/include/asm/errno.h
@@ -122,4 +122,6 @@
#define ERFKILL 256 /* Operation not possible due to RF-kill */
+#define EHWPOISON 257 /* Memory page has hardware error */
+
#endif
--- a/arch/sparc/include/asm/errno.h
+++ b/arch/sparc/include/asm/errno.h
@@ -112,4 +112,6 @@
#define ERFKILL 134 /* Operation not possible due to RF-kill */
+#define EHWPOISON 135 /* Memory page has hardware error */
+
#endif
--- a/arch/alpha/include/asm/errno.h
+++ b/arch/alpha/include/asm/errno.h
@@ -122,4 +122,6 @@
#define ERFKILL 138 /* Operation not possible due to RF-kill */
+#define EHWPOISON 139 /* Memory page has hardware error */
+
#endif
--- a/arch/mips/include/asm/errno.h
+++ b/arch/mips/include/asm/errno.h
@@ -121,6 +121,8 @@
#define ERFKILL 167 /* Operation not possible due to RF-kill */
+#define EHWPOISON 168 /* Memory page has hardware error */
+
#define EDQUOT 1133 /* Quota exceeded */
#ifdef __KERNEL__
^ permalink raw reply
* Re: linux-next: build failure after merge of the final tree (kvm tree related)
From: Stephen Rothwell @ 2011-02-28 2:15 UTC (permalink / raw)
To: Avi Kivity, Marcelo Tosatti
Cc: linux-next, linux-kernel, Huang Ying, David Miller, Andrew Morton
In-Reply-To: <20110221175658.2dc4d1ac.sfr@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 974 bytes --]
Hi All,
On Mon, 21 Feb 2011 17:56:58 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the final tree, today's linux-next build (sparc64 defconfig)
> failed like this:
>
> mm/memory.c: In function '__get_user_pages':
> mm/memory.c:1584: error: 'EHWPOISON' undeclared (first use in this function)
>
> Caused by commit b1c4f2836370f5c8207d4c61e91c93bd6a4ce27a ("mm: make
> __get_user_pages return -EHWPOISON for HWPOISON page optionally") from
> the kvm tree.
>
> Not all architectures use include/asm-generic/errno.h ...
>
> I have reverted that commit (and commits
> d47b742c5661385b927c03188549b2d2004b80f4 "KVM: Replace
> is_hwpoison_address with __get_user_pages" and
> eef8839430b72deac59e9ec51eb56c44512fcc66 "mm: remove is_hwpoison_address"
> which depend on it) for today.
I am still doing those reverts ...
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* linux-next: build failure after merge of the v4l-dvb tree
From: Stephen Rothwell @ 2011-02-28 1:05 UTC (permalink / raw)
To: Mauro Carvalho Chehab; +Cc: linux-next, linux-kernel, Hans Verkuil
[-- Attachment #1: Type: text/plain, Size: 603 bytes --]
Hi Mauro,
After merging the v4l-dvb tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:
drivers/video/matrox/matroxfb_base.c: In function 'matroxfb_ioctl':
drivers/video/matrox/matroxfb_base.c:1155: error: 'VIDIOC_S_CTRL_OLD' undeclared (first use in this function)
Caused by commit 0ff69fe7cebb65856eba7feb3fd76fb4ba365bf8 ("[media] v4l:
removal of old, obsolete ioctls"). grep is your friend ...
I have used the v4l-dvb tree from next-20110225 for today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* Re: [PATCH] slub: fix ksize() build error
From: Pekka Enberg @ 2011-02-27 10:07 UTC (permalink / raw)
To: David Rientjes
Cc: Mariusz Kozlowski, Randy Dunlap, Stephen Rothwell, Eric Dumazet,
linux-next, linux-mm, linux-kernel, Christoph Lameter
In-Reply-To: <alpine.DEB.2.00.1102262132320.12215@chino.kir.corp.google.com>
Hi,
[ Please CC me for slab allocator patches in the future. ]
On Sun, Feb 27, 2011 at 7:32 AM, David Rientjes <rientjes@google.com> wrote:
> On Sat, 26 Feb 2011, Mariusz Kozlowski wrote:
>
>> mm/slub.c: In function 'ksize':
>> mm/slub.c:2728: error: implicit declaration of function 'slab_ksize'
>>
>> slab_ksize() needs to go out of CONFIG_SLUB_DEBUG section.
>>
>> Signed-off-by: Mariusz Kozlowski <mk@lab.zgora.pl>
>
> Acked-by: David Rientjes <rientjes@google.com>
Applied, thanks!
Pekka
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox