linux-next: Tree for November 5
Subsystems (5)
Hi all,
Changes since 20091104:
My fixes tree contains a build fix for powerpc/kvm.
The pcmcia tree lost its build failure.
The drbd tree lost its conflicts.
The catalin tree lots its conflicts.
The sparc tree gained a build failure for which I applied a patch.
----------------------------------------------------------------------------
I have created today's linux-next tree atgit://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 146 trees (counting Linus' and 22 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.
Signature · 178 lines
Cheers, Stephen Rothwell [email protected] $ 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 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 Merging quilt/staging.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 ide-curent/master Merging dwmw2/master Merging arm/devel Merging davinci/davinci-next Merging msm/for-next Merging omap/for-next Merging pxa/for-next Merging avr32/avr32-arch CONFLICT (content): Merge conflict in arch/avr32/mach-at32ap/include/mach/cpu.h 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 Merging parisc/next Merging powerpc/next Merging 4xx/next Merging galak/next Merging s390/features Merging sh/master Merging sparc/master Merging xtensa/master Merging ceph/for-next 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 reiserfs-bkl/reiserfs/kill-bkl 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 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 CONFLICT (content): Merge conflict in arch/powerpc/kvm/timing.h Merging dlm/next Merging scsi/master Merging async_tx/next Merging net/master CONFLICT (delete/modify): drivers/net/sfc/sfe4001.c deleted in net/master and modified in HEAD. Version HEAD of drivers/net/sfc/sfe4001.c left in tree. CONFLICT (content): Merge conflict in drivers/net/wireless/libertas/cmd.c CONFLICT (content): Merge conflict in drivers/staging/rtl8187se/Kconfig CONFLICT (content): Merge conflict in drivers/staging/rtl8192e/Kconfig $ git rm -f drivers/net/sfc/sfe4001.c Applying: net: merge fixup for drivers/net/sfc/falcon_boards.c Merging wireless/master CONFLICT (content): Merge conflict in drivers/staging/Kconfig CONFLICT (content): Merge conflict in drivers/staging/Makefile Merging mtd/master Merging crypto/master Merging sound/for-next CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-omap3evm.c Merging cpufreq/next Merging quilt/rr Merging mmc/next Merging tmio-mmc/linux-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 CONFLICT (content): Merge conflict in drivers/pcmcia/Makefile 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 CONFLICT (content): Merge conflict in drivers/mfd/Kconfig CONFLICT (content): Merge conflict in drivers/mfd/Makefile Merging security-testing/next CONFLICT (content): Merge conflict in Documentation/dontdiff 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 quilt/aoe Merging suspend/linux-next Merging bluetooth/master Merging fsnotify/for-next Merging irda/for-next Merging hwlat/for-linus CONFLICT (content): Merge conflict in drivers/misc/Makefile Merging drbd/for-jens Merging catalin/for-next Merging alacrity/linux-next CONFLICT (content): Merge conflict in drivers/net/Kconfig CONFLICT (content): Merge conflict in lib/Kconfig Merging i7core_edac/linux_next Merging devicetree/next-devicetree Merging limits/writable_limits Merging tip/auto-latest CONFLICT (content): Merge conflict in arch/x86/kernel/kgdb.c Merging oprofile/for-next Merging percpu/for-next CONFLICT (content): Merge conflict in arch/x86/kvm/svm.c CONFLICT (content): Merge conflict in kernel/softlockup.c CONFLICT (content): Merge conflict in mm/percpu.c Applying: percpu: merge fixup for variable renaming Merging sfi/sfi-test Merging asm-generic/next Merging hwpoison/hwpoison Merging quilt/driver-core Merging quilt/tty Merging quilt/usb Merging quilt/staging CONFLICT (content): Merge conflict in drivers/staging/Kconfig CONFLICT (content): Merge conflict in drivers/staging/Makefile Merging scsi-post-merge/master Applying: sparc: the GRLIB APBUART serial port will only build on sparc
Today's next tree fails to build on i386 with
arch/x86/pci/built-in.o: In function `align_resource':arch/x86/pci/acpi.c:82: undefined reference to `__udivdi3'
The code in question was added by commit03db42adfeeabe856dbb6894dd3aaff55838330a.
Thanks
-Sachin
Signature · 6 lines
--------------------------------- Sachin Sant IBM Linux Technology Center India Systems and Technology Labs Bangalore, India ---------------------------------
Quoted 7 lines · Sachin Sant
Today's next tree fails to build on i386 with
arch/x86/pci/built-in.o: In function `align_resource':arch/x86/pci/acpi.c:82: undefined reference to `__udivdi3'The code in question was added by commit
03db42adfeeabe856dbb6894dd3aaff55838330a.
I'll look into this. I did build and test a 32-bit x86 kernel, but I built it on an x86_64 box using "linux32 make ...", which looks like it used gcc 4.3.2.
Bjorn
Quoted 6 lines · Bjorn Helgaas
Quoted 5 lines · Sachin Sant
Today's next tree fails to build on i386 with
arch/x86/pci/built-in.o: In function `align_resource':arch/x86/pci/acpi.c:82: undefined reference to `__udivdi3'
Quoted 6 lines
Quoted 2 lines
The code in question was added by commit
03db42adfeeabe856dbb6894dd3aaff55838330a.I'll look into this. I did build and test a 32-bit x86 kernel, but I built it on an
x86_64box using "linux32 make ...", which looks like it used gcc 4.3.2.
Can you try the patch below, please?
commit 00f16f0a2f4826eadec0565e4b454ab8bc7824cc
Author: Bjorn Helgaas <[email protected]> Date: Thu Nov 5 10:03:57 2009 -0700
x86/PCI: remove 64-bit division
The roundup() caused a build error (undefined reference to `__udivdi3'). We're aligning to power-of-two boundaries, so it's simpler to just use ALIGN() anyway, which avoids the division.
arch/x86/pci/acpi.c +3 -3
@@ -69,17 +69,17 @@ align_resource(struct acpi_device *bridge, struct resource *res)* that claim this address space have starting alignment and length * constraints, so fix any obvious BIOS goofs. */ -if (res->start & (align -1 )) { +if (!IS_ALIGNED (res->start, align)) {dev_printk (KERN_DEBUG , &bridge->dev,"host bridge window %pR invalid; " "aligning start to %d-byte boundary\n" , res, align); res->start &= ~(align -1 ); } -if ((res->end +1 ) & (align -1 )) { +if (!IS_ALIGNED (res->end +1 , align)) {dev_printk (KERN_DEBUG , &bridge->dev,"host bridge window %pR invalid; " "aligning end to %d-byte boundary\n" , res, align); - res->end =roundup (res->end, align) -1 ; + res->end =ALIGN (res->end, align) -1 ; } }
Quoted 7 lines · Bjorn Helgaas
Quoted 6 lines · Bjorn Helgaas
Quoted 5 lines · Sachin Sant
Today's next tree fails to build on i386 with
arch/x86/pci/built-in.o: In function `align_resource':arch/x86/pci/acpi.c:82: undefined reference to `__udivdi3'
Quoted 8 lines
Quoted 6 lines
Quoted 2 lines
The code in question was added by commit
03db42adfeeabe856dbb6894dd3aaff55838330a.I'll look into this. I did build and test a 32-bit x86 kernel, but I built it on an
x86_64box using "linux32 make ...", which looks like it used gcc 4.3.2.Can you try the patch below, please?
Sachin, can you please try this patch and report whether it fixes the undefined reference? I hate to have linux-next broken longer than necessary.
Quoted 38 lines
commit
00f16f0a2f4826eadec0565e4b454ab8bc7824ccAuthor: Bjorn Helgaas <[email protected]> Date: Thu Nov 5 10:03:57 2009 -0700x86/PCI: remove 64-bit division
The
roundup()caused a build error (undefined reference to `__udivdi3'). We're aligning to power-of-two boundaries, so it's simpler to just useALIGN()anyway, which avoids the division.Signed-off-by Bjorn Helgaas <[email protected]>arch/x86/pci/acpi.c +3
-3@@ -69,17 +69,17 @@ align_resource(struct acpi_device *bridge, struct resource *res)* that claim this address space have starting alignment and length * constraints, so fix any obvious BIOS goofs. */ -if (res->start & (align -1 )) { +if (!IS_ALIGNED (res->start, align)) {dev_printk (KERN_DEBUG , &bridge->dev,"host bridge window %pR invalid; " "aligning start to %d-byte boundary\n" , res, align); res->start &= ~(align -1 ); } -if ((res->end +1 ) & (align -1 )) { +if (!IS_ALIGNED (res->end +1 , align)) {dev_printk (KERN_DEBUG , &bridge->dev,"host bridge window %pR invalid; " "aligning end to %d-byte boundary\n" , res, align); - res->end =roundup (res->end, align) -1 ; + res->end =ALIGN (res->end, align) -1 ; } }
Quoted 18 lines · Bjorn Helgaas
Quoted 16 lines · Bjorn Helgaas
Quoted 14 lines · Bjorn Helgaas
Quoted 8 lines · Sachin Sant
Today's next tree fails to build on i386 with
arch/x86/pci/built-in.o: In function `align_resource':arch/x86/pci/acpi.c:82: undefined reference to `__udivdi3'The code in question was added by commit
03db42adfeeabe856dbb6894dd3aaff55838330a.I'll look into this. I did build and test a 32-bit x86 kernel, but I built it on an
x86_64box using "linux32 make ...", which looks like it used gcc 4.3.2.
Quoted 7 lines
Quoted 2 lines
Can you try the patch below, please?
Sachin, can you please try this patch and report whether it fixes the undefined reference? I hate to have linux-next broken longer than necessary.
Sorry was away from office for a day. Yes the patch fixed the build break for me.
Thanks for the patch.
Regards
-Sachin
Signature · 6 lines
--------------------------------- Sachin Sant IBM Linux Technology Center India Systems and Technology Labs Bangalore, India ---------------------------------
Randy Dunlap
Acked-byQuoted 7 lines · On Thu, 5 Nov 2009 11:17:11 -0600 Bjorn Helgaas wrote:
Quoted 6 lines · Bjorn Helgaas
Quoted 5 lines · Sachin Sant
Today's next tree fails to build on i386 with
arch/x86/pci/built-in.o: In function `align_resource':arch/x86/pci/acpi.c:82: undefined reference to `__udivdi3'
Quoted 9 lines
Quoted 6 lines
Quoted 2 lines
The code in question was added by commit
03db42adfeeabe856dbb6894dd3aaff55838330a.I'll look into this. I did build and test a 32-bit x86 kernel, but I built it on an
x86_64box using "linux32 make ...", which looks like it used gcc 4.3.2.Can you try the patch below, please?
This patch fixes this problem for me in today's linux-next-20091106. Thanks.
Quoted 39 lines
commit
00f16f0a2f4826eadec0565e4b454ab8bc7824ccAuthor: Bjorn Helgaas <[email protected]> Date: Thu Nov 5 10:03:57 2009 -0700x86/PCI: remove 64-bit division
The
roundup()caused a build error (undefined reference to `__udivdi3'). We're aligning to power-of-two boundaries, so it's simpler to just useALIGN()anyway, which avoids the division.Signed-off-by Bjorn Helgaas <[email protected]>arch/x86/pci/acpi.c +3
-4@@ -69,17 +69,17 @@ align_resource(struct acpi_device *bridge, struct resource *res)* that claim this address space have starting alignment and length * constraints, so fix any obvious BIOS goofs. */ -if (res->start & (align -1 )) { +if (!IS_ALIGNED (res->start, align)) {dev_printk (KERN_DEBUG , &bridge->dev,"host bridge window %pR invalid; " "aligning start to %d-byte boundary\n" , res, align); res->start &= ~(align -1 ); } -if ((res->end +1 ) & (align -1 )) { +if (!IS_ALIGNED (res->end +1 , align)) {dev_printk (KERN_DEBUG , &bridge->dev,"host bridge window %pR invalid; " "aligning end to %d-byte boundary\n" , res, align); - res->end =roundup (res->end, align) -1 ; + res->end =ALIGN (res->end, align) -1 ; } } --
Quoted 4 lines
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
---
~Randy
Quoted 21 lines · On Thu, 5 Nov 2009 11:17:11 -0600 Bjorn Helgaas <[email protected]> wrote:
Quoted 6 lines · Bjorn Helgaas
Quoted 5 lines · Sachin Sant
Today's next tree fails to build on i386 with
arch/x86/pci/built-in.o: In function `align_resource':arch/x86/pci/acpi.c:82: undefined reference to `__udivdi3'Quoted 6 lines
Quoted 2 lines
The code in question was added by commit
03db42adfeeabe856dbb6894dd3aaff55838330a.I'll look into this. I did build and test a 32-bit x86 kernel, but I built it on an
x86_64box using "linux32 make ...", which looks like it used gcc 4.3.2.Can you try the patch below, please?
commit
00f16f0a2f4826eadec0565e4b454ab8bc7824ccAuthor: Bjorn Helgaas <[email protected]> Date: Thu Nov 5 10:03:57 2009 -0700
Quoted 7 lines
x86/PCI: remove 64-bit division
The
roundup()caused a build error (undefined reference to
`__udivdi3'). We're aligning to power-of-two boundaries, so it's simpler to just useALIGN()anyway, which avoids the division.Signed-off-by Bjorn Helgaas <[email protected]>
Applied with Randy's ack. Thanks.
Signature · 1 line
Jesse Barnes, Intel Open Source Technology Center
PATCH 1/1 sound: hda, move hp_bseries_system
In reply to Stephen RothwellFrom: Randy Dunlap <[email protected]>
Function hp_bseries_system() is always used, outside of CONFIG_ boundaries/controls, so move it.
sound/pci/hda/patch_sigmatel.c:5458: error: implicit declaration of function 'hp_bseries_system'
--- sound/pci/hda/patch_sigmatel.c | 40 +++++++++++++++---------------- 1 file changed, 20 insertions(+), 20 deletions(-)
sound/pci/hda/patch_sigmatel.c +20 -20
@@ -4668,6 +4668,26 @@ static void stac92xx_unsol_event(struct } } +static int hp_bseries_system (u32 subsystem_id) +{ +switch (subsystem_id) { +case 0x103c307e : +case 0x103c307f : +case 0x103c3080 : +case 0x103c3081 : +case 0x103c1722 : +case 0x103c1723 : +case 0x103c1724 : +case 0x103c1725 : +case 0x103c1726 : +case 0x103c1727 : +case 0x103c1728 : +case 0x103c1729 : +return 1 ; + } +return 0 ; +} +#ifdef CONFIG_PROC_FS static void stac92hd_proc_hook (struct snd_info_buffer *buffer,struct hda_codec *codec,hda_nid_t nid)
@@ -4733,26 +4753,6 @@ static int stac92xx_resume(struct hda_coreturn 0 ; } -static int hp_bseries_system (u32 subsystem_id) -{ -switch (subsystem_id) { -case 0x103c307e : -case 0x103c307f : -case 0x103c3080 : -case 0x103c3081 : -case 0x103c1722 : -case 0x103c1723 : -case 0x103c1724 : -case 0x103c1725 : -case 0x103c1726 : -case 0x103c1727 : -case 0x103c1728 : -case 0x103c1729 : -return 1 ; - } -return 0 ; -} -/* * using power check for controlling mute led of HP notebooks * check for mute state only on Speakers (nid = 0x10)
Re: [PATCH -next] sound: hda, move hp_bseries_system
At Thu, 5 Nov 2009 09:22:30 -0800,
Quoted 9 lines · Randy Dunlap
From: Randy Dunlap <[email protected]>
Function
hp_bseries_system()is always used, outside ofCONFIG_boundaries/controls, so move it.
sound/pci/hda/patch_sigmatel.c:5458: error: implicit declaration of function 'hp_bseries_system'Signed-off-by Randy Dunlap <[email protected]>
Applied now. Thanks!
Takashi
Quoted 61 lines
--- sound/pci/hda/patch_sigmatel.c | 40 +++++++++++++++---------------- 1 file changed, 20 insertions(+), 20 deletions(-)sound/pci/hda/patch_sigmatel.c +20
-20@@ -4668,6 +4668,26 @@ static void stac92xx_unsol_event(struct } } +static int hp_bseries_system (u32 subsystem_id) +{ +switch (subsystem_id) { +case 0x103c307e : +case 0x103c307f : +case 0x103c3080 : +case 0x103c3081 : +case 0x103c1722 : +case 0x103c1723 : +case 0x103c1724 : +case 0x103c1725 : +case 0x103c1726 : +case 0x103c1727 : +case 0x103c1728 : +case 0x103c1729 : +return 1 ; + } +return 0 ; +} +#ifdef CONFIG_PROC_FS static void stac92hd_proc_hook (struct snd_info_buffer *buffer,struct hda_codec *codec,hda_nid_t nid)@@ -4733,26 +4753,6 @@ static int stac92xx_resume(struct hda_coreturn 0 ; } -static int hp_bseries_system (u32 subsystem_id) -{ -switch (subsystem_id) { -case 0x103c307e : -case 0x103c307f : -case 0x103c3080 : -case 0x103c3081 : -case 0x103c1722 : -case 0x103c1723 : -case 0x103c1724 : -case 0x103c1725 : -case 0x103c1726 : -case 0x103c1727 : -case 0x103c1728 : -case 0x103c1729 : -return 1 ; - } -return 0 ; -} -/* * using power check for controlling mute led of HP notebooks * check for mute state only on Speakers (nid = 0x10)