* linux-next: manual merge of the moduleh tree with the sound tree
From: Stephen Rothwell @ 2011-09-28 7:03 UTC (permalink / raw)
To: Paul Gortmaker; +Cc: linux-next, linux-kernel, Liam Girdwood, Takashi Iwai
Hi Paul,
Today's linux-next merge of the moduleh tree got a conflict in
sound/soc/soc-io.c between commit be3ea3b9e8df ("ASoC: Use new register
map API for ASoC generic physical I/O") from the sound tree and commit
1aff9ab90466 ("sound: Add export.h for THIS_MODULE/EXPORT_SYMBOL where
needed") from the moduleh tree.
I fixed it up (see below) and can carry the fix as necessary.
[Mark Brown <broonie@opensource.wolfsonmicro.com> was left off the cc list
because his host is not reolving in the DNS currently.]
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc sound/soc/soc-io.c
index 66fcccd,963efe0..0000000
--- a/sound/soc/soc-io.c
+++ b/sound/soc/soc-io.c
@@@ -13,7 -13,7 +13,8 @@@
#include <linux/i2c.h>
#include <linux/spi/spi.h>
+#include <linux/regmap.h>
+ #include <linux/export.h>
#include <sound/soc.h>
#include <trace/events/asoc.h>
^ permalink raw reply
* linux-next: manual merge of the moduleh tree with the net tree
From: Stephen Rothwell @ 2011-09-28 7:00 UTC (permalink / raw)
To: Paul Gortmaker
Cc: linux-next, linux-kernel, Kalle Valo, John W. Linville,
David Miller, netdev
[-- Attachment #1: Type: text/plain, Size: 466 bytes --]
Hi Paul,
Today's linux-next merge of the moduleh tree got a conflict in
drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif.c between commit
af2bf4b4ee58 ("staging: remove ath6kl") from the tree and commit
33cffa3526be ("staging: Add module.h to more drivers implicitly using
it") from the moduleh tree.
The former removed the file, so I did that.
--
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 -next] x86: perf_event_amd.c needs <asm/apicdef.h>
From: Ingo Molnar @ 2011-09-28 6:58 UTC (permalink / raw)
To: Randy Dunlap
Cc: Stephen Rothwell, linux-next, LKML, Robert Richter,
Andre Przywara, Andrew Morton
In-Reply-To: <4E820138.90301@xenotime.net>
* Randy Dunlap <rdunlap@xenotime.net> wrote:
> From: Randy Dunlap <rdunlap@xenotime.net>
>
> Fix build error by adding <asm/apicdef.h> header file:
>
> arch/x86/kernel/cpu/perf_event_amd.c:350:2: error: 'BAD_APICID' undeclared (first use in this function)
>
> Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
> ---
>
> Found in linux-next and patch only applies cleanly to linux-next,
> but looks like mainline could use a similar patch (with more
> header files).
>
> arch/x86/kernel/cpu/perf_event_amd.c | 1 +
> 1 file changed, 1 insertion(+)
Applied to tip:perf/core, thanks Randy!
Ingo
^ permalink raw reply
* linux-next: manual merge of the moduleh tree with the tree
From: Stephen Rothwell @ 2011-09-28 6:53 UTC (permalink / raw)
To: Paul Gortmaker
Cc: linux-next, linux-kernel, Yogesh Ashok Powar, Amitkumar Karwar,
Bing Zhao, John W. Linville, David Miller, netdev
Hi Paul,
Today's linux-next merge of the moduleh tree got conflicts in
net/mac80211/util.c and net/wireless/util.c between commit 0879fa44b541
("cfg80211/mac80211: move information element parsing logic to cfg80211")
from the net tree and commit c1f5764979c5 ("net: Add export.h for
EXPORT_SYMBOL/THIS_MODULE to non-modules") from the moduleh tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc net/mac80211/util.c
index 2c9dc36,7a55c69..0000000
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@@ -19,6 -19,8 +19,7 @@@
#include <linux/etherdevice.h>
#include <linux/if_arp.h>
#include <linux/bitmap.h>
-#include <linux/crc32.h>
+ #include <linux/export.h>
#include <net/net_namespace.h>
#include <net/cfg80211.h>
#include <net/rtnetlink.h>
diff --cc net/wireless/util.c
index 6304ed6,3ba8eea..0000000
--- a/net/wireless/util.c
+++ b/net/wireless/util.c
@@@ -6,7 -6,7 +6,8 @@@
#include <linux/bitops.h>
#include <linux/etherdevice.h>
#include <linux/slab.h>
+#include <linux/crc32.h>
+ #include <linux/export.h>
#include <net/cfg80211.h>
#include <net/ip.h>
#include "core.h"
^ permalink raw reply
* Re: linux-next: manual merge of the moduleh tree with the staging tree
From: Stephen Rothwell @ 2011-09-28 6:48 UTC (permalink / raw)
To: Paul Gortmaker; +Cc: linux-next, linux-kernel, Jonathan Cameron, Greg KH
In-Reply-To: <20110928164419.372feaa0c5554687403a9af5@canb.auug.org.au>
Hi Paul,
On Wed, 28 Sep 2011 16:44:19 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the moduleh tree got a conflict in
> drivers/staging/iio/accel/adis16201_ring.c between commit 779921683e6d
> ("staging:iio:accel header housekeeping - remove unecessary includes")
> from the staging tree and commit 15f310ea9641 ("staging: Add export.h for
> THIS_MODULE/EXPORT_SYMBOL to drivers/staging users") from the moduleh
> tree.
Also drivers/staging/iio/accel/adis16203_ring.c,
drivers/staging/iio/accel/adis16204_ring.c,
drivers/staging/iio/accel/adis16209_ring.c,
drivers/staging/iio/accel/adis16240_ring.c,
drivers/staging/iio/gyro/adis16260_ring.c and
drivers/staging/iio/meter/ade7758_ring.c
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/staging/iio/accel/adis16203_ring.c
index 993e239,ce23f4a..0000000
--- a/drivers/staging/iio/accel/adis16203_ring.c
+++ b/drivers/staging/iio/accel/adis16203_ring.c
@@@ -3,10 -6,16 +3,11 @@@
#include <linux/kernel.h>
#include <linux/spi/spi.h>
#include <linux/slab.h>
-#include <linux/sysfs.h>
-#include <linux/list.h>
+ #include <linux/export.h>
#include "../iio.h"
-#include "../sysfs.h"
#include "../ring_sw.h"
-#include "accel.h"
-#include "../trigger.h"
+#include "../trigger_consumer.h"
#include "adis16203.h"
/**
diff --cc drivers/staging/iio/accel/adis16204_ring.c
index 847f438,0d0da0c..0000000
--- a/drivers/staging/iio/accel/adis16204_ring.c
+++ b/drivers/staging/iio/accel/adis16204_ring.c
@@@ -3,10 -6,16 +3,11 @@@
#include <linux/kernel.h>
#include <linux/spi/spi.h>
#include <linux/slab.h>
-#include <linux/sysfs.h>
-#include <linux/list.h>
+ #include <linux/export.h>
#include "../iio.h"
-#include "../sysfs.h"
#include "../ring_sw.h"
-#include "accel.h"
-#include "../trigger.h"
+#include "../trigger_consumer.h"
#include "adis16204.h"
/**
diff --cc drivers/staging/iio/accel/adis16209_ring.c
index f889fe7,c7f9d59..0000000
--- a/drivers/staging/iio/accel/adis16209_ring.c
+++ b/drivers/staging/iio/accel/adis16209_ring.c
@@@ -3,10 -6,16 +3,11 @@@
#include <linux/kernel.h>
#include <linux/spi/spi.h>
#include <linux/slab.h>
-#include <linux/sysfs.h>
-#include <linux/list.h>
+ #include <linux/export.h>
#include "../iio.h"
-#include "../sysfs.h"
#include "../ring_sw.h"
-#include "accel.h"
-#include "../trigger.h"
+#include "../trigger_consumer.h"
#include "adis16209.h"
/**
diff --cc drivers/staging/iio/accel/adis16240_ring.c
index 051ba64,a5033b9..0000000
--- a/drivers/staging/iio/accel/adis16240_ring.c
+++ b/drivers/staging/iio/accel/adis16240_ring.c
@@@ -3,10 -6,16 +3,11 @@@
#include <linux/kernel.h>
#include <linux/spi/spi.h>
#include <linux/slab.h>
-#include <linux/sysfs.h>
-#include <linux/list.h>
+ #include <linux/export.h>
#include "../iio.h"
-#include "../sysfs.h"
#include "../ring_sw.h"
-#include "accel.h"
-#include "../trigger.h"
+#include "../trigger_consumer.h"
#include "adis16240.h"
/**
diff --cc drivers/staging/iio/gyro/adis16260_ring.c
index 10f8a66,85e6fac..0000000
--- a/drivers/staging/iio/gyro/adis16260_ring.c
+++ b/drivers/staging/iio/gyro/adis16260_ring.c
@@@ -3,10 -6,16 +3,11 @@@
#include <linux/kernel.h>
#include <linux/spi/spi.h>
#include <linux/slab.h>
-#include <linux/sysfs.h>
-#include <linux/list.h>
+ #include <linux/export.h>
#include "../iio.h"
-#include "../sysfs.h"
#include "../ring_sw.h"
-#include "../accel/accel.h"
-#include "../trigger.h"
+#include "../trigger_consumer.h"
#include "adis16260.h"
/**
diff --cc drivers/staging/iio/meter/ade7758_ring.c
index 1e2a096,88805b2..0000000
--- a/drivers/staging/iio/meter/ade7758_ring.c
+++ b/drivers/staging/iio/meter/ade7758_ring.c
@@@ -9,6 -9,14 +9,7 @@@
#include <linux/kernel.h>
#include <linux/spi/spi.h>
#include <linux/slab.h>
-#include <linux/sysfs.h>
-#include <linux/list.h>
+ #include <linux/export.h>
#include <asm/unaligned.h>
#include "../iio.h"
^ permalink raw reply
* linux-next: manual merge of the moduleh tree with the staging tree
From: Stephen Rothwell @ 2011-09-28 6:44 UTC (permalink / raw)
To: Paul Gortmaker; +Cc: linux-next, linux-kernel, Jonathan Cameron, Greg KH
Hi Paul,
Today's linux-next merge of the moduleh tree got a conflict in
drivers/staging/iio/accel/adis16201_ring.c between commit 779921683e6d
("staging:iio:accel header housekeeping - remove unecessary includes")
from the staging tree and commit 15f310ea9641 ("staging: Add export.h for
THIS_MODULE/EXPORT_SYMBOL to drivers/staging users") from the moduleh
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/iio/accel/adis16201_ring.c
index 4b433c5,52ab4f0..0000000
--- a/drivers/staging/iio/accel/adis16201_ring.c
+++ b/drivers/staging/iio/accel/adis16201_ring.c
@@@ -3,10 -4,15 +3,11 @@@
#include <linux/kernel.h>
#include <linux/spi/spi.h>
#include <linux/slab.h>
-#include <linux/sysfs.h>
+ #include <linux/export.h>
#include "../iio.h"
-#include "../sysfs.h"
#include "../ring_sw.h"
-#include "accel.h"
-#include "../trigger.h"
+#include "../trigger_consumer.h"
#include "adis16201.h"
^ permalink raw reply
* linux-next: manual merge of the moduleh tree with the staging tree
From: Stephen Rothwell @ 2011-09-28 6:40 UTC (permalink / raw)
To: Paul Gortmaker
Cc: linux-next, linux-kernel, Franky Lin, Arend van Spriel, Greg KH
Hi Paul,
Today's linux-next merge of the moduleh tree got a conflict in
drivers/staging/brcm80211/brcmfmac/bcmsdh.c between commit 47b4c640b849
("staging: brcm80211: remove global var gInstance from brcmfmac") from
the staging tree and commit 15f310ea9641 ("staging: Add export.h for
THIS_MODULE/EXPORT_SYMBOL to drivers/staging users") from the moduleh
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/brcm80211/brcmfmac/bcmsdh.c
index 8448b8b,51f9335..0000000
--- a/drivers/staging/brcm80211/brcmfmac/bcmsdh.c
+++ b/drivers/staging/brcm80211/brcmfmac/bcmsdh.c
@@@ -21,9 -22,7 +22,10 @@@
#include <linux/pci_ids.h>
#include <linux/sched.h>
#include <linux/completion.h>
+#include <linux/mmc/sdio.h>
+#include <linux/mmc/sdio_func.h>
+#include <linux/mmc/card.h>
+ #include <linux/export.h>
#include <defs.h>
#include <brcm_hw_ids.h>
^ permalink raw reply
* linux-next: manual merge of the moduleh tree with the net tree
From: Stephen Rothwell @ 2011-09-28 6:36 UTC (permalink / raw)
To: Paul Gortmaker
Cc: linux-next, linux-kernel, Christian Lamparter, John W. Linville,
David Miller, netdev
Hi Paul,
Today's linux-next merge of the moduleh tree got a conflict in
drivers/net/wireless/p54/txrx.c between commit 1cda0fd60963 ("p54: Use
do_div for 64-bit division to fix 32-bit kernels") from the tree and
commit 9ec3f961e31a ("drivers/net: Add export.h to files using
EXPORT_SYMBOL/THIS_MODULE") from the moduleh 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/net/wireless/p54/txrx.c
index 2b97a89,d5c12bc..0000000
--- a/drivers/net/wireless/p54/txrx.c
+++ b/drivers/net/wireless/p54/txrx.c
@@@ -19,7 -19,7 +19,8 @@@
#include <linux/init.h>
#include <linux/firmware.h>
#include <linux/etherdevice.h>
+ #include <linux/export.h>
+#include <asm/div64.h>
#include <net/mac80211.h>
^ permalink raw reply
* Re: [PATCH -next] qdio: add missing export.h include
From: Heiko Carstens @ 2011-09-28 6:34 UTC (permalink / raw)
To: Paul Gortmaker; +Cc: linux-next, Frank Blaschka, Jan Glauber
In-Reply-To: <4E824F3A.6070302@windriver.com>
On Tue, Sep 27, 2011 at 06:33:30PM -0400, Paul Gortmaker wrote:
> On 11-09-22 03:21 AM, Heiko Carstens wrote:
> > Fix compile breakage caused by splitting module.h:
> >
> > drivers/s390/cio/qdio_setup.c:31:1:
> > warning: data definition has no type or storage class [enabled by default]
> > drivers/s390/cio/qdio_setup.c:31:1:
> > warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL' [-Wimplicit-int]
>
> Now that I look at this, and the other patch, I'm not
> seeing how this is possible. Unless there is some
> convoluted CPP magic going on, I don't see any instances
> of EXPORT_SYMBOL in qdio_setup.c -- similarly I don't
> see any module_ or MODULE_ references in zfcp_qdio.c
>
> Am I missing something obvious here? The line numbers
> you quote dont match anything meaningful -- so I'm wondering
> if perhaps these changes are meant to be in advance of the
> s390 changes you've got queued in next -- which is fine, but
> it would be nice to have that called out.
Oh right, I should have mentioned this. Sorry!
he two patches fix compile breakages only in -next because of s390
related patches in the scsi and net git trees. Since it's not possible
to add the compile fixes (at least for the new export.h header file)
to the scsi or net trees I just sent these patches towards you...
Thanks,
Heiko
^ permalink raw reply
* linux-next: manual merge of the moduleh tree with the net tree
From: Stephen Rothwell @ 2011-09-28 6:34 UTC (permalink / raw)
To: Paul Gortmaker
Cc: linux-next, linux-kernel, Pavel Roskin, John W. Linville,
David Miller, netdev
Hi Paul,
Today's linux-next merge of the moduleh tree got a conflict in
drivers/net/wireless/ath/ath5k/debug.c between commit 931be260ed54
("ath5k: clean up base.h and its use") from the net tree and commits
9ec3f961e31a ("drivers/net: Add export.h to files using
EXPORT_SYMBOL/THIS_MODULE") and 0cccb17382f1 ("drivers/net: Add
moduleparam.h to drivers as required") from the moduleh tree.
I fixed it up (see below) and can carry the fix as necessary. (I am
pretty sure that this file doesn't need module.h, but not completely).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/net/wireless/ath/ath5k/debug.c
index fce8c90,1051ede..0000000
--- a/drivers/net/wireless/ath/ath5k/debug.c
+++ b/drivers/net/wireless/ath/ath5k/debug.c
@@@ -58,13 -58,9 +58,15 @@@
* THE POSSIBILITY OF SUCH DAMAGES.
*/
+#include <linux/module.h>
+ #include <linux/moduleparam.h>
-#include "base.h"
++#include <linux/export.h>
+#include <linux/seq_file.h>
+#include <linux/list.h>
#include "debug.h"
+#include "ath5k.h"
+#include "reg.h"
+#include "base.h"
static unsigned int ath5k_debug;
module_param_named(debug, ath5k_debug, uint, 0);
^ permalink raw reply
* linux-next: manual merge of the moduleh tree with Linus' tree
From: Stephen Rothwell @ 2011-09-28 6:20 UTC (permalink / raw)
To: Paul Gortmaker; +Cc: linux-next, linux-kernel, Toshiharu Okada
Hi Paul,
Today's linux-next merge of the moduleh tree got a conflict in
drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c between commit
124d770a6459 ("pch_gbe: added the process of FIFO over run error") from
Linus' tree and commit c3c292bec445 ("drivers/net: Add module.h to
drivers who were implicitly using it") from the moduleh tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
index 5dc61b4,848dce1..0000000
--- a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
+++ b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
@@@ -20,6 -20,8 +20,7 @@@
#include "pch_gbe.h"
#include "pch_gbe_api.h"
-#include <linux/prefetch.h>
+ #include <linux/module.h>
#define DRV_VERSION "1.00"
const char pch_driver_version[] = DRV_VERSION;
^ permalink raw reply
* Re: linux-next: manual merge of the net tree with the net-current tree
From: David Miller @ 2011-09-28 5:36 UTC (permalink / raw)
To: sfr; +Cc: netdev, linux-next, linux-kernel, ordex, lindner_marek
In-Reply-To: <20110928125428.70d5cf10ea59f729135d5dff@canb.auug.org.au>
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 28 Sep 2011 12:54:28 +1000
> Today's linux-next merge of the net tree got a conflict in
> net/batman-adv/soft-interface.c between commit 8b267b312df9 ("batman-adv:
> do_bcast has to be true for broadcast packets only") from the net-current
> tree and commit 3d393e473210 ("batman-adv: implement AP-isolation on the
> sender side") from the net tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.
Yep, I'll do a merge soon to fix this up for good, thanks Stephen!
^ permalink raw reply
* Re: linux-next: build failure after merge of the pm tree
From: Ming Lei @ 2011-09-28 5:11 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Rafael J. Wysocki, linux-next, linux-kernel
In-Reply-To: <20110928145144.3d074db9aa9b6f858e0dc4fb@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 2427 bytes --]
Hi Stephen and Rafael,
Sorry, the attachment patch can fix the build failure, which is
caused by unset CONFIG_RUNTIME_PM.
thanks,
--
Ming Lei
On Wed, Sep 28, 2011 at 12:51 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Rafael,
>
> After merging the pm tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
>
> In file included from include/trace/ftrace.h:567:0,
> from include/trace/define_trace.h:96,
> from include/trace/events/rpm.h:99,
> from kernel/trace/rpm-traces.c:15:
> include/trace/events/rpm.h: In function 'ftrace_raw_event_rpm_internal':
> include/trace/events/rpm.h:16:1: error: 'struct dev_pm_info' has no member named 'usage_count'
> include/trace/events/rpm.h:16:1: error: 'struct dev_pm_info' has no member named 'disable_depth'
> include/trace/events/rpm.h:16:1: error: 'struct dev_pm_info' has no member named 'runtime_auto'
> include/trace/events/rpm.h:16:1: error: 'struct dev_pm_info' has no member named 'request_pending'
> include/trace/events/rpm.h:16:1: error: 'struct dev_pm_info' has no member named 'irq_safe'
> include/trace/events/rpm.h:16:1: error: 'struct dev_pm_info' has no member named 'child_count'
> In file included from include/trace/ftrace.h:771:0,
> from include/trace/define_trace.h:96,
> from include/trace/events/rpm.h:99,
> from kernel/trace/rpm-traces.c:15:
> include/trace/events/rpm.h: In function 'perf_trace_rpm_internal':
> include/trace/events/rpm.h:16:1: error: 'struct dev_pm_info' has no member named 'usage_count'
> include/trace/events/rpm.h:16:1: error: 'struct dev_pm_info' has no member named 'disable_depth'
> include/trace/events/rpm.h:16:1: error: 'struct dev_pm_info' has no member named 'runtime_auto'
> include/trace/events/rpm.h:16:1: error: 'struct dev_pm_info' has no member named 'request_pending'
> include/trace/events/rpm.h:16:1: error: 'struct dev_pm_info' has no member named 'irq_safe'
> include/trace/events/rpm.h:16:1: error: 'struct dev_pm_info' has no member named 'child_count'
>
> Presumably caused by commit 53b615ccca56 ("PM / Runtime: Introduce trace
> points for tracing rpm_* functions").
>
> I have used the pm tree from next-20110927 for today.
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
> http://www.canb.auug.org.au/~sfr/
>
[-- Attachment #2: 0001-kernel-trace-rpm-traces.c-fix-build-failure-if-RUNTI.patch --]
[-- Type: text/x-patch, Size: 910 bytes --]
From feb037e957149f0dc405b80b4bb9cdafec6fcb0f Mon Sep 17 00:00:00 2001
From: Ming Lei <ming.lei@canonical.com>
Date: Wed, 28 Sep 2011 13:07:04 +0800
Subject: [PATCH] kernel/trace/rpm-traces.c: fix build failure if RUNTIME_PM
unset
Signed-off-by: Ming Lei <ming.lei@canonical.com>
---
kernel/trace/rpm-traces.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/kernel/trace/rpm-traces.c b/kernel/trace/rpm-traces.c
index 998949e..c161c5e 100644
--- a/kernel/trace/rpm-traces.c
+++ b/kernel/trace/rpm-traces.c
@@ -11,6 +11,7 @@
#include <linux/module.h>
#include <linux/usb.h>
+#ifdef CONFIG_PM_RUNTIME
#define CREATE_TRACE_POINTS
#include <trace/events/rpm.h>
@@ -18,4 +19,5 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(rpm_return_int);
EXPORT_TRACEPOINT_SYMBOL_GPL(rpm_idle);
EXPORT_TRACEPOINT_SYMBOL_GPL(rpm_suspend);
EXPORT_TRACEPOINT_SYMBOL_GPL(rpm_resume);
+#endif
--
1.7.5.4
^ permalink raw reply related
* Re: [PATCH -next] qdio: add missing export.h include
From: Stephen Rothwell @ 2011-09-28 4:54 UTC (permalink / raw)
To: Paul Gortmaker; +Cc: Heiko Carstens, linux-next, Frank Blaschka, Jan Glauber
In-Reply-To: <4E824F3A.6070302@windriver.com>
[-- Attachment #1: Type: text/plain, Size: 896 bytes --]
Hi Paul,
On Tue, 27 Sep 2011 18:33:30 -0400 Paul Gortmaker <paul.gortmaker@windriver.com> wrote:
>
> Now that I look at this, and the other patch, I'm not
> seeing how this is possible. Unless there is some
> convoluted CPP magic going on, I don't see any instances
> of EXPORT_SYMBOL in qdio_setup.c -- similarly I don't
> see any module_ or MODULE_ references in zfcp_qdio.c
>
> Am I missing something obvious here? The line numbers
> you quote dont match anything meaningful -- so I'm wondering
> if perhaps these changes are meant to be in advance of the
> s390 changes you've got queued in next -- which is fine, but
> it would be nice to have that called out.
There is a patch in the net tree in linux-next that adds two
EXPORT_SYMBOL_GPLs to qdio_setup.c.
--
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 pm tree
From: Stephen Rothwell @ 2011-09-28 4:51 UTC (permalink / raw)
To: Rafael J. Wysocki; +Cc: linux-next, linux-kernel, Ming Lei
[-- Attachment #1: Type: text/plain, Size: 2127 bytes --]
Hi Rafael,
After merging the pm tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:
In file included from include/trace/ftrace.h:567:0,
from include/trace/define_trace.h:96,
from include/trace/events/rpm.h:99,
from kernel/trace/rpm-traces.c:15:
include/trace/events/rpm.h: In function 'ftrace_raw_event_rpm_internal':
include/trace/events/rpm.h:16:1: error: 'struct dev_pm_info' has no member named 'usage_count'
include/trace/events/rpm.h:16:1: error: 'struct dev_pm_info' has no member named 'disable_depth'
include/trace/events/rpm.h:16:1: error: 'struct dev_pm_info' has no member named 'runtime_auto'
include/trace/events/rpm.h:16:1: error: 'struct dev_pm_info' has no member named 'request_pending'
include/trace/events/rpm.h:16:1: error: 'struct dev_pm_info' has no member named 'irq_safe'
include/trace/events/rpm.h:16:1: error: 'struct dev_pm_info' has no member named 'child_count'
In file included from include/trace/ftrace.h:771:0,
from include/trace/define_trace.h:96,
from include/trace/events/rpm.h:99,
from kernel/trace/rpm-traces.c:15:
include/trace/events/rpm.h: In function 'perf_trace_rpm_internal':
include/trace/events/rpm.h:16:1: error: 'struct dev_pm_info' has no member named 'usage_count'
include/trace/events/rpm.h:16:1: error: 'struct dev_pm_info' has no member named 'disable_depth'
include/trace/events/rpm.h:16:1: error: 'struct dev_pm_info' has no member named 'runtime_auto'
include/trace/events/rpm.h:16:1: error: 'struct dev_pm_info' has no member named 'request_pending'
include/trace/events/rpm.h:16:1: error: 'struct dev_pm_info' has no member named 'irq_safe'
include/trace/events/rpm.h:16:1: error: 'struct dev_pm_info' has no member named 'child_count'
Presumably caused by commit 53b615ccca56 ("PM / Runtime: Introduce trace
points for tracing rpm_* functions").
I have used the pm tree from next-20110927 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
* linux-next: manual merge of the wireless tree with the wireless-current tree
From: Stephen Rothwell @ 2011-09-28 3:19 UTC (permalink / raw)
To: John W. Linville; +Cc: linux-next, linux-kernel, Jouni Malinen
Hi John,
Today's linux-next merge of the wireless tree got a conflict in
net/wireless/nl80211.c between commit 1b9ca0272ffa ("cfg80211: Fix
validation of AKM suites") from the wireless-current tree and commit
6d30240e3d68 ("cfg80211: Remove strict validation of AKM suites") from
the wireless tree.
The latter seems to make the former partly unneccessary, so I used that
(see below).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc net/wireless/nl80211.c
index 1b79a56,bf3fc4f..0000000
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@@ -4304,14 -4300,7 +4300,10 @@@ static int nl80211_crypto_settings(stru
if (len % sizeof(u32))
return -EINVAL;
+ if (settings->n_akm_suites > NL80211_MAX_NR_AKM_SUITES)
+ return -EINVAL;
+
memcpy(settings->akm_suites, data, len);
-
- for (i = 0; i < settings->n_akm_suites; i++)
- if (!nl80211_valid_akm_suite(settings->akm_suites[i]))
- return -EINVAL;
}
return 0;
^ permalink raw reply
* Re: linux-next: manual merge of the staging tree with the v4l-dvb tree
From: Greg KH @ 2011-09-27 14:18 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, Paul Gortmaker, Igor M. Liplianin,
Mauro Carvalho Chehab
In-Reply-To: <20110927161055.05bbb0586fffbfbb2307f30b@canb.auug.org.au>
On Tue, Sep 27, 2011 at 04:10:55PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in
> drivers/misc/altera-stapl/altera.c between commit cff4fa8415a3 ("[media]
> altera-stapl: it is time to move out from staging") from the v4l-dvb tree
> and commit 99c978529a40 ("staging: Add module.h to drivers/staging
> users") from the staging tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.
Looks fine, thanks.
greg k-h
^ permalink raw reply
* linux-next: manual merge of the net tree with the net-current tree
From: Stephen Rothwell @ 2011-09-28 2:54 UTC (permalink / raw)
To: David Miller, netdev
Cc: linux-next, linux-kernel, Antonio Quartulli, Marek Lindner
Hi all,
Today's linux-next merge of the net tree got a conflict in
net/batman-adv/soft-interface.c between commit 8b267b312df9 ("batman-adv:
do_bcast has to be true for broadcast packets only") from the net-current
tree and commit 3d393e473210 ("batman-adv: implement AP-isolation on the
sender side") from the net tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc net/batman-adv/soft-interface.c
index 05dd351,aceeabc..0000000
--- a/net/batman-adv/soft-interface.c
+++ b/net/batman-adv/soft-interface.c
@@@ -595,11 -596,12 +596,12 @@@ static int interface_tx(struct sk_buff
goto dropped;
/* Register the client MAC in the transtable */
- tt_local_add(soft_iface, ethhdr->h_source);
+ tt_local_add(soft_iface, ethhdr->h_source, skb->skb_iif);
- orig_node = transtable_search(bat_priv, ethhdr->h_dest);
+ orig_node = transtable_search(bat_priv, ethhdr->h_source,
+ ethhdr->h_dest);
- if (is_multicast_ether_addr(ethhdr->h_dest) ||
- (orig_node && orig_node->gw_flags)) {
+ do_bcast = is_multicast_ether_addr(ethhdr->h_dest);
+ if (do_bcast || (orig_node && orig_node->gw_flags)) {
ret = gw_is_target(bat_priv, skb, orig_node);
if (ret < 0)
^ permalink raw reply
* Re: linux-next: New location for the module.h split content
From: Stephen Rothwell @ 2011-09-28 1:13 UTC (permalink / raw)
To: Paul Gortmaker; +Cc: linux-next, LKML
In-Reply-To: <20110928003903.GA16710@windriver.com>
[-- Attachment #1: Type: text/plain, Size: 698 bytes --]
Hi Paul,
On Tue, 27 Sep 2011 20:39:04 -0400 Paul Gortmaker <paul.gortmaker@windriver.com> wrote:
>
> I've placed the module split content for linux-next on one of
> our local servers as per the pull request info below, to serve
> as an alternate source while kernel.org is down.
>
> --------
>
> The following changes since commit b6fd41e29dea9c6753b1843a77e50433e6123bcb:
>
> Linux 3.1-rc6 (2011-09-12 14:02:02 -0700)
>
> are available in the git repository at:
> git://openlinux.windriver.com/people/paulg/linux-next for-sfr
I will switch to this from 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: linux-next: manual merge of the akpm tree with the tree
From: Stephen Rothwell @ 2011-09-27 23:03 UTC (permalink / raw)
To: Vaibhav Nagarnaik
Cc: Andrew Morton, linux-next, linux-kernel, Frederic Weisbecker,
Paul E. McKenney
In-Reply-To: <CAL26m8JbvOi05irJdhtsas2=PWdy4V+hkTYHp029RAvDGnUZgA@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 472 bytes --]
Hi,
On Tue, 27 Sep 2011 09:52:27 -0700 Vaibhav Nagarnaik <vnagarnaik@google.com> wrote:
>
> Looks good to me. Do I need to provide Acked-by?
Not to me, that is just a merge fixup patch in linux-next. It is not
permanent until Andrew or Linus actually take the original patches and
merge them.
But it good to know that it is probablt correct, thanks.
--
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: [BUG?] anyone aware of pagecache issues with 2.6.27?
From: Chris Friesen @ 2011-09-27 22:58 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next
In-Reply-To: <20110928085519.ba69b44b767b3f201dcbc366@canb.auug.org.au>
On 09/27/2011 04:55 PM, Stephen Rothwell wrote:
> Hi Chris,
>
> On Tue, 27 Sep 2011 09:46:41 -0600 Chris Friesen<chris.friesen@genband.com> wrote:
>>
>> I realize this is a long shot, but I figure it's worth a try.
>
> You would be much better off asking this on linux-kernel rather than linux-next.
No kidding...obviously didn't catch the erroneous auto-complete. Sorry
for the typo.
Chris
--
Chris Friesen
Software Developer
GENBAND
chris.friesen@genband.com
www.genband.com
^ permalink raw reply
* Re: [PATCH -next] rtlwifi: rtl8192c: Add includes of export.h
From: Paul Gortmaker @ 2011-09-27 22:58 UTC (permalink / raw)
To: Larry Finger; +Cc: linux-wireless, linux-kernel, linux-next, sfr, akpm
In-Reply-To: <4e7a6393.eQ0IEnMVbVlQIbx0%Larry.Finger@lwfinger.net>
On 11-09-21 06:22 PM, Larry Finger wrote:
> With the split of include/linux/module.h into two parts, several files in
> drivers rtlwifi and rtl8192c need to include the new file.
>
> Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
> ---
>
> Paul,
>
> At Randy Dunlap's suggestion, I am sending this to you in hopes that
> I can save you some time. I think I found all the routines that will have
> a problem, but as these patches do not compile, I cannot be sure.
Hi Larry -- thanks for the patch, but...
>
> Larry
> ---
>
> Index: wireless-testing-new/drivers/net/wireless/rtlwifi/base.c
> ===================================================================
> --- wireless-testing-new.orig/drivers/net/wireless/rtlwifi/base.c
> +++ wireless-testing-new/drivers/net/wireless/rtlwifi/base.c
> @@ -30,6 +30,7 @@
> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
>
> #include <linux/ip.h>
> +#include <linux/export.h>
This one needs module.h (which it has in my current tree) because it
calls module_init and module_exit. All the other ones in your patch
match what I have in tree already though, so that is a good double
check to have. There are some other ones that I found through many
randconfig builds that aren't in your patch. Here is the current list
in my tree:
~/git/module.h/linux-2.6.git$ git diff ^v3.1-rc6 HEAD drivers/net/wireless/rtlwifi |diffstat
base.c | 1 +
cam.c | 1 +
efuse.c | 1 +
pci.c | 1 +
ps.c | 1 +
rtl8192c/dm_common.c | 1 +
rtl8192c/fw_common.c | 1 +
rtl8192c/main.c | 1 +
rtl8192c/phy_common.c | 1 +
rtl8192ce/sw.c | 1 +
rtl8192cu/sw.c | 1 +
rtl8192de/sw.c | 1 +
rtl8192se/sw.c | 1 +
usb.c | 1 +
14 files changed, 14 insertions(+)
Thanks,
Paul.
> #include "wifi.h"
> #include "rc.h"
> #include "base.h"
> Index: wireless-testing-new/drivers/net/wireless/rtlwifi/cam.c
> ===================================================================
> --- wireless-testing-new.orig/drivers/net/wireless/rtlwifi/cam.c
> +++ wireless-testing-new/drivers/net/wireless/rtlwifi/cam.c
> @@ -29,6 +29,8 @@
>
> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
>
> +#include <linux/export.h>
Have this already.
> +
> #include "wifi.h"
> #include "cam.h"
>
> Index: wireless-testing-new/drivers/net/wireless/rtlwifi/efuse.c
> ===================================================================
> --- wireless-testing-new.orig/drivers/net/wireless/rtlwifi/efuse.c
> +++ wireless-testing-new/drivers/net/wireless/rtlwifi/efuse.c
> @@ -27,6 +27,8 @@
> *
> *****************************************************************************/
>
> +#include <linux/export.h>
> +
> #include "wifi.h"
> #include "efuse.h"
>
> Index: wireless-testing-new/drivers/net/wireless/rtlwifi/pci.c
> ===================================================================
> --- wireless-testing-new.orig/drivers/net/wireless/rtlwifi/pci.c
> +++ wireless-testing-new/drivers/net/wireless/rtlwifi/pci.c
> @@ -27,6 +27,8 @@
> *
> *****************************************************************************/
>
> +#include <linux/export.h>
> +
> #include "core.h"
> #include "wifi.h"
> #include "pci.h"
> Index: wireless-testing-new/drivers/net/wireless/rtlwifi/ps.c
> ===================================================================
> --- wireless-testing-new.orig/drivers/net/wireless/rtlwifi/ps.c
> +++ wireless-testing-new/drivers/net/wireless/rtlwifi/ps.c
> @@ -27,6 +27,8 @@
> *
> *****************************************************************************/
>
> +#include <linux/export.h>
> +
> #include "wifi.h"
> #include "base.h"
> #include "ps.h"
> Index: wireless-testing-new/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c
> ===================================================================
> --- wireless-testing-new.orig/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c
> +++ wireless-testing-new/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c
> @@ -27,6 +27,8 @@
> *
> *****************************************************************************/
>
> +#include <linux/export.h>
> +
> #include "dm_common.h"
> #include "phy_common.h"
> #include "../pci.h"
> Index: wireless-testing-new/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c
> ===================================================================
> --- wireless-testing-new.orig/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c
> +++ wireless-testing-new/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c
> @@ -30,6 +30,8 @@
> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
>
> #include <linux/firmware.h>
> +#include <linux/export.h>
> +
> #include "../wifi.h"
> #include "../pci.h"
> #include "../base.h"
> Index: wireless-testing-new/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c
> ===================================================================
> --- wireless-testing-new.orig/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c
> +++ wireless-testing-new/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c
> @@ -27,6 +27,8 @@
> *
> *****************************************************************************/
>
> +#include <linux/export.h>
> +
> #include "../wifi.h"
> #include "../rtl8192ce/reg.h"
> #include "../rtl8192ce/def.h"
> Index: wireless-testing-new/drivers/net/wireless/rtlwifi/usb.c
> ===================================================================
> --- wireless-testing-new.orig/drivers/net/wireless/rtlwifi/usb.c
> +++ wireless-testing-new/drivers/net/wireless/rtlwifi/usb.c
> @@ -28,6 +28,8 @@
> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
>
> #include <linux/usb.h>
> +#include <linux/export.h>
> +
> #include "core.h"
> #include "wifi.h"
> #include "usb.h"
^ permalink raw reply
* Re: [BUG?] anyone aware of pagecache issues with 2.6.27?
From: Stephen Rothwell @ 2011-09-27 22:55 UTC (permalink / raw)
To: Chris Friesen; +Cc: linux-next
In-Reply-To: <4E81EFE1.9090000@genband.com>
[-- Attachment #1: Type: text/plain, Size: 359 bytes --]
Hi Chris,
On Tue, 27 Sep 2011 09:46:41 -0600 Chris Friesen <chris.friesen@genband.com> wrote:
>
> I realize this is a long shot, but I figure it's worth a try.
You would be much better off asking this on linux-kernel rather than linux-next.
--
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 -next] qdio: add missing export.h include
From: Paul Gortmaker @ 2011-09-27 22:33 UTC (permalink / raw)
To: Heiko Carstens; +Cc: linux-next, Frank Blaschka, Jan Glauber
In-Reply-To: <1316676108-5729-1-git-send-email-heiko.carstens@de.ibm.com>
On 11-09-22 03:21 AM, Heiko Carstens wrote:
> Fix compile breakage caused by splitting module.h:
>
> drivers/s390/cio/qdio_setup.c:31:1:
> warning: data definition has no type or storage class [enabled by default]
> drivers/s390/cio/qdio_setup.c:31:1:
> warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL' [-Wimplicit-int]
Now that I look at this, and the other patch, I'm not
seeing how this is possible. Unless there is some
convoluted CPP magic going on, I don't see any instances
of EXPORT_SYMBOL in qdio_setup.c -- similarly I don't
see any module_ or MODULE_ references in zfcp_qdio.c
Am I missing something obvious here? The line numbers
you quote dont match anything meaningful -- so I'm wondering
if perhaps these changes are meant to be in advance of the
s390 changes you've got queued in next -- which is fine, but
it would be nice to have that called out.
Thanks,
Paul.
>
> Cc: Frank Blaschka <blaschka@linux.vnet.ibm.com>
> Cc: Jan Glauber <jang@linux.vnet.ibm.com>
> Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
> ---
> drivers/s390/cio/qdio_setup.c | 1 +
> 1 files changed, 1 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/s390/cio/qdio_setup.c b/drivers/s390/cio/qdio_setup.c
> index d9a46a4..25f4988 100644
> --- a/drivers/s390/cio/qdio_setup.c
> +++ b/drivers/s390/cio/qdio_setup.c
> @@ -7,6 +7,7 @@
> * Author(s): Jan Glauber <jang@linux.vnet.ibm.com>
> */
> #include <linux/kernel.h>
> +#include <linux/export.h>
> #include <linux/slab.h>
> #include <asm/qdio.h>
>
^ permalink raw reply
* Re: [PATCH -next] qdio: add missing export.h include
From: Paul Gortmaker @ 2011-09-27 22:17 UTC (permalink / raw)
To: Heiko Carstens; +Cc: linux-next, Frank Blaschka, Jan Glauber
In-Reply-To: <1316676108-5729-1-git-send-email-heiko.carstens@de.ibm.com>
On 11-09-22 03:21 AM, Heiko Carstens wrote:
> Fix compile breakage caused by splitting module.h:
>
> drivers/s390/cio/qdio_setup.c:31:1:
> warning: data definition has no type or storage class [enabled by default]
> drivers/s390/cio/qdio_setup.c:31:1:
> warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL' [-Wimplicit-int]
Thanks, I've squashed this into what contained the other
s390 changes from you, which now touches the following:
arch/s390/crypto/sha_common.c | 1 +
arch/s390/mm/init.c | 1 +
drivers/s390/char/fs3270.c | 1 +
drivers/s390/char/sclp_cpi_sys.c | 1 +
drivers/s390/char/vmcp.c | 1 +
drivers/s390/char/vmur.c | 1 +
drivers/s390/cio/chp.c | 2 ++
drivers/s390/cio/qdio_debug.c | 2 ++
drivers/s390/cio/qdio_setup.c | 1 +
drivers/s390/kvm/kvm_virtio.c | 1 +
drivers/s390/scsi/zfcp_aux.c | 1 +
drivers/s390/scsi/zfcp_ccw.c | 1 +
drivers/s390/scsi/zfcp_dbf.c | 1 +
drivers/s390/scsi/zfcp_scsi.c | 1 +
14 files changed, 16 insertions(+)
Paul.
>
> Cc: Frank Blaschka <blaschka@linux.vnet.ibm.com>
> Cc: Jan Glauber <jang@linux.vnet.ibm.com>
> Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
> ---
> drivers/s390/cio/qdio_setup.c | 1 +
> 1 files changed, 1 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/s390/cio/qdio_setup.c b/drivers/s390/cio/qdio_setup.c
> index d9a46a4..25f4988 100644
> --- a/drivers/s390/cio/qdio_setup.c
> +++ b/drivers/s390/cio/qdio_setup.c
> @@ -7,6 +7,7 @@
> * Author(s): Jan Glauber <jang@linux.vnet.ibm.com>
> */
> #include <linux/kernel.h>
> +#include <linux/export.h>
> #include <linux/slab.h>
> #include <asm/qdio.h>
>
^ 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