* Re: [PATCH] linux-next: 20090926 - drop autoconf.h from DRBD driver
From: Stephen Rothwell @ 2009-09-27 2:53 UTC (permalink / raw)
To: Greg KH, Philipp Reisner
Cc: Kamalesh Babulal, linux-next, LKML, linux-kbuild, drbd-dev,
Sam Ravnborg
In-Reply-To: <20090926200839.GA5220@merkur.ravnborg.org>
Hi Greg, Philipp,
On Sat, 26 Sep 2009 22:08:39 +0200 Sam Ravnborg <sam@ravnborg.org> wrote:
>
> On Sat, Sep 26, 2009 at 11:01:43PM +0530, Kamalesh Babulal wrote:
> >
> > next-20090926 allyesconfig build breaks on powerpc,
> >
> > drivers/block/drbd/drbd_proc.c:26:28: error: linux/autoconf.h: No such file or directory
> > make[3]: *** [drivers/block/drbd/drbd_proc.o] Error 1
> >
> > dropping autoconf.h from drbd_proc.c helps. The cleanup patch drops the
> > unneeded include autoconf.h.
> >
> > Signed-off-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
>
> I only checked upstream - so this is no big suprise.
> As there is no need to explicitly include autoconf.h this
> change should be included by the drdb folks even if the
> stuff I have does not hit upstream.
Maybe we should let them know (cc'd).
> Can I ask you to audit the rest of -next for similar issues.
> A 'git grep "autoconf\.h"' should be a qucik way to find other
> spots to fix up.
$ git grep -l -w autoconf.h next-20090926
next-20090926:Documentation/dontdiff
next-20090926:Documentation/kbuild/kconfig.txt
next-20090926:Makefile
next-20090926:arch/m68k/kernel/head.S
next-20090926:drivers/block/drbd/drbd_main.c
next-20090926:drivers/block/drbd/drbd_nl.c
next-20090926:drivers/block/drbd/drbd_proc.c
next-20090926:drivers/block/drbd/drbd_receiver.c
next-20090926:drivers/block/drbd/drbd_req.c
next-20090926:drivers/block/drbd/drbd_req.h
next-20090926:drivers/block/drbd/drbd_worker.c
next-20090926:drivers/staging/cowloop/cowloop.c
next-20090926:drivers/staging/iio/ring_sw.h
next-20090926:scripts/basic/fixdep.c
next-20090926:scripts/kconfig/confdata.c
next-20090926:scripts/mkcompile_h
Of these, only the dives/block/drbd and drivers/staging ones are actual
includes.
So for Greg and Philipp, Sam has added a patch that moves autoconf.h.
There is no need to include it anywhere anyway, so the above files need
cleaning up. I have appended Kamalesh's patch below. Greg, you may have
to write your own :-)
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
Date: Sat, 26 Sep 2009 23:01:43 +0530
From: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
To: sam@ravnborg.org
Cc: linux-next@vger.kernel.org, LKML <linux-kernel@vger.kernel.org>,
linux-kbuild@vger.kernel.org, sfr@canb.auug.org.au
Subject: [PATCH] linux-next: 20090926 - drop autoconf.h from DRBD driver
Hi Sam,
next-20090926 allyesconfig build breaks on powerpc,
drivers/block/drbd/drbd_proc.c:26:28: error: linux/autoconf.h: No such file or directory
make[3]: *** [drivers/block/drbd/drbd_proc.o] Error 1
dropping autoconf.h from drbd_proc.c helps. The cleanup patch drops the
unneeded include autoconf.h.
Signed-off-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
--
drivers/block/drbd/drbd_main.c | 1 -
drivers/block/drbd/drbd_nl.c | 1 -
drivers/block/drbd/drbd_proc.c | 1 -
drivers/block/drbd/drbd_receiver.c | 1 -
drivers/block/drbd/drbd_req.c | 1 -
drivers/block/drbd/drbd_req.h | 1 -
drivers/block/drbd/drbd_worker.c | 1 -
drivers/staging/cowloop/cowloop.c | 4 ----
drivers/staging/iio/ring_sw.h | 1 -
9 files changed, 0 insertions(+), 12 deletions(-)
diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
index edf0b80..80273f2 100644
--- a/drivers/block/drbd/drbd_main.c
+++ b/drivers/block/drbd/drbd_main.c
@@ -26,7 +26,6 @@
*/
-#include <linux/autoconf.h>
#include <linux/module.h>
#include <linux/version.h>
#include <linux/drbd.h>
diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c
index 1927ace..cfde310 100644
--- a/drivers/block/drbd/drbd_nl.c
+++ b/drivers/block/drbd/drbd_nl.c
@@ -23,7 +23,6 @@
*/
-#include <linux/autoconf.h>
#include <linux/module.h>
#include <linux/drbd.h>
#include <linux/in.h>
diff --git a/drivers/block/drbd/drbd_proc.c b/drivers/block/drbd/drbd_proc.c
index 98fcb74..bdd0b49 100644
--- a/drivers/block/drbd/drbd_proc.c
+++ b/drivers/block/drbd/drbd_proc.c
@@ -23,7 +23,6 @@
*/
-#include <linux/autoconf.h>
#include <linux/module.h>
#include <asm/uaccess.h>
diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
index 63686c4..2f81821 100644
--- a/drivers/block/drbd/drbd_receiver.c
+++ b/drivers/block/drbd/drbd_receiver.c
@@ -23,7 +23,6 @@
*/
-#include <linux/autoconf.h>
#include <linux/module.h>
#include <asm/uaccess.h>
diff --git a/drivers/block/drbd/drbd_req.c b/drivers/block/drbd/drbd_req.c
index 0656cf1..1aaa397 100644
--- a/drivers/block/drbd/drbd_req.c
+++ b/drivers/block/drbd/drbd_req.c
@@ -23,7 +23,6 @@
*/
-#include <linux/autoconf.h>
#include <linux/module.h>
#include <linux/slab.h>
diff --git a/drivers/block/drbd/drbd_req.h b/drivers/block/drbd/drbd_req.h
index d37ab57..f22c1bc 100644
--- a/drivers/block/drbd/drbd_req.h
+++ b/drivers/block/drbd/drbd_req.h
@@ -25,7 +25,6 @@
#ifndef _DRBD_REQ_H
#define _DRBD_REQ_H
-#include <linux/autoconf.h>
#include <linux/module.h>
#include <linux/slab.h>
diff --git a/drivers/block/drbd/drbd_worker.c b/drivers/block/drbd/drbd_worker.c
index 212e954..34a4b3e 100644
--- a/drivers/block/drbd/drbd_worker.c
+++ b/drivers/block/drbd/drbd_worker.c
@@ -23,7 +23,6 @@
*/
-#include <linux/autoconf.h>
#include <linux/module.h>
#include <linux/version.h>
#include <linux/drbd.h>
diff --git a/drivers/staging/cowloop/cowloop.c b/drivers/staging/cowloop/cowloop.c
index a71c743..a21b9b4 100644
--- a/drivers/staging/cowloop/cowloop.c
+++ b/drivers/staging/cowloop/cowloop.c
@@ -237,10 +237,6 @@ char revision[] = "$Revision: 3.1 $"; /* cowlo_init_module() has
#endif
#include <linux/types.h>
-#include <linux/autoconf.h>
-#ifndef AUTOCONF_INCLUDED
-#include <linux/config.h>
-#endif
#include <linux/module.h>
#include <linux/version.h>
#include <linux/moduleparam.h>
diff --git a/drivers/staging/iio/ring_sw.h b/drivers/staging/iio/ring_sw.h
index ae70ee0..4b0de7c 100644
--- a/drivers/staging/iio/ring_sw.h
+++ b/drivers/staging/iio/ring_sw.h
@@ -29,7 +29,6 @@
* driver requests - some may support multiple options */
-#include <linux/autoconf.h>
#include "iio.h"
#include "ring_generic.h"
^ permalink raw reply related
* Re: linux-next: acpi tree build failure
From: Crane Cai @ 2009-09-27 1:27 UTC (permalink / raw)
To: Bjorn Helgaas; +Cc: Stephen Rothwell, Len Brown, linux-next, linux-kernel
In-Reply-To: <1253934703.16789.21.camel@dc7800.home>
Hi Bjorn,
On Fri, Sep 25, 2009 at 09:11:43PM -0600, Bjorn Helgaas wrote:
> On Sat, 2009-09-26 at 12:15 +1000, Stephen Rothwell wrote:
> > Hi Len,
> >
> > Today's linux-next build (x86_64 allmodconfig) failed like this:
> >
> > drivers/i2c/busses/i2c-scmi.c: In function 'acpi_smbus_cmi_add':
> > drivers/i2c/busses/i2c-scmi.c:374: error: implicit declaration of function 'acpi_device_uid'
> > drivers/i2c/busses/i2c-scmi.c:374: warning: format '%s' expects type 'char *', but argument 5 has type 'int'
> >
> > Caused by commit 6622d8cee73a26bce958484065c8f0e704911a62 ("ACPI: remove
> > acpi_device_uid() and related stuff") interacting with commit
> > dc9854212e0d7318d7133697906d98b78f3088b6 ("i2c: Add driver for SMBus
> > Control Method Interface") recently added to Linus' tree.
> >
> > I have used the version of the acpi tree from next-20090925 for today.
>
> I think we should use the following patch to remove the usage of
> acpi_device_uid(). Crane, do you agree, or is there some special
> reason you need it here?
I agree.
>
>
>
--
Best Regards,
- Crane
^ permalink raw reply
* Re: [PATCH] linux-next: 20090926 - drop autoconf.h from DRBD driver
From: Sam Ravnborg @ 2009-09-26 20:08 UTC (permalink / raw)
To: Kamalesh Babulal; +Cc: linux-next, LKML, linux-kbuild, sfr
In-Reply-To: <20090926173143.GA5041@linux.vnet.ibm.com>
On Sat, Sep 26, 2009 at 11:01:43PM +0530, Kamalesh Babulal wrote:
> Hi Sam,
>
> next-20090926 allyesconfig build breaks on powerpc,
>
> drivers/block/drbd/drbd_proc.c:26:28: error: linux/autoconf.h: No such file or directory
> make[3]: *** [drivers/block/drbd/drbd_proc.o] Error 1
>
> dropping autoconf.h from drbd_proc.c helps. The cleanup patch drops the
> unneeded include autoconf.h.
>
> Signed-off-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
I only checked upstream - so this is no big suprise.
As there is no need to explicitly include autoconf.h this
change should be included by the drdb folks even if the
stuff I have does not hit upstream.
Can I ask you to audit the rest of -next for similar issues.
A 'git grep "autoconf\.h"' should be a qucik way to find other
spots to fix up.
Patch is:
Acked-by: Sam Ravnborg <sam@ravnborg.org>
Sam
> --
> drivers/block/drbd/drbd_main.c | 1 -
> drivers/block/drbd/drbd_nl.c | 1 -
> drivers/block/drbd/drbd_proc.c | 1 -
> drivers/block/drbd/drbd_receiver.c | 1 -
> drivers/block/drbd/drbd_req.c | 1 -
> drivers/block/drbd/drbd_req.h | 1 -
> drivers/block/drbd/drbd_worker.c | 1 -
> drivers/staging/cowloop/cowloop.c | 4 ----
> drivers/staging/iio/ring_sw.h | 1 -
> 9 files changed, 0 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
> index edf0b80..80273f2 100644
> --- a/drivers/block/drbd/drbd_main.c
> +++ b/drivers/block/drbd/drbd_main.c
> @@ -26,7 +26,6 @@
>
> */
>
> -#include <linux/autoconf.h>
> #include <linux/module.h>
> #include <linux/version.h>
> #include <linux/drbd.h>
> diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c
> index 1927ace..cfde310 100644
> --- a/drivers/block/drbd/drbd_nl.c
> +++ b/drivers/block/drbd/drbd_nl.c
> @@ -23,7 +23,6 @@
>
> */
>
> -#include <linux/autoconf.h>
> #include <linux/module.h>
> #include <linux/drbd.h>
> #include <linux/in.h>
> diff --git a/drivers/block/drbd/drbd_proc.c b/drivers/block/drbd/drbd_proc.c
> index 98fcb74..bdd0b49 100644
> --- a/drivers/block/drbd/drbd_proc.c
> +++ b/drivers/block/drbd/drbd_proc.c
> @@ -23,7 +23,6 @@
>
> */
>
> -#include <linux/autoconf.h>
> #include <linux/module.h>
>
> #include <asm/uaccess.h>
> diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
> index 63686c4..2f81821 100644
> --- a/drivers/block/drbd/drbd_receiver.c
> +++ b/drivers/block/drbd/drbd_receiver.c
> @@ -23,7 +23,6 @@
> */
>
>
> -#include <linux/autoconf.h>
> #include <linux/module.h>
>
> #include <asm/uaccess.h>
> diff --git a/drivers/block/drbd/drbd_req.c b/drivers/block/drbd/drbd_req.c
> index 0656cf1..1aaa397 100644
> --- a/drivers/block/drbd/drbd_req.c
> +++ b/drivers/block/drbd/drbd_req.c
> @@ -23,7 +23,6 @@
>
> */
>
> -#include <linux/autoconf.h>
> #include <linux/module.h>
>
> #include <linux/slab.h>
> diff --git a/drivers/block/drbd/drbd_req.h b/drivers/block/drbd/drbd_req.h
> index d37ab57..f22c1bc 100644
> --- a/drivers/block/drbd/drbd_req.h
> +++ b/drivers/block/drbd/drbd_req.h
> @@ -25,7 +25,6 @@
> #ifndef _DRBD_REQ_H
> #define _DRBD_REQ_H
>
> -#include <linux/autoconf.h>
> #include <linux/module.h>
>
> #include <linux/slab.h>
> diff --git a/drivers/block/drbd/drbd_worker.c b/drivers/block/drbd/drbd_worker.c
> index 212e954..34a4b3e 100644
> --- a/drivers/block/drbd/drbd_worker.c
> +++ b/drivers/block/drbd/drbd_worker.c
> @@ -23,7 +23,6 @@
>
> */
>
> -#include <linux/autoconf.h>
> #include <linux/module.h>
> #include <linux/version.h>
> #include <linux/drbd.h>
> diff --git a/drivers/staging/cowloop/cowloop.c b/drivers/staging/cowloop/cowloop.c
> index a71c743..a21b9b4 100644
> --- a/drivers/staging/cowloop/cowloop.c
> +++ b/drivers/staging/cowloop/cowloop.c
> @@ -237,10 +237,6 @@ char revision[] = "$Revision: 3.1 $"; /* cowlo_init_module() has
> #endif
>
> #include <linux/types.h>
> -#include <linux/autoconf.h>
> -#ifndef AUTOCONF_INCLUDED
> -#include <linux/config.h>
> -#endif
> #include <linux/module.h>
> #include <linux/version.h>
> #include <linux/moduleparam.h>
> diff --git a/drivers/staging/iio/ring_sw.h b/drivers/staging/iio/ring_sw.h
> index ae70ee0..4b0de7c 100644
> --- a/drivers/staging/iio/ring_sw.h
> +++ b/drivers/staging/iio/ring_sw.h
> @@ -29,7 +29,6 @@
> * driver requests - some may support multiple options */
>
>
> -#include <linux/autoconf.h>
> #include "iio.h"
> #include "ring_generic.h"
>
>
> Kamalesh
>
>
^ permalink raw reply
* [PATCH] linux-next: 20090926 - drop autoconf.h from DRBD driver
From: Kamalesh Babulal @ 2009-09-26 17:31 UTC (permalink / raw)
To: sam; +Cc: linux-next, LKML, linux-kbuild, sfr
In-Reply-To: <20090926152800.a6568e53.sfr@canb.auug.org.au>
Hi Sam,
next-20090926 allyesconfig build breaks on powerpc,
drivers/block/drbd/drbd_proc.c:26:28: error: linux/autoconf.h: No such file or directory
make[3]: *** [drivers/block/drbd/drbd_proc.o] Error 1
dropping autoconf.h from drbd_proc.c helps. The cleanup patch drops the
unneeded include autoconf.h.
Signed-off-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
--
drivers/block/drbd/drbd_main.c | 1 -
drivers/block/drbd/drbd_nl.c | 1 -
drivers/block/drbd/drbd_proc.c | 1 -
drivers/block/drbd/drbd_receiver.c | 1 -
drivers/block/drbd/drbd_req.c | 1 -
drivers/block/drbd/drbd_req.h | 1 -
drivers/block/drbd/drbd_worker.c | 1 -
drivers/staging/cowloop/cowloop.c | 4 ----
drivers/staging/iio/ring_sw.h | 1 -
9 files changed, 0 insertions(+), 12 deletions(-)
diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
index edf0b80..80273f2 100644
--- a/drivers/block/drbd/drbd_main.c
+++ b/drivers/block/drbd/drbd_main.c
@@ -26,7 +26,6 @@
*/
-#include <linux/autoconf.h>
#include <linux/module.h>
#include <linux/version.h>
#include <linux/drbd.h>
diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c
index 1927ace..cfde310 100644
--- a/drivers/block/drbd/drbd_nl.c
+++ b/drivers/block/drbd/drbd_nl.c
@@ -23,7 +23,6 @@
*/
-#include <linux/autoconf.h>
#include <linux/module.h>
#include <linux/drbd.h>
#include <linux/in.h>
diff --git a/drivers/block/drbd/drbd_proc.c b/drivers/block/drbd/drbd_proc.c
index 98fcb74..bdd0b49 100644
--- a/drivers/block/drbd/drbd_proc.c
+++ b/drivers/block/drbd/drbd_proc.c
@@ -23,7 +23,6 @@
*/
-#include <linux/autoconf.h>
#include <linux/module.h>
#include <asm/uaccess.h>
diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
index 63686c4..2f81821 100644
--- a/drivers/block/drbd/drbd_receiver.c
+++ b/drivers/block/drbd/drbd_receiver.c
@@ -23,7 +23,6 @@
*/
-#include <linux/autoconf.h>
#include <linux/module.h>
#include <asm/uaccess.h>
diff --git a/drivers/block/drbd/drbd_req.c b/drivers/block/drbd/drbd_req.c
index 0656cf1..1aaa397 100644
--- a/drivers/block/drbd/drbd_req.c
+++ b/drivers/block/drbd/drbd_req.c
@@ -23,7 +23,6 @@
*/
-#include <linux/autoconf.h>
#include <linux/module.h>
#include <linux/slab.h>
diff --git a/drivers/block/drbd/drbd_req.h b/drivers/block/drbd/drbd_req.h
index d37ab57..f22c1bc 100644
--- a/drivers/block/drbd/drbd_req.h
+++ b/drivers/block/drbd/drbd_req.h
@@ -25,7 +25,6 @@
#ifndef _DRBD_REQ_H
#define _DRBD_REQ_H
-#include <linux/autoconf.h>
#include <linux/module.h>
#include <linux/slab.h>
diff --git a/drivers/block/drbd/drbd_worker.c b/drivers/block/drbd/drbd_worker.c
index 212e954..34a4b3e 100644
--- a/drivers/block/drbd/drbd_worker.c
+++ b/drivers/block/drbd/drbd_worker.c
@@ -23,7 +23,6 @@
*/
-#include <linux/autoconf.h>
#include <linux/module.h>
#include <linux/version.h>
#include <linux/drbd.h>
diff --git a/drivers/staging/cowloop/cowloop.c b/drivers/staging/cowloop/cowloop.c
index a71c743..a21b9b4 100644
--- a/drivers/staging/cowloop/cowloop.c
+++ b/drivers/staging/cowloop/cowloop.c
@@ -237,10 +237,6 @@ char revision[] = "$Revision: 3.1 $"; /* cowlo_init_module() has
#endif
#include <linux/types.h>
-#include <linux/autoconf.h>
-#ifndef AUTOCONF_INCLUDED
-#include <linux/config.h>
-#endif
#include <linux/module.h>
#include <linux/version.h>
#include <linux/moduleparam.h>
diff --git a/drivers/staging/iio/ring_sw.h b/drivers/staging/iio/ring_sw.h
index ae70ee0..4b0de7c 100644
--- a/drivers/staging/iio/ring_sw.h
+++ b/drivers/staging/iio/ring_sw.h
@@ -29,7 +29,6 @@
* driver requests - some may support multiple options */
-#include <linux/autoconf.h>
#include "iio.h"
#include "ring_generic.h"
Kamalesh
^ permalink raw reply related
* Re: linux-next: 20090925 - build breaks with !CONFIG_AIO
From: Martin Schwidefsky @ 2009-09-26 11:37 UTC (permalink / raw)
To: Kamalesh Babulal
Cc: Stephen Rothwell, linux-next, LKML, heiko.carstens, linux-s390,
adobriyan
In-Reply-To: <20090925131958.GC6831@linux.vnet.ibm.com>
On Fri, 25 Sep 2009 18:49:58 +0530
Kamalesh Babulal <kamalesh@linux.vnet.ibm.com> wrote:
> Hi Stephen,
>
> next-20090925 randconfig build breaks on s390x, with CONFIG_AIO=n.
>
> arch/s390/mm/pgtable.c: In function 's390_enable_sie':
> arch/s390/mm/pgtable.c:282: error: 'struct mm_struct' has no member named 'ioctx_list'
> arch/s390/mm/pgtable.c:298: error: 'struct mm_struct' has no member named 'ioctx_list'
> make[1]: *** [arch/s390/mm/pgtable.o] Error 1
>
> Reverting the below commit helps
>
> commit 858f09930b32c11b40fd0c5c467982ba09b10894
> Author: Alexey Dobriyan <adobriyan@gmail.com>
> Date: Wed Sep 23 15:57:32 2009 -0700
>
> aio: ifdef fields in mm_struct
>
> ->ioctx_lock and ->ioctx_list are used only under CONFIG_AIO.
That should be fixed in the s390 pgtable.c code:
--
Subject: [PATCH] fix build breakage with CONFIG_AIO=n
From: Martin Schwidefsky <schwidefsky@de.ibm.com>
next-20090925 randconfig build breaks on s390x, with CONFIG_AIO=n.
arch/s390/mm/pgtable.c: In function 's390_enable_sie':
arch/s390/mm/pgtable.c:282: error: 'struct mm_struct' has no member named 'ioctx_list'
arch/s390/mm/pgtable.c:298: error: 'struct mm_struct' has no member named 'ioctx_list'
make[1]: *** [arch/s390/mm/pgtable.o] Error 1
Reported-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
---
arch/s390/mm/pgtable.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff -urpN linux-2.6/arch/s390/mm/pgtable.c linux-2.6-patched/arch/s390/mm/pgtable.c
--- linux-2.6/arch/s390/mm/pgtable.c 2009-09-26 13:35:36.000000000 +0200
+++ linux-2.6-patched/arch/s390/mm/pgtable.c 2009-09-26 13:35:47.000000000 +0200
@@ -279,7 +279,10 @@ int s390_enable_sie(void)
/* lets check if we are allowed to replace the mm */
task_lock(tsk);
if (!tsk->mm || atomic_read(&tsk->mm->mm_users) > 1 ||
- tsk->mm != tsk->active_mm || !hlist_empty(&tsk->mm->ioctx_list)) {
+#ifdef CONFIG_AIO
+ !hlist_empty(&tsk->mm->ioctx_list) ||
+#endif
+ tsk->mm != tsk->active_mm) {
task_unlock(tsk);
return -EINVAL;
}
@@ -295,7 +298,10 @@ int s390_enable_sie(void)
/* Now lets check again if something happened */
task_lock(tsk);
if (!tsk->mm || atomic_read(&tsk->mm->mm_users) > 1 ||
- tsk->mm != tsk->active_mm || !hlist_empty(&tsk->mm->ioctx_list)) {
+#ifdef CONFIG_AIO
+ !hlist_empty(&tsk->mm->ioctx_list) ||
+#endif
+ tsk->mm != tsk->active_mm) {
mmput(mm);
task_unlock(tsk);
return -EINVAL;
--
blue skies,
Martin.
"Reality continues to ruin my life." - Calvin.
^ permalink raw reply
* Re: [PATCH -next] i2c: uses/select RT_MUTEXES
From: Jean Delvare @ 2009-09-26 9:47 UTC (permalink / raw)
To: Randy Dunlap
Cc: Stephen Rothwell, linux-next, LKML, Mika Kuoppala, Peter Ujfalusi
In-Reply-To: <4ABD4213.9010700@oracle.com>
Hi Randy,
On Fri, 25 Sep 2009 15:20:03 -0700, Randy Dunlap wrote:
> From: Randy Dunlap <randy.dunlap@oracle.com>
>
> i2c-core uses rt mutexes, so it needs to select that
> kconfig symbol since there is no prompt for it.
>
> ERROR: "rt_mutex_lock" [drivers/i2c/i2c-core.ko] undefined!
> ERROR: "__rt_mutex_init" [drivers/i2c/i2c-core.ko] undefined!
> ERROR: "rt_mutex_trylock" [drivers/i2c/i2c-core.ko] undefined!
> ERROR: "rt_mutex_unlock" [drivers/i2c/i2c-core.ko] undefined!
>
> Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
> ---
> drivers/i2c/Kconfig | 1 +
> 1 file changed, 1 insertion(+)
>
> --- linux-next-20090925.orig/drivers/i2c/Kconfig
> +++ linux-next-20090925/drivers/i2c/Kconfig
> @@ -5,6 +5,7 @@
> menuconfig I2C
> tristate "I2C support"
> depends on HAS_IOMEM
> + select RT_MUTEXES
> ---help---
> I2C (pronounce: I-square-C) is a slow serial bus protocol used in
> many micro controller applications and developed by Philips. SMBus,
Thanks for the fix, I've folded it into
i2c-prevent-priority-inversion-on-top-of-bus-lock.patch.
--
Jean Delvare
^ permalink raw reply
* linux-next: Tree for September 26
From: Stephen Rothwell @ 2009-09-26 5:28 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 8484 bytes --]
Hi all,
Please do not add code destined for 2.6.33 into linux-next trees until
(at least) 2.6.32-rc1 is out. This will hopefully give those who have
stuff destined for just after -rc1 a chance.
Changes since 20090925:
We are seeing conflicts resolved and move from one tree to another as
Linus merges them.
My fixes tree contains a build fix for powerpc/kvm.
The arm-current tree lost its conflict.
The sparc-current tree gained a conflict against Linus' tree.
The net-current tree lost its conflicts.
The cifs tree lost its build failures.
The acpi tree gained a build failure so I used the version from
next-20090925.
----------------------------------------------------------------------------
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 139 trees (counting Linus' and 21 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 Jan Dittmer for adding the linux-next tree to his build tests
at http://l4x.org/k/ , the guys at http://test.kernel.org/ and 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 arm-current/master
Merging m68k-current/for-linus
Merging powerpc-merge/merge
Merging sparc-current/master
CONFLICT (content): Merge conflict in arch/sparc/include/asm/vio.h
Merging scsi-rc-fixes/master
Merging net-current/master
Merging sound-current/for-linus
Merging pci-current/for-linus
Merging wireless-current/master
Merging kbuild-current/master
Merging quilt/driver-core.current
Merging quilt/tty.current
Merging quilt/usb.current
CONFLICT (content): Merge conflict in drivers/usb/host/xhci-hcd.c
CONFLICT (content): Merge conflict in drivers/usb/host/xhci-mem.c
CONFLICT (content): Merge conflict in drivers/usb/host/xhci-ring.c
CONFLICT (content): Merge conflict in drivers/usb/host/xhci.h
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 arm/devel
Merging davinci/for-next
Merging pxa/for-next
Merging thumb-2/thumb-2
Merging avr32/avr32-arch
Merging blackfin/for-linus
Merging cris/for-next
Merging ia64/test
Merging m68k/for-next
CONFLICT (content): Merge conflict in drivers/rtc/Kconfig
Merging m68knommu/for-next
Merging microblaze/next
Merging mips/mips-for-linux-next
CONFLICT (content): Merge conflict in arch/mips/Kconfig
CONFLICT (add/add): Merge conflict in arch/mips/bcm63xx/Makefile
CONFLICT (add/add): Merge conflict in arch/mips/bcm63xx/boards/board_bcm963xx.c
CONFLICT (delete/modify): arch/mips/lemote/lm2e/Makefile deleted in HEAD and modified in mips/mips-for-linux-next. Version mips/mips-for-linux-next of arch/mips/lemote/lm2e/Makefile left in tree.
CONFLICT (delete/modify): arch/mips/lemote/lm2e/pci.c deleted in HEAD and modified in mips/mips-for-linux-next. Version mips/mips-for-linux-next of arch/mips/lemote/lm2e/pci.c left in tree.
CONFLICT (delete/modify): arch/mips/lemote/lm2e/prom.c deleted in HEAD and modified in mips/mips-for-linux-next. Version mips/mips-for-linux-next of arch/mips/lemote/lm2e/prom.c left in tree.
$ git rm -f arch/mips/lemote/lm2e/Makefile arch/mips/lemote/lm2e/pci.c arch/mips/lemote/lm2e/prom.c
Merging parisc/next
CONFLICT (content): Merge conflict in arch/parisc/include/asm/thread_info.h
CONFLICT (content): Merge conflict in arch/parisc/kernel/entry.S
CONFLICT (content): Merge conflict in arch/parisc/kernel/signal.c
Merging powerpc/next
Merging 4xx/next
Merging galak/next
Merging s390/features
Merging sh/master
Merging sparc/master
Merging xtensa/master
Merging cifs/master
Merging configfs/linux-next
Merging ecryptfs/next
Merging ext3/for_next
Merging ext4/next
Merging fatfs/master
Merging fuse/for-next
Merging gfs2/master
Merging jfs/next
Merging nfs/linux-next
Merging nfsd/nfsd-next
Merging nilfs2/for-next
Merging ocfs2/linux-next
Merging squashfs/master
Merging udf/for_next
Merging v9fs/for-next
Merging ubifs/linux-next
Merging xfs/master
Merging vfs/for-next
Merging pci/linux-next
Merging hid/for-next
Merging quilt/i2c
Merging quilt/jdelvare-hwmon
Merging quilt/kernel-doc
Merging v4l-dvb/master
Merging quota/for_next
Merging kbuild/master
Merging kconfig/for-next
Merging ide/master
Merging libata/NEXT
Merging infiniband/for-next
Merging acpi/test
$ git reset --hard HEAD^
Merging refs/next/20090925/acpi
Merging ieee1394/for-next
Merging ubi/linux-next
Merging kvm/linux-next
Merging dlm/next
Merging scsi/master
Merging async_tx/next
Merging net/master
Merging wireless/master
Merging mtd/master
Merging crypto/master
Merging sound/for-next
Merging cpufreq/next
Merging quilt/rr
Merging mmc/next
Merging input/next
Merging lsm/for-next
Merging block/for-next
CONFLICT (content): Merge conflict in fs/fs-writeback.c
Merging quilt/device-mapper
Merging embedded/master
Merging firmware/master
Merging pcmcia/master
Merging battery/master
Merging leds/for-mm
Merging backlight/for-mm
CONFLICT (content): Merge conflict in drivers/video/backlight/da903x_bl.c
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 voltage/for-next
Merging security-testing/next
Merging lblnet/master
Merging agp/agp-next
Merging uwb/for-upstream
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
Merging audit/for-next
Merging omap/for-next
Merging quilt/aoe
Merging suspend/linux-next
Merging bluetooth/master
Merging fsnotify/for-next
Merging irda/for-next
Merging hwlat/for-linus
Merging drbd/drbd
Merging kmemleak/kmemleak
Merging tip/auto-latest
Merging oprofile/for-next
Merging percpu/for-next
Merging sfi/sfi-test
Merging asm-generic/next
Merging hwpoison/hwpoison
Merging quilt/driver-core
Merging quilt/tty
Merging quilt/usb
CONFLICT (content): Merge conflict in drivers/usb/serial/sierra.c
Merging quilt/staging
Merging scsi-post-merge/master
CONFLICT (content): Merge conflict in MAINTAINERS
CONFLICT (content): Merge conflict in drivers/scsi/Makefile
CONFLICT (content): Merge conflict in drivers/scsi/fcoe/fcoe.c
CONFLICT (content): Merge conflict in drivers/scsi/fcoe/fcoe.h
CONFLICT (content): Merge conflict in drivers/scsi/libfc/fc_elsct.c
CONFLICT (content): Merge conflict in drivers/scsi/libfc/fc_lport.c
CONFLICT (add/add): Merge conflict in drivers/scsi/pmcraid.c
CONFLICT (content): Merge conflict in include/scsi/fc_encode.h
CONFLICT (content): Merge conflict in include/scsi/libfc.h
CONFLICT (content): Merge conflict in kernel/sysctl.c
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply
* Re: linux-next: acpi tree build failure
From: Bjorn Helgaas @ 2009-09-26 3:11 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Len Brown, linux-next, linux-kernel, Crane Cai
In-Reply-To: <20090926121528.dfba135e.sfr@canb.auug.org.au>
On Sat, 2009-09-26 at 12:15 +1000, Stephen Rothwell wrote:
> Hi Len,
>
> Today's linux-next build (x86_64 allmodconfig) failed like this:
>
> drivers/i2c/busses/i2c-scmi.c: In function 'acpi_smbus_cmi_add':
> drivers/i2c/busses/i2c-scmi.c:374: error: implicit declaration of function 'acpi_device_uid'
> drivers/i2c/busses/i2c-scmi.c:374: warning: format '%s' expects type 'char *', but argument 5 has type 'int'
>
> Caused by commit 6622d8cee73a26bce958484065c8f0e704911a62 ("ACPI: remove
> acpi_device_uid() and related stuff") interacting with commit
> dc9854212e0d7318d7133697906d98b78f3088b6 ("i2c: Add driver for SMBus
> Control Method Interface") recently added to Linus' tree.
>
> I have used the version of the acpi tree from next-20090925 for today.
I think we should use the following patch to remove the usage of
acpi_device_uid(). Crane, do you agree, or is there some special
reason you need it here?
i2c-scmi: don't use acpi_device_uid()
We recently removed the acpi_device_uid() interface because nobody
used it. I don't think it's essential here either.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
diff --git a/drivers/i2c/busses/i2c-scmi.c b/drivers/i2c/busses/i2c-scmi.c
index 276a046..b4a55d4 100644
--- a/drivers/i2c/busses/i2c-scmi.c
+++ b/drivers/i2c/busses/i2c-scmi.c
@@ -369,9 +369,8 @@ static int acpi_smbus_cmi_add(struct acpi_device *device)
goto err;
snprintf(smbus_cmi->adapter.name, sizeof(smbus_cmi->adapter.name),
- "SMBus CMI adapter %s (%s)",
- acpi_device_name(device),
- acpi_device_uid(device));
+ "SMBus CMI adapter %s",
+ acpi_device_name(device));
smbus_cmi->adapter.owner = THIS_MODULE;
smbus_cmi->adapter.algo = &acpi_smbus_cmi_algorithm;
smbus_cmi->adapter.algo_data = smbus_cmi;
^ permalink raw reply related
* linux-next: acpi tree build failure
From: Stephen Rothwell @ 2009-09-26 2:15 UTC (permalink / raw)
To: Len Brown; +Cc: linux-next, linux-kernel, Crane Cai, Bjorn Helgaas
[-- Attachment #1: Type: text/plain, Size: 798 bytes --]
Hi Len,
Today's linux-next build (x86_64 allmodconfig) failed like this:
drivers/i2c/busses/i2c-scmi.c: In function 'acpi_smbus_cmi_add':
drivers/i2c/busses/i2c-scmi.c:374: error: implicit declaration of function 'acpi_device_uid'
drivers/i2c/busses/i2c-scmi.c:374: warning: format '%s' expects type 'char *', but argument 5 has type 'int'
Caused by commit 6622d8cee73a26bce958484065c8f0e704911a62 ("ACPI: remove
acpi_device_uid() and related stuff") interacting with commit
dc9854212e0d7318d7133697906d98b78f3088b6 ("i2c: Add driver for SMBus
Control Method Interface") recently added to Linus' tree.
I have used the version of the acpi tree from next-20090925 for today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply
* linux-next: manual merge of the sparc-current tree with Linus' tree
From: Stephen Rothwell @ 2009-09-26 1:01 UTC (permalink / raw)
To: David Miller; +Cc: linux-next, linux-kernel, Jan Beulich, Andrew Morton
[-- Attachment #1: Type: text/plain, Size: 550 bytes --]
Hi David,
Today's linux-next merge of the sparc-current tree got a conflict in
arch/sparc/include/asm/vio.h between commit
8c87df457cb58fe75b9b893007917cf8095660a0 ("BUILD_BUG_ON(): fix it and a
couple of bogus uses of it") from Linus' tree and commit
87ba00515657eede6077fa195ca6592b98cc31e3 ("sparc64: vio: Kill BUILD_BUG_ON
() in vio_dring_avail()") from the sparc-current tree.
I just used the sparc-current version for today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply
* [PATCH -next] drbd: trace depends on TRACING
From: Randy Dunlap @ 2009-09-25 23:03 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, LKML, akpm, drbd-dev
In-Reply-To: <20090925133830.1ba29584.sfr@canb.auug.org.au>
From: Randy Dunlap <randy.dunlap@oracle.com>
DRBD_TRACE should depend on TRACING.
It's also possible that TRACEPOINTS should depend on TRACING.
arch/x86/built-in.o: In function `default_idle':
(.text+0x145a1): undefined reference to `__tracepoint_power_start'
arch/x86/built-in.o: In function `default_idle':
(.text+0x145d4): undefined reference to `__tracepoint_power_start'
arch/x86/built-in.o: In function `mwait_idle_with_hints':
(.text+0x1583d): undefined reference to `__tracepoint_power_start'
arch/x86/built-in.o: In function `mwait_idle_with_hints':
(.text+0x15870): undefined reference to `__tracepoint_power_start'
arch/x86/built-in.o: In function `mwait_idle':
process.c:(.text+0x15b92): undefined reference to `__tracepoint_power_start'
arch/x86/built-in.o:process.c:(.text+0x15bbe): more undefined references to `__tracepoint_power_start' follow
arch/x86/built-in.o: In function `poll_idle':
process.c:(.text+0x160bd): undefined reference to `__tracepoint_power_end'
process.c:(.text+0x160e9): undefined reference to `__tracepoint_power_end'
drivers/built-in.o: In function `cpuidle_idle_call':
cpuidle.c:(.text+0x517f16): undefined reference to `__tracepoint_power_end'
cpuidle.c:(.text+0x517f49): undefined reference to `__tracepoint_power_end'
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
---
drivers/block/drbd/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- linux-next-20090925.orig/drivers/block/drbd/Kconfig
+++ linux-next-20090925/drivers/block/drbd/Kconfig
@@ -40,7 +40,7 @@ config BLK_DEV_DRBD
config DRBD_TRACE
tristate "DRBD tracing"
- depends on BLK_DEV_DRBD
+ depends on BLK_DEV_DRBD && TRACING
select TRACEPOINTS
default n
help
^ permalink raw reply
* Re: [PATCH -next] input: serio_libps2 depends on serio_i8042
From: Randy Dunlap @ 2009-09-25 22:30 UTC (permalink / raw)
To: Dmitry Torokhov; +Cc: Randy Dunlap, Stephen Rothwell, linux-next, LKML, akpm
In-Reply-To: <20090925222901.GC8618@core.coreip.homeip.net>
Dmitry Torokhov wrote:
> On Fri, Sep 25, 2009 at 03:20:09PM -0700, Randy Dunlap wrote:
>> From: Randy Dunlap <randy.dunlap@oracle.com>
>>
>> SERIO_LIBPS2 code uses SERIO_I8042 code, so the former
>> needs to depend on the latter.
>>
>
> Umm, it should be useable without i8042... But I guess you have
> SERIO_LIBPS2=y but SERIO_I8042=m?
That's correct.
>> (.text+0x1f33ca): undefined reference to `i8042_check_port_owner'
>> (.text+0x1f33de): undefined reference to `i8042_unlock_chip'
>> (.text+0x1f3435): undefined reference to `i8042_check_port_owner'
>> (.text+0x1f3449): undefined reference to `i8042_lock_chip
>>
>> Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
>> ---
>> drivers/input/serio/Kconfig | 1 +
>> 1 file changed, 1 insertion(+)
>>
>> --- linux-next-20090925.orig/drivers/input/serio/Kconfig
>> +++ linux-next-20090925/drivers/input/serio/Kconfig
>> @@ -168,6 +168,7 @@ config SERIO_MACEPS2
>>
>> config SERIO_LIBPS2
>> tristate "PS/2 driver library" if EMBEDDED
>> + depends on SERIO_I8042
>> help
>> Say Y here if you are using a driver for device connected
>> to a PS/2 port, such as PS/2 mouse or standard AT keyboard.
>
^ permalink raw reply
* Re: [PATCH -next] input: serio_libps2 depends on serio_i8042
From: Dmitry Torokhov @ 2009-09-25 22:29 UTC (permalink / raw)
To: Randy Dunlap; +Cc: Stephen Rothwell, linux-next, LKML, akpm
In-Reply-To: <4ABD4219.5000608@oracle.com>
On Fri, Sep 25, 2009 at 03:20:09PM -0700, Randy Dunlap wrote:
> From: Randy Dunlap <randy.dunlap@oracle.com>
>
> SERIO_LIBPS2 code uses SERIO_I8042 code, so the former
> needs to depend on the latter.
>
Umm, it should be useable without i8042... But I guess you have
SERIO_LIBPS2=y but SERIO_I8042=m?
> (.text+0x1f33ca): undefined reference to `i8042_check_port_owner'
> (.text+0x1f33de): undefined reference to `i8042_unlock_chip'
> (.text+0x1f3435): undefined reference to `i8042_check_port_owner'
> (.text+0x1f3449): undefined reference to `i8042_lock_chip
>
> Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
> ---
> drivers/input/serio/Kconfig | 1 +
> 1 file changed, 1 insertion(+)
>
> --- linux-next-20090925.orig/drivers/input/serio/Kconfig
> +++ linux-next-20090925/drivers/input/serio/Kconfig
> @@ -168,6 +168,7 @@ config SERIO_MACEPS2
>
> config SERIO_LIBPS2
> tristate "PS/2 driver library" if EMBEDDED
> + depends on SERIO_I8042
> help
> Say Y here if you are using a driver for device connected
> to a PS/2 port, such as PS/2 mouse or standard AT keyboard.
--
Dmitry
^ permalink raw reply
* [PATCH -next] input: serio_libps2 depends on serio_i8042
From: Randy Dunlap @ 2009-09-25 22:20 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, LKML, Dmitry Torokhov, akpm
In-Reply-To: <20090925133830.1ba29584.sfr@canb.auug.org.au>
From: Randy Dunlap <randy.dunlap@oracle.com>
SERIO_LIBPS2 code uses SERIO_I8042 code, so the former
needs to depend on the latter.
(.text+0x1f33ca): undefined reference to `i8042_check_port_owner'
(.text+0x1f33de): undefined reference to `i8042_unlock_chip'
(.text+0x1f3435): undefined reference to `i8042_check_port_owner'
(.text+0x1f3449): undefined reference to `i8042_lock_chip
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
---
drivers/input/serio/Kconfig | 1 +
1 file changed, 1 insertion(+)
--- linux-next-20090925.orig/drivers/input/serio/Kconfig
+++ linux-next-20090925/drivers/input/serio/Kconfig
@@ -168,6 +168,7 @@ config SERIO_MACEPS2
config SERIO_LIBPS2
tristate "PS/2 driver library" if EMBEDDED
+ depends on SERIO_I8042
help
Say Y here if you are using a driver for device connected
to a PS/2 port, such as PS/2 mouse or standard AT keyboard.
^ permalink raw reply
* [PATCH -next] i2c: uses/select RT_MUTEXES
From: Randy Dunlap @ 2009-09-25 22:20 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, LKML, akpm, Jean Delvare (PC drivers, core)
In-Reply-To: <20090925133830.1ba29584.sfr@canb.auug.org.au>
From: Randy Dunlap <randy.dunlap@oracle.com>
i2c-core uses rt mutexes, so it needs to select that
kconfig symbol since there is no prompt for it.
ERROR: "rt_mutex_lock" [drivers/i2c/i2c-core.ko] undefined!
ERROR: "__rt_mutex_init" [drivers/i2c/i2c-core.ko] undefined!
ERROR: "rt_mutex_trylock" [drivers/i2c/i2c-core.ko] undefined!
ERROR: "rt_mutex_unlock" [drivers/i2c/i2c-core.ko] undefined!
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
---
drivers/i2c/Kconfig | 1 +
1 file changed, 1 insertion(+)
--- linux-next-20090925.orig/drivers/i2c/Kconfig
+++ linux-next-20090925/drivers/i2c/Kconfig
@@ -5,6 +5,7 @@
menuconfig I2C
tristate "I2C support"
depends on HAS_IOMEM
+ select RT_MUTEXES
---help---
I2C (pronounce: I-square-C) is a slow serial bus protocol used in
many micro controller applications and developed by Philips. SMBus,
^ permalink raw reply
* linux-next: 20090925 - hvc driver build breaks with !HVC_CONSOLE
From: Kamalesh Babulal @ 2009-09-25 13:31 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, LKML, linuxppc-dev
In-Reply-To: <20090925133830.1ba29584.sfr@canb.auug.org.au>
Hi Stephen,
next-20090925 randconfig build breaks on hvcs driver on powerpc,
with HVC_CONSOLE=n.
ERROR: ".hvc_put_chars" [drivers/char/hvcs.ko] undefined!
ERROR: ".hvc_get_chars" [drivers/char/hvcs.ko] undefined!
adding the dependency of HVC_CONSOLE helped
Signed-off-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
--
drivers/char/Kconfig | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index a2a0e67..2583231 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -682,7 +682,7 @@ config VIRTIO_CONSOLE
config HVCS
tristate "IBM Hypervisor Virtual Console Server support"
- depends on PPC_PSERIES
+ depends on PPC_PSERIES && HVC_CONSOLE
help
Partitionable IBM Power5 ppc64 machines allow hosting of
firmware virtual consoles from one Linux partition by
Kamalesh
^ permalink raw reply related
* linux-next: 20090925 - build breaks with !CONFIG_AIO
From: Kamalesh Babulal @ 2009-09-25 13:19 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, LKML, schwidefsky, heiko.carstens, linux-s390,
adobriyan
In-Reply-To: <20090925133830.1ba29584.sfr@canb.auug.org.au>
Hi Stephen,
next-20090925 randconfig build breaks on s390x, with CONFIG_AIO=n.
arch/s390/mm/pgtable.c: In function 's390_enable_sie':
arch/s390/mm/pgtable.c:282: error: 'struct mm_struct' has no member named 'ioctx_list'
arch/s390/mm/pgtable.c:298: error: 'struct mm_struct' has no member named 'ioctx_list'
make[1]: *** [arch/s390/mm/pgtable.o] Error 1
Reverting the below commit helps
commit 858f09930b32c11b40fd0c5c467982ba09b10894
Author: Alexey Dobriyan <adobriyan@gmail.com>
Date: Wed Sep 23 15:57:32 2009 -0700
aio: ifdef fields in mm_struct
->ioctx_lock and ->ioctx_list are used only under CONFIG_AIO.
Kamalesh
^ permalink raw reply
* Re: PATCH 0/1: rt2x00dev.c / rt2x00lib.h fixes build breakage
From: John W. Linville @ 2009-09-25 4:53 UTC (permalink / raw)
To: Ken Lewis; +Cc: linux-next, LKML, netdev
In-Reply-To: <5a44caba0909231358y23f21c0drb2a3451084028a6f@mail.gmail.com>
On Wed, Sep 23, 2009 at 09:58:35PM +0100, Ken Lewis wrote:
> The headers in drivers/net/wireless/rt2x00/rt2x00lib.h don't match the
> use of the function in rt2x00dev.c The build fails as a result.
>
> This has been a problem in linux-next since early September. I've
> e-mailed a patch to linux-next and to linux-net, but the 2.6.32 merge
> window has brought the problem to the mainline and so I'm re-sending
> my patch. I've opened a bug on bugzilla:
> http://bugzilla.kernel.org/show_bug.cgi?id=14217
Always make sure to send wireless LAN patches to
linux-wireless@vger.kernel.org. Anyway, the following patch is in
the pull request I sent to Dave yesterday (and which I believe he
has already pulled):
commit fe2475633676b0a976400dfc53f8d7006f56543e
Author: Andrew Price <andy@andrewprice.me.uk>
Date: Thu Sep 17 21:15:48 2009 +0100
rt2x00: fix the definition of rt2x00crypto_rx_insert_iv
Remove the redundant l2pad parameter from the definition of
rt2x00crypto_rx_insert_iv which is used when only CONFIG_RT2500PCI but
none of the other rt2x00 family drivers is configured.
Signed-off-by: Andrew Price <andy@andrewprice.me.uk>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Hth!
John
--
John W. Linville Someday the world will need a hero, and you
linville@tuxdriver.com might be all we have. Be ready.
^ permalink raw reply
* linux-next: Tree for September 25
From: Stephen Rothwell @ 2009-09-25 3:38 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 10024 bytes --]
Hi all,
Please do not add code destined for 2.6.33 into linux-next trees until
(at least) 2.6.32-rc1 is out. This will hopefully give those who have
stuff destined for just after -rc1 a chance.
The current diffstat ends like this:
886 files changed, 114306 insertions(+), 17547 deletions(-)
And the dirstat looks like this:
6.2% arch/arm/
17.5% drivers/block/drbd/
6.1% drivers/scsi/be2iscsi/
3.2% drivers/scsi/bfa/include/defs/
3.0% drivers/scsi/bfa/include/protocol/
6.3% drivers/scsi/bfa/include/
26.8% drivers/scsi/bfa/
4.6% drivers/staging/agnx/
4.3% drivers/staging/tm6000/
10.6% drivers/
So I guess we are nearly done for -rc1.
Changes since 20090924:
We are seeing conflicts resolved and move from one tree to another as
Linus merges them.
My fixes tree contains a build fix for powerpc/kvm.
The cifs tree gained a couple of build failures for which I reverted a
couple of commits.
The tip tree lost its conflict.
----------------------------------------------------------------------------
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 139 trees (counting Linus' and 21 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 Jan Dittmer for adding the linux-next tree to his build tests
at http://l4x.org/k/ , the guys at http://test.kernel.org/ and 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 arm-current/master
CONFLICT (content): Merge conflict in MAINTAINERS
Merging m68k-current/for-linus
Merging powerpc-merge/merge
Merging sparc-current/master
Merging scsi-rc-fixes/master
Merging net-current/master
CONFLICT (content): Merge conflict in drivers/staging/Kconfig
CONFLICT (content): Merge conflict in drivers/staging/Makefile
CONFLICT (delete/modify): drivers/staging/cpc-usb/TODO deleted in net-current/master and modified in HEAD. Version HEAD of drivers/staging/cpc-usb/TODO left in tree.
CONFLICT (delete/modify): drivers/staging/cpc-usb/cpc-usb_drv.c deleted in net-current/master and modified in HEAD. Version HEAD of drivers/staging/cpc-usb/cpc-usb_drv.c left in tree.
CONFLICT (delete/modify): drivers/staging/cpc-usb/cpc.h deleted in net-current/master and modified in HEAD. Version HEAD of drivers/staging/cpc-usb/cpc.h left in tree.
CONFLICT (delete/modify): drivers/staging/cpc-usb/cpc_int.h deleted in net-current/master and modified in HEAD. Version HEAD of drivers/staging/cpc-usb/cpc_int.h left in tree.
CONFLICT (delete/modify): drivers/staging/cpc-usb/cpcusb.h deleted in net-current/master and modified in HEAD. Version HEAD of drivers/staging/cpc-usb/cpcusb.h left in tree.
$ git rm -f drivers/staging/cpc-usb/TODO drivers/staging/cpc-usb/cpc-usb_drv.c drivers/staging/cpc-usb/cpc.h drivers/staging/cpc-usb/cpc_int.h drivers/staging/cpc-usb/cpcusb.h
Merging sound-current/for-linus
Merging pci-current/for-linus
Merging wireless-current/master
Merging kbuild-current/master
Merging quilt/driver-core.current
Merging quilt/tty.current
Merging quilt/usb.current
CONFLICT (content): Merge conflict in drivers/usb/host/xhci-hcd.c
CONFLICT (content): Merge conflict in drivers/usb/host/xhci-mem.c
CONFLICT (content): Merge conflict in drivers/usb/host/xhci-ring.c
CONFLICT (content): Merge conflict in drivers/usb/host/xhci.h
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 arm/devel
Merging davinci/for-next
Merging pxa/for-next
Merging thumb-2/thumb-2
Merging avr32/avr32-arch
Merging blackfin/for-linus
Merging cris/for-next
Merging ia64/test
Merging m68k/for-next
CONFLICT (content): Merge conflict in drivers/rtc/Kconfig
Merging m68knommu/for-next
Merging microblaze/next
Merging mips/mips-for-linux-next
CONFLICT (content): Merge conflict in arch/mips/Kconfig
CONFLICT (add/add): Merge conflict in arch/mips/bcm63xx/Makefile
CONFLICT (add/add): Merge conflict in arch/mips/bcm63xx/boards/board_bcm963xx.c
CONFLICT (delete/modify): arch/mips/lemote/lm2e/Makefile deleted in HEAD and modified in mips/mips-for-linux-next. Version mips/mips-for-linux-next of arch/mips/lemote/lm2e/Makefile left in tree.
CONFLICT (delete/modify): arch/mips/lemote/lm2e/pci.c deleted in HEAD and modified in mips/mips-for-linux-next. Version mips/mips-for-linux-next of arch/mips/lemote/lm2e/pci.c left in tree.
CONFLICT (delete/modify): arch/mips/lemote/lm2e/prom.c deleted in HEAD and modified in mips/mips-for-linux-next. Version mips/mips-for-linux-next of arch/mips/lemote/lm2e/prom.c left in tree.
$ git rm -f arch/mips/lemote/lm2e/Makefile arch/mips/lemote/lm2e/pci.c arch/mips/lemote/lm2e/prom.c
Merging parisc/next
CONFLICT (content): Merge conflict in arch/parisc/include/asm/thread_info.h
CONFLICT (content): Merge conflict in arch/parisc/kernel/entry.S
CONFLICT (content): Merge conflict in arch/parisc/kernel/signal.c
Merging powerpc/next
Merging 4xx/next
Merging galak/next
Merging s390/features
Merging sh/master
Merging sparc/master
Merging xtensa/master
Merging cifs/master
Merging configfs/linux-next
Merging ecryptfs/next
Merging ext3/for_next
Merging ext4/next
Merging fatfs/master
Merging fuse/for-next
Merging gfs2/master
Merging jfs/next
Merging nfs/linux-next
Merging nfsd/nfsd-next
Merging nilfs2/for-next
Merging ocfs2/linux-next
Merging squashfs/master
Merging udf/for_next
Merging v9fs/for-next
Merging ubifs/linux-next
Merging xfs/master
Merging vfs/for-next
[master f0488c2] Revert "cifs: eliminate cifs_init_private"
[master 39e619d] Revert "cifs: convert oplock breaks to use slow_work facility (try #4)"
Merging pci/linux-next
Merging hid/for-next
Merging quilt/i2c
Merging quilt/jdelvare-hwmon
Merging quilt/kernel-doc
Merging v4l-dvb/master
Merging quota/for_next
Merging kbuild/master
Merging kconfig/for-next
Merging ide/master
Merging libata/NEXT
Merging infiniband/for-next
Merging acpi/test
Merging ieee1394/for-next
Merging ubi/linux-next
Merging kvm/linux-next
Merging dlm/next
Merging scsi/master
Merging async_tx/next
Merging net/master
Merging wireless/master
Merging mtd/master
Merging crypto/master
Merging sound/for-next
Merging cpufreq/next
Merging quilt/rr
Merging mmc/next
Merging input/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
Merging backlight/for-mm
CONFLICT (content): Merge conflict in drivers/video/backlight/da903x_bl.c
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 voltage/for-next
Merging security-testing/next
Merging lblnet/master
Merging agp/agp-next
Merging uwb/for-upstream
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
Merging audit/for-next
Merging omap/for-next
Merging quilt/aoe
Merging suspend/linux-next
Merging bluetooth/master
Merging fsnotify/for-next
Merging irda/for-next
Merging hwlat/for-linus
Merging drbd/drbd
Merging kmemleak/kmemleak
Merging tip/auto-latest
Merging oprofile/for-next
Merging percpu/for-next
Merging sfi/sfi-test
Merging asm-generic/next
Merging hwpoison/hwpoison
Merging quilt/driver-core
Merging quilt/tty
Merging quilt/usb
CONFLICT (content): Merge conflict in drivers/usb/serial/sierra.c
Merging quilt/staging
Merging scsi-post-merge/master
CONFLICT (content): Merge conflict in MAINTAINERS
CONFLICT (content): Merge conflict in drivers/scsi/Makefile
CONFLICT (content): Merge conflict in drivers/scsi/fcoe/fcoe.c
CONFLICT (content): Merge conflict in drivers/scsi/fcoe/fcoe.h
CONFLICT (content): Merge conflict in drivers/scsi/libfc/fc_elsct.c
CONFLICT (content): Merge conflict in drivers/scsi/libfc/fc_lport.c
CONFLICT (add/add): Merge conflict in drivers/scsi/pmcraid.c
CONFLICT (content): Merge conflict in include/scsi/fc_encode.h
CONFLICT (content): Merge conflict in include/scsi/libfc.h
CONFLICT (content): Merge conflict in kernel/sysctl.c
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply
* Re: linux-next: cifs tree build failures
From: Stephen Rothwell @ 2009-09-25 3:24 UTC (permalink / raw)
To: Steve French; +Cc: linux-cifs-client, linux-next, linux-kernel, Jeff Layton
In-Reply-To: <524f69650909242013r4d312204w9f8457c07db9dd24@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 340 bytes --]
Hi Steve,
On Thu, 24 Sep 2009 22:13:46 -0500 Steve French <smfrench@gmail.com> wrote:
>
> These now are fixed in cifs-2.6.git. In the same patch found a minor
> locking problem which Jeff will fix tomorrow.
OK, thanks.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply
* Re: linux-next: cifs tree build failures
From: Steve French @ 2009-09-25 3:13 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-cifs-client, linux-next, linux-kernel, Jeff Layton
In-Reply-To: <20090925095105.b06d77f3.sfr@canb.auug.org.au>
On Thu, Sep 24, 2009 at 6:51 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> Today's linux-next build (powerpc ppc64_defconfig) failed like this:
>
> fs/cifs/cifsfs.c: In function 'init_cifs':
> fs/cifs/cifsfs.c:1047: error: implicit declaration of function 'unregister_key_type'
>
> Caused by commit 3bc303c254335dbd7c7012cc1760b12f1d5514d3 ("cifs: convert
> oplock breaks to use slow_work facility (try #4)") exposing the call to
leinfo' was here
>
> I have reverted both those commits for today.
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
These now are fixed in cifs-2.6.git. In the same patch found a minor
locking problem which Jeff will fix tomorrow.
--
Thanks,
Steve
^ permalink raw reply
* linux-next: cifs tree build failures
From: Stephen Rothwell @ 2009-09-24 23:51 UTC (permalink / raw)
To: Steve French, linux-cifs-client; +Cc: linux-next, linux-kernel, Jeff Layton
[-- Attachment #1: Type: text/plain, Size: 1229 bytes --]
Hi all,
Today's linux-next build (powerpc ppc64_defconfig) failed like this:
fs/cifs/cifsfs.c: In function 'init_cifs':
fs/cifs/cifsfs.c:1047: error: implicit declaration of function 'unregister_key_type'
Caused by commit 3bc303c254335dbd7c7012cc1760b12f1d5514d3 ("cifs: convert
oplock breaks to use slow_work facility (try #4)") exposing the call to
unregister_key_type() even if CONFIG_KEYS is not set.
fs/cifs/file.c: In function 'cifs_open':
fs/cifs/file.c:401: warning: passing argument 4 of 'cifs_new_fileinfo' from incompatible pointer type
fs/cifs/cifsproto.h:94: note: expected 'struct cifsTconInfo *' but argument is of type 'struct vfsmount *'
fs/cifs/dir.c:134: error: conflicting types for 'cifs_new_fileinfo'
fs/cifs/cifsproto.h:94: note: previous declaration of 'cifs_new_fileinfo' was here
Caused by commit 086f68bd97126618ecb2dcff5f766f3a21722df7 ("cifs:
eliminate cifs_init_private") which gives a different prototype for
cifs_new_fileinfo() in fs/cifs/cifsproto.h to the definition in
fs/cifs/dir.c.
This needs more care ...
I have reverted both those commits for today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply
* Re: linux-next: manual merge of the tip tree with Linus' tree
From: Stephen Rothwell @ 2009-09-24 9:23 UTC (permalink / raw)
To: Ingo Molnar
Cc: Thomas Gleixner, H. Peter Anvin, Peter Zijlstra, linux-next,
linux-kernel, Heiko Carstens, Stefani Seibold
In-Reply-To: <20090924083309.GA14270@elte.hu>
[-- Attachment #1: Type: text/plain, Size: 383 bytes --]
Hi Ingo,
On Thu, 24 Sep 2009 10:33:09 +0200 Ingo Molnar <mingo@elte.hu> wrote:
>
> Thanks - that's how i fixed it up yesterday, and it tested fine. Have
> just pushed out this resolution, so the conflict should disappear from
> linux-next tomorrow.
OK, thanks.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply
* Re: linux-next: manual merge of the tip tree with Linus' tree
From: Ingo Molnar @ 2009-09-24 8:33 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Thomas Gleixner, H. Peter Anvin, Peter Zijlstra, linux-next,
linux-kernel, Heiko Carstens, Stefani Seibold
In-Reply-To: <20090924140738.3b8ab138.sfr@canb.auug.org.au>
* Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> Today's linux-next merge of the tip tree got a conflict in
> fs/proc/array.c between commit d899bf7b55f503ba7d3d07ed27c3a37e270fa7db
> ("procfs: provide stack information for threads") from Linus' tree and
> commit d01d4827858cdc2e1c437c87ab65ec0a00fd40f8 ("sched: Always show
> Cpus_allowed field in /proc/<pid>/status") from the tip tree.
>
> Just overlapping additions. I fixed it up (see below) and can cay the
> fix for a while. This appears to be fixed the same way in tip:master.
Thanks - that's how i fixed it up yesterday, and it tested fine. Have
just pushed out this resolution, so the conflict should disappear from
linux-next tomorrow.
Thanks,
Ingo
^ permalink raw reply
* linux-next: Tree for September 24
From: Stephen Rothwell @ 2009-09-24 6:25 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 9251 bytes --]
Hi all,
Please do not add code destined for 2.6.33 into linux-next trees until
(at least) 2.6.32-rc1 is out. This will hopefully give those who have
stuff destined for just after -rc1 a chance.
Changes since 20090923:
Undropped tree: drbd
We are seeing conflicts resolved and move from one tree to another as
Linus merges them.
The ocfs2 tree lost its conflicts.
The jdelvare-hwmon tree lost its conflicts.
The block and drbd trees lost their build failure.
The battery tree lost its conflict.
The tip tree gained a conflict against Linus' tree.
The usb tree lost its conflict.
I applied a patch for a build failure in Linus' tree.
----------------------------------------------------------------------------
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 139 trees (counting Linus' and 21 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 Jan Dittmer for adding the linux-next tree to his build tests
at http://l4x.org/k/ , the guys at http://test.kernel.org/ and 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 arm-current/master
CONFLICT (content): Merge conflict in MAINTAINERS
Merging m68k-current/for-linus
Merging powerpc-merge/merge
Merging sparc-current/master
Merging scsi-rc-fixes/master
Merging net-current/master
CONFLICT (content): Merge conflict in drivers/staging/Kconfig
CONFLICT (content): Merge conflict in drivers/staging/Makefile
CONFLICT (delete/modify): drivers/staging/cpc-usb/TODO deleted in net-current/master and modified in HEAD. Version HEAD of drivers/staging/cpc-usb/TODO left in tree.
CONFLICT (delete/modify): drivers/staging/cpc-usb/cpc-usb_drv.c deleted in net-current/master and modified in HEAD. Version HEAD of drivers/staging/cpc-usb/cpc-usb_drv.c left in tree.
CONFLICT (delete/modify): drivers/staging/cpc-usb/cpc.h deleted in net-current/master and modified in HEAD. Version HEAD of drivers/staging/cpc-usb/cpc.h left in tree.
CONFLICT (delete/modify): drivers/staging/cpc-usb/cpc_int.h deleted in net-current/master and modified in HEAD. Version HEAD of drivers/staging/cpc-usb/cpc_int.h left in tree.
CONFLICT (delete/modify): drivers/staging/cpc-usb/cpcusb.h deleted in net-current/master and modified in HEAD. Version HEAD of drivers/staging/cpc-usb/cpcusb.h left in tree.
$ git rm -f drivers/staging/cpc-usb/TODO drivers/staging/cpc-usb/cpc-usb_drv.c drivers/staging/cpc-usb/cpc.h drivers/staging/cpc-usb/cpc_int.h drivers/staging/cpc-usb/cpcusb.h
Merging sound-current/for-linus
Merging pci-current/for-linus
Merging wireless-current/master
Merging kbuild-current/master
Merging quilt/driver-core.current
Merging quilt/tty.current
Merging quilt/usb.current
CONFLICT (content): Merge conflict in drivers/usb/host/xhci-hcd.c
CONFLICT (content): Merge conflict in drivers/usb/host/xhci-mem.c
CONFLICT (content): Merge conflict in drivers/usb/host/xhci-ring.c
CONFLICT (content): Merge conflict in drivers/usb/host/xhci.h
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 arm/devel
Merging davinci/for-next
Merging pxa/for-next
Merging thumb-2/thumb-2
Merging avr32/avr32-arch
Merging blackfin/for-linus
Merging cris/for-next
Merging ia64/test
Merging m68k/for-next
CONFLICT (content): Merge conflict in drivers/rtc/Kconfig
Merging m68knommu/for-next
Merging microblaze/next
Merging mips/mips-for-linux-next
CONFLICT (content): Merge conflict in arch/mips/Kconfig
CONFLICT (add/add): Merge conflict in arch/mips/bcm63xx/Makefile
CONFLICT (add/add): Merge conflict in arch/mips/bcm63xx/boards/board_bcm963xx.c
CONFLICT (delete/modify): arch/mips/lemote/lm2e/Makefile deleted in HEAD and modified in mips/mips-for-linux-next. Version mips/mips-for-linux-next of arch/mips/lemote/lm2e/Makefile left in tree.
CONFLICT (delete/modify): arch/mips/lemote/lm2e/pci.c deleted in HEAD and modified in mips/mips-for-linux-next. Version mips/mips-for-linux-next of arch/mips/lemote/lm2e/pci.c left in tree.
CONFLICT (delete/modify): arch/mips/lemote/lm2e/prom.c deleted in HEAD and modified in mips/mips-for-linux-next. Version mips/mips-for-linux-next of arch/mips/lemote/lm2e/prom.c left in tree.
$ git rm -f arch/mips/lemote/lm2e/Makefile arch/mips/lemote/lm2e/pci.c arch/mips/lemote/lm2e/prom.c
Merging parisc/next
CONFLICT (content): Merge conflict in arch/parisc/include/asm/thread_info.h
CONFLICT (content): Merge conflict in arch/parisc/kernel/entry.S
CONFLICT (content): Merge conflict in arch/parisc/kernel/signal.c
Merging powerpc/next
Merging 4xx/next
Merging galak/next
Merging s390/features
Merging sh/master
Merging sparc/master
Merging xtensa/master
Merging cifs/master
Merging configfs/linux-next
Merging ecryptfs/next
Merging ext3/for_next
Merging ext4/next
Merging fatfs/master
Merging fuse/for-next
Merging gfs2/master
Merging jfs/next
Merging nfs/linux-next
Merging nfsd/nfsd-next
Merging nilfs2/for-next
Merging ocfs2/linux-next
Merging squashfs/master
Merging udf/for_next
Merging v9fs/for-next
Merging ubifs/linux-next
Merging xfs/master
Merging vfs/for-next
Merging pci/linux-next
CONFLICT (content): Merge conflict in MAINTAINERS
Merging hid/for-next
Merging quilt/i2c
Merging quilt/jdelvare-hwmon
Merging quilt/kernel-doc
Merging v4l-dvb/master
Merging quota/for_next
Merging kbuild/master
Merging kconfig/for-next
Merging ide/master
Merging libata/NEXT
Merging infiniband/for-next
Merging acpi/test
Merging ieee1394/for-next
Merging ubi/linux-next
Merging kvm/linux-next
Merging dlm/next
Merging scsi/master
Merging async_tx/next
Merging net/master
Merging wireless/master
CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-rx.c
Merging mtd/master
Merging crypto/master
Merging sound/for-next
Merging cpufreq/next
Merging quilt/rr
Merging mmc/next
Merging input/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
Merging backlight/for-mm
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 voltage/for-next
Merging security-testing/next
Merging lblnet/master
Merging agp/agp-next
Merging uwb/for-upstream
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
Merging audit/for-next
Merging omap/for-next
Merging quilt/aoe
Merging suspend/linux-next
Merging bluetooth/master
Merging fsnotify/for-next
Merging irda/for-next
Merging hwlat/for-linus
Merging drbd/drbd
Merging kmemleak/kmemleak
Merging tip/auto-latest
CONFLICT (content): Merge conflict in fs/proc/array.c
Merging oprofile/for-next
Merging percpu/for-next
Merging sfi/sfi-test
Merging asm-generic/next
Merging hwpoison/hwpoison
Merging quilt/driver-core
Merging quilt/tty
Merging quilt/usb
Merging quilt/staging
Merging scsi-post-merge/master
CONFLICT (content): Merge conflict in MAINTAINERS
CONFLICT (content): Merge conflict in drivers/scsi/Makefile
CONFLICT (add/add): Merge conflict in drivers/scsi/pmcraid.c
CONFLICT (content): Merge conflict in kernel/sysctl.c
Applying: powerpc/kvm: build fix for new BUILD_BUG_ON
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ 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