Hi all,
Changes since 20090319:
Removed tree:
kmemcheck (requested due to issues with non standard code)
The net tree gained a conflict against the net-current tree.
The rr tree lost a conflict but gained another against the hid tree.
The watchdog tree gained a conflict against the arm tree.
The osd tree lost its conflict.
The kmemleak tree lost 3 conflicts (probably due to the removal of the
kmemcheck tree).
The staging tree lost all its conflicts but gained another against the
drm tree.
The powerpc and sparc build failures were fixed.
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/sfr/linux-next.git
(patches at
http://www.kernel.org/pub/linux/kernel/people/sfr/linux-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) 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 133 trees (counting Linus' and 18 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 [email protected]
$ git checkout master
$ git reset --hard stable
Merging origin/master
Merging arm-current/master
Merging m68k-current/for-linus
Merging powerpc-merge/merge
Merging sparc-current/master
Merging scsi-rc-fixes/master
Merging net-current/master
Merging sound-current/for-linus
Merging pci-current/for-linus
Merging wireless-current/master
Merging kbuild-current/master
Merging quilt/driver-core.current
Merging quilt/usb.current
Merging cpufreq-current/fixes
Merging input-current/for-linus
Merging md-current/for-linus
Merging audit-current/for-linus
Merging crypto-current/master
Merging dwmw2/master
Merging arm/devel
CONFLICT (content): Merge conflict in arch/arm/mach-mx1/devices.c
Merging avr32/avr32-arch
Merging blackfin/for-linus
Merging cris/for-next
Merging ia64/test
Merging m68k/for-next
Merging m68knommu/for-next
Merging mips/mips-for-linux-next
Merging parisc/master
Merging powerpc/next
Merging 4xx/next
Merging galak/next
Merging pxa/for-next
Merging s390/features
Merging sh/master
Merging sparc/master
Merging x86/auto-x86-next
CONFLICT (content): Merge conflict in arch/powerpc/include/asm/elf.h
Merging xtensa/master
Merging tip-core/auto-core-next
CONFLICT (content): Merge conflict in lib/Kconfig.debug
Merging cpus4096/auto-cpus4096-next
CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/common.c
Merging tracing/auto-tracing-next
Merging genirq/auto-genirq-next
CONFLICT (content): Merge conflict in kernel/irq/handle.c
Merging safe-poison-pointers/auto-safe-poison-pointers-next
Merging sched/auto-sched-next
CONFLICT (content): Merge conflict in lib/Makefile
Merging stackprotector/auto-stackprotector-next
Merging timers/auto-timers-next
Merging pci/linux-next
Merging quilt/device-mapper
Merging hid/for-next
Merging quilt/i2c
CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-mpc.c
Merging quilt/jdelvare-hwmon
Merging quilt/kernel-doc
CONFLICT (content): Merge conflict in Documentation/kernel-parameters.txt
Merging v4l-dvb/master
Merging quota/for_next
Merging jfs/next
Merging kbuild/master
Merging quilt/ide
CONFLICT (content): Merge conflict in drivers/ide/ide-dma.c
CONFLICT (content): Merge conflict in drivers/ide/ide-floppy.c
CONFLICT (content): Merge conflict in include/linux/ide.h
Merging libata/NEXT
Merging nfs/linux-next
Merging xfs/master
Merging infiniband/for-next
Merging acpi/test
Merging nfsd/nfsd-next
Merging ieee1394/for-next
Merging ubi/linux-next
Merging kvm/master
Merging dlm/next
Merging scsi/master
Merging ocfs2/linux-next
Merging ext4/next
CONFLICT (content): Merge conflict in fs/ext4/inode.c
Merging async_tx/next
Merging udf/for_next
Merging net/master
CONFLICT (content): Merge conflict in drivers/net/virtio_net.c
Merging wireless/master
Applying: net: tracing interface fixup
Merging mtd/master
Merging crypto/master
Merging vfs/for-next
Merging sound/for-next
CONFLICT (content): Merge conflict in sound/soc/pxa/pxa2xx-i2s.c
Merging cpufreq/next
CONFLICT (content): Merge conflict in arch/x86/include/asm/timer.h
Merging v9fs/for-next
CONFLICT (content): Merge conflict in net/9p/protocol.c
Merging quilt/rr
CONFLICT (content): Merge conflict in arch/powerpc/kernel/irq.c
CONFLICT (content): Merge conflict in arch/x86/include/asm/topology.h
CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/cpufreq/powernow-k8.c
CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/cpufreq/speedstep-ich.c
CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/cpufreq/speedstep-lib.c
CONFLICT (content): Merge conflict in arch/x86/lguest/boot.c
CONFLICT (delete/modify): arch/x86/mach-default/setup.c deleted in HEAD and modified in quilt/rr. Version quilt/rr of arch/x86/mach-default/setup.c left in tree.
CONFLICT (delete/modify): arch/x86/mach-voyager/setup.c deleted in HEAD and modified in quilt/rr. Version quilt/rr of arch/x86/mach-voyager/setup.c left in tree.
CONFLICT (content): Merge conflict in drivers/firmware/dcdbas.c
CONFLICT (content): Merge conflict in drivers/hid/hid-core.c
CONFLICT (content): Merge conflict in drivers/media/video/saa7134/saa7134-core.c
CONFLICT (content): Merge conflict in drivers/media/video/saa7134/saa7134.h
CONFLICT (content): Merge conflict in drivers/net/virtio_net.c
CONFLICT (content): Merge conflict in kernel/module.c
$ git rm -f arch/x86/mach-default/setup.c
$ git rm -f arch/x86/mach-voyager/setup.c
Applying: rr: x86 irqaction merge fixup
Merging cifs/master
Merging mmc/next
Merging gfs2/master
Merging input/next
Merging bkl-removal/bkl-removal
Merging ubifs/linux-next
Merging lsm/for-next
Merging block/for-next
CONFLICT (content): Merge conflict in fs/bio-integrity.c
CONFLICT (content): Merge conflict in fs/bio.c
CONFLICT (content): Merge conflict in include/linux/bio.h
Merging embedded/master
Merging firmware/master
CONFLICT (content): Merge conflict in firmware/Makefile
CONFLICT (content): Merge conflict in firmware/WHENCE
CONFLICT (content): Merge conflict in sound/isa/Kconfig
Merging pcmcia/master
Merging battery/master
Merging leds/for-mm
Merging backlight/for-mm
Merging kgdb/kgdb-next
Merging slab/for-next
CONFLICT (content): Merge conflict in include/linux/rcupdate.h
CONFLICT (content): Merge conflict in include/linux/slub_def.h
CONFLICT (content): Merge conflict in mm/slob.c
CONFLICT (content): Merge conflict in mm/slub.c
Merging uclinux/for-next
Merging md/for-next
Merging mfd/for-next
Merging hdlc/hdlc-next
Merging drm/drm-next
CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_proc.c
Merging voltage/for-next
Merging security-testing/next
Merging lblnet/master
Merging quilt/ttydev
Merging agp/agp-next
Merging generic-ipi/auto-generic-ipi-next
Merging oprofile/auto-oprofile-next
Merging fastboot/auto-fastboot-next
Merging sparseirq/auto-sparseirq-next
Merging iommu/auto-iommu-next
CONFLICT (content): Merge conflict in Documentation/kernel-parameters.txt
CONFLICT (content): Merge conflict in arch/x86/Kconfig
CONFLICT (content): Merge conflict in lib/Makefile
Merging uwb/for-upstream
Merging watchdog/master
CONFLICT (content): Merge conflict in drivers/watchdog/omap_wdt.c
Merging proc/proc
CONFLICT (content): Merge conflict in security/selinux/hooks.c
Applying: proc: remove a new user of proc_dir_entry::owner
Merging bdev/master
Merging dwmw2-iommu/master
Merging cputime/cputime
Merging osd/linux-next
Merging fatfs/master
Merging fuse/for-next
Merging jc_docs/docs-next
Merging nommu/master
Merging trivial/for-next
Merging audit/for-next
Merging squashfs/master
Merging omap/for-next
Merging quilt/aoe
Merging kmemleak/kmemleak
CONFLICT (content): Merge conflict in Documentation/kernel-parameters.txt
CONFLICT (content): Merge conflict in MAINTAINERS
CONFLICT (content): Merge conflict in include/linux/percpu.h
CONFLICT (content): Merge conflict in init/main.c
CONFLICT (content): Merge conflict in kernel/module.c
CONFLICT (content): Merge conflict in lib/Kconfig.debug
CONFLICT (content): Merge conflict in mm/slob.c
CONFLICT (content): Merge conflict in mm/vmalloc.c
Merging suspend/linux-next
CONFLICT (content): Merge conflict in drivers/xen/manage.c
Merging quilt/driver-core
CONFLICT (content): Merge conflict in drivers/media/video/v4l2-device.c
CONFLICT (content): Merge conflict in drivers/net/wimax/i2400m/usb-notif.c
CONFLICT (content): Merge conflict in drivers/sh/maple/maple.c
Applying: acpi: update thermal for bus_id removal
Applying: net: update dnet.c for bus_id removal
Merging quilt/usb
Merging quilt/staging
CONFLICT (content): Merge conflict in drivers/gpu/drm/Makefile
Merging scsi-post-merge/master
Today's next tree randconfig build failed with
CC drivers/md/dm-exception-store.o
drivers/md/dm-exception-store.c: In function dm_exception_store_type_unregister:
drivers/md/dm-exception-store.c:133: error: implicit declaration of function module_refcount
Thanks
-Sachin
--
---------------------------------
Sachin Sant
IBM Linux Technology Center
India Systems and Technology Labs
Bangalore, India
---------------------------------
'hwrng: timeriomem' breaks an allyesconfig build on s390:
CC drivers/char/hw_random/timeriomem-rng.o
drivers/char/hw_random/timeriomem-rng.c: In function 'timeriomem_rng_data_read':
drivers/char/hw_random/timeriomem-rng.c:60: error: implicit declaration of function 'readl'
Signed-off-by: Heiko Carstens <[email protected]>
---
drivers/char/hw_random/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: linux-next/drivers/char/hw_random/Kconfig
===================================================================
--- linux-next.orig/drivers/char/hw_random/Kconfig
+++ linux-next/drivers/char/hw_random/Kconfig
@@ -22,7 +22,7 @@ config HW_RANDOM
config HW_RANDOM_TIMERIOMEM
tristate "Timer IOMEM HW Random Number Generator support"
- depends on HW_RANDOM
+ depends on HW_RANDOM && HAS_IOMEM
---help---
This driver provides kernel-side support for a generic Random
Number Generator used by reading a 'dumb' iomem address that
dnet: Dave DNET breaks an allyesconfig build on s390:
CC drivers/net/dnet.o
drivers/net/dnet.c: In function 'dnet_readw_mac':
drivers/net/dnet.c:36: error: implicit declaration of function 'writel'
drivers/net/dnet.c:43: error: implicit declaration of function 'readl'
drivers/net/dnet.c: In function 'dnet_probe':
drivers/net/dnet.c:873: error: implicit declaration of function 'ioremap'
drivers/net/dnet.c:873: warning: assignment makes pointer from integer without a cast
drivers/net/dnet.c:939: error: implicit declaration of function 'iounmap'
Signed-off-by: Heiko Carstens <[email protected]>
---
drivers/net/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: linux-next/drivers/net/Kconfig
===================================================================
--- linux-next.orig/drivers/net/Kconfig
+++ linux-next/drivers/net/Kconfig
@@ -1042,7 +1042,7 @@ config NI65
config DNET
tristate "Dave ethernet support (DNET)"
- depends on NET_ETHERNET
+ depends on NET_ETHERNET && HAS_IOMEM
select PHYLIB
help
The Dave ethernet interface (DNET) is found on Qong Board FPGA.
Signed-off-by: Ilya Yanok <[email protected]>
---
drivers/net/Kconfig | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 435e2e3..62d732a 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -1042,7 +1042,7 @@ config NI65
config DNET
tristate "Dave ethernet support (DNET)"
- depends on NET_ETHERNET
+ depends on NET_ETHERNET && HAS_IOMEM
select PHYLIB
help
The Dave ethernet interface (DNET) is found on Qong Board FPGA.
--
1.6.2
I get the crash below when I compile hardware support for SHA512
(CONFIG_CRYPTO_SHA512_S390=y) into the kernel:
Unable to handle kernel pointer dereference at virtual kernel address 000000003f9b0000
Oops: 0011 [#1] PREEMPT SMP DEBUG_PAGEALLOC
Modules linked in:
CPU: 1 Not tainted 2.6.29-rc8-next-20090320-dirty #18
Process cryptomgr_test (pid: 169, task: 000000003f8326a0, ksp: 000000003fb83d78)
Krnl PSW : 0704000180000000 0000000000032b80 (s390_sha_final+0x198/0x1d4)
R:0 T:1 IO:1 EX:1 Key:0 M:1 W:0 P:0 AS:0 CC:0 PM:0 EA:3
Krnl GPRS: 0000000000000003 00000000fffffff3 000000003f9affa4 0000000000fffffc
0000000000000080 0000000000000003 0000000000000000 000000003fb83d98
000000000060a6f0 000000003f9afc48 0000000000000000 000000003fb83b50
000000003f9afc58 0000000000403fb8 00000000001c4152 000000003fb83b50
Krnl Code: 0000000000032b76: a7f4ff60 brc 15,32a36
0000000000032b7a: 1843 lr %rr4,%rr3
0000000000032b7c: a7f4ffbb brc 15,32af2
>0000000000032b80: d7ff20002000 xc 0(256,%rr2),0(%rr2)
0000000000032b86: 41202100 la %rr2,256(%rr2)
0000000000032b8a: a737fffb brctg %rr3,32b80
0000000000032b8e: a7f4ff83 brc 15,32a94
0000000000032b92: d2ff30002000 mvc 0(256,%rr3),0(%rr2)
Call Trace:
([<000000003fb83c40>] 0x3fb83c40)
[<00000000001c4152>] crypto_shash_final+0x46/0x70
[<00000000001c41f4>] shash_async_final+0x34/0x48
[<00000000001c47ce>] shash_async_digest+0x12a/0x158
[<00000000001c615e>] alg_test_hash+0x1ae/0x634
[<00000000001c802e>] alg_test+0xa2/0x210
[<00000000001c51d8>] cryptomgr_test+0x6c/0x70
[<0000000000067d4a>] kthread+0x76/0xbc
[<000000000001befa>] kernel_thread_starter+0x6/0xc
[<000000000001bef4>] kernel_thread_starter+0x0/0xc
Last Breaking-Event-Address:
[<0000000000032b8a>] s390_sha_final+0x1a2/0x1d4
<4>---[ end trace 561bb236c800851f ]---
The problem here seems to be that
int s390_sha_final(struct shash_desc *desc, u8 *out)
gets called with an shash_desc where
bsize = crypto_shash_blocksize(desc->tfm);
results in bsize with zero.
Later in s390_sha_final we see this:
/* pad with zeros */
memset(ctx->buf + index, 0x00, end - index - 8);
because of bsize being zero the result of "end - index -8" is -12.
Obviously it isn't a very good thing to pass a length of -12 to memset.
I have no idea where the bug is: either the s390 arch specific part is
broken because it cannot handle zero sized block sizes or the common
code is broken because it even calls this function with a size of zero.
Jan, Herbert?
On Fri, Mar 20, 2009 at 10:09:01AM +0100, Heiko Carstens wrote:
> 'hwrng: timeriomem' breaks an allyesconfig build on s390:
>
> CC drivers/char/hw_random/timeriomem-rng.o
> drivers/char/hw_random/timeriomem-rng.c: In function 'timeriomem_rng_data_read':
> drivers/char/hw_random/timeriomem-rng.c:60: error: implicit declaration of function 'readl'
>
> Signed-off-by: Heiko Carstens <[email protected]>
Patch applied. Thanks Heiko!
--
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
On Fri, Mar 20, 2009 at 01:59:12PM +0100, Heiko Carstens wrote:
>
> gets called with an shash_desc where
>
> bsize = crypto_shash_blocksize(desc->tfm);
>
> results in bsize with zero.
Oops, this patch should fix it.
commit b24c94a0d65282dc466339390472d7539e1706c2
Author: Herbert Xu <[email protected]>
Date: Sat Mar 21 14:25:19 2009 +0800
crypto: sha512-s390 - Add missing block size
I missed the block size when converting sha512-s390 to shash.
Reported-by: Heiko Carstens <[email protected]>
Signed-off-by: Herbert Xu <[email protected]>
diff --git a/arch/s390/crypto/sha512_s390.c b/arch/s390/crypto/sha512_s390.c
index 420acf4..37b4236 100644
--- a/arch/s390/crypto/sha512_s390.c
+++ b/arch/s390/crypto/sha512_s390.c
@@ -84,6 +84,7 @@ static struct shash_alg sha384_alg = {
.cra_driver_name= "sha384-s390",
.cra_priority = CRYPT_S390_PRIORITY,
.cra_flags = CRYPTO_ALG_TYPE_SHASH,
+ .cra_blocksize = SHA512_BLOCK_SIZE,
.cra_ctxsize = sizeof(struct s390_sha_ctx),
.cra_module = THIS_MODULE,
}
Thanks,
--
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
Hi,
* Herbert Xu <[email protected]> [2009-03-21 14:19:22+0800]:
>
> On Fri, Mar 20, 2009 at 10:09:01AM +0100, Heiko Carstens wrote:
> > 'hwrng: timeriomem' breaks an allyesconfig build on s390:
> >
> > CC drivers/char/hw_random/timeriomem-rng.o
> > drivers/char/hw_random/timeriomem-rng.c: In function 'timeriomem_rng_data_read':
> > drivers/char/hw_random/timeriomem-rng.c:60: error: implicit declaration of function 'readl'
> >
> > Signed-off-by: Heiko Carstens <[email protected]>
>
> Patch applied. Thanks Heiko!
>
Yes, thanks for catching this.
Cheers
--
Alexander Clouter
.sigmonster says: Don't kiss an elephant on the lips today.
On Sat, 21 Mar 2009 14:26:05 +0800
Herbert Xu <[email protected]> wrote:
> On Fri, Mar 20, 2009 at 01:59:12PM +0100, Heiko Carstens wrote:
> >
> > gets called with an shash_desc where
> >
> > bsize = crypto_shash_blocksize(desc->tfm);
> >
> > results in bsize with zero.
>
> Oops, this patch should fix it.
>
> commit b24c94a0d65282dc466339390472d7539e1706c2
> Author: Herbert Xu <[email protected]>
> Date: Sat Mar 21 14:25:19 2009 +0800
>
> crypto: sha512-s390 - Add missing block size
>
> I missed the block size when converting sha512-s390 to shash.
>
> Reported-by: Heiko Carstens <[email protected]>
> Signed-off-by: Herbert Xu <[email protected]>
>
> diff --git a/arch/s390/crypto/sha512_s390.c b/arch/s390/crypto/sha512_s390.c
> index 420acf4..37b4236 100644
> --- a/arch/s390/crypto/sha512_s390.c
> +++ b/arch/s390/crypto/sha512_s390.c
> @@ -84,6 +84,7 @@ static struct shash_alg sha384_alg = {
> .cra_driver_name= "sha384-s390",
> .cra_priority = CRYPT_S390_PRIORITY,
> .cra_flags = CRYPTO_ALG_TYPE_SHASH,
> + .cra_blocksize = SHA512_BLOCK_SIZE,
Yes, it does fix it. Thanks!
Tested-by: Heiko Carstens <[email protected]>
On Sat, Mar 21, 2009 at 11:56:29AM +0100, Heiko Carstens wrote:
>
> > diff --git a/arch/s390/crypto/sha512_s390.c b/arch/s390/crypto/sha512_s390.c
> > index 420acf4..37b4236 100644
> > --- a/arch/s390/crypto/sha512_s390.c
> > +++ b/arch/s390/crypto/sha512_s390.c
> > @@ -84,6 +84,7 @@ static struct shash_alg sha384_alg = {
> > .cra_driver_name= "sha384-s390",
> > .cra_priority = CRYPT_S390_PRIORITY,
> > .cra_flags = CRYPTO_ALG_TYPE_SHASH,
> > + .cra_blocksize = SHA512_BLOCK_SIZE,
>
> Yes, it does fix it. Thanks!
>
> Tested-by: Heiko Carstens <[email protected]>
Thanks. I've now changed it to say SHA384_BLOCK_SIZE (which is
identical but makes a little more sense).
Cheers,
--
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
From: Ilya Yanok <[email protected]>
Date: Fri, 20 Mar 2009 14:06:25 +0300
> Signed-off-by: Ilya Yanok <[email protected]>
Applied, thanks.