Skip to contentSkip to conversation

linux-next: Tree for October 26

PATCH Applied Stephen Rothwell 7 participants 10 messages Oct 26, 2009 – Oct 28, 2009

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

Hi all,

Changes since 20091016:

New trees: ceph, limits

My fixes tree contains a build fix for powerpc/kvm.

The ecryptfs tree lost its conflict.

The kbuild tree lost its build failure.

The device-mapper quilt series failed to import, but it was just a BASE problem.

The net tree gained a conflict against the i2c 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 144 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 · 174 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 omap/for-next
Merging pxa/for-next
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
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
CONFLICT (content): Merge conflict in drivers/pci/pci.c
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
CONFLICT (content): Merge conflict in arch/x86/kvm/mmu.c
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.
$ git rm -f drivers/net/sfc/sfe4001.c
Applying: net: merge fixup for drivers/net/sfc/falcon_boards.c
Merging wireless/master
Merging mtd/master
Merging crypto/master
Merging sound/for-next
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
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
CONFLICT (content): Merge conflict in drivers/acpi/video_detect.c
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
CONFLICT (add/add): Merge conflict in drivers/block/drbd/Kconfig
CONFLICT (add/add): Merge conflict in drivers/block/drbd/Makefile
CONFLICT (add/add): Merge conflict in drivers/block/drbd/drbd_actlog.c
CONFLICT (add/add): Merge conflict in drivers/block/drbd/drbd_int.h
CONFLICT (add/add): Merge conflict in drivers/block/drbd/drbd_main.c
CONFLICT (add/add): Merge conflict in drivers/block/drbd/drbd_nl.c
CONFLICT (add/add): Merge conflict in drivers/block/drbd/drbd_receiver.c
CONFLICT (add/add): Merge conflict in drivers/block/drbd/drbd_req.c
CONFLICT (add/add): Merge conflict in drivers/block/drbd/drbd_worker.c
CONFLICT (add/add): Merge conflict in include/linux/drbd.h
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
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
#1 lore raw

Hi,

build fails with ghash ghash-clmulni-intel_asm.S:

AS arch/x86/crypto/ghash-clmulni-intel_asm.o
arch/x86/crypto/ghash-clmulni-intel_asm.S: Assembler messages:
arch/x86/crypto/ghash-clmulni-intel_asm.S:100: Error: bad register name %rdi)' arch/x86/crypto/ghash-clmulni-intel_asm.S:101: Error: bad register name %rsi)' arch/x86/crypto/ghash-clmulni-intel_asm.S:106: Error: bad register name %rdi)' arch/x86/crypto/ghash-clmulni-intel_asm.S:114: Error: bad register name %rdx' arch/x86/crypto/ghash-clmulni-intel_asm.S:117: Error: bad register name %rdi)' arch/x86/crypto/ghash-clmulni-intel_asm.S:118: Error: bad register name %rcx)' arch/x86/crypto/ghash-clmulni-intel_asm.S:122: Error: bad register name %rsi)' arch/x86/crypto/ghash-clmulni-intel_asm.S:126: Error: bad register name %rdx' arch/x86/crypto/ghash-clmulni-intel_asm.S:127: Error: bad register name %rsi' arch/x86/crypto/ghash-clmulni-intel_asm.S:128: Error: bad register name %rdx' arch/x86/crypto/ghash-clmulni-intel_asm.S:131: Error: bad register name %rdi)' arch/x86/crypto/ghash-clmulni-intel_asm.S:142: Error: bad register name %rsi)' arch/x86/crypto/ghash-clmulni-intel_asm.S:156: Error: bad register name `%rdi)' make[2]: *** [arch/x86/crypto/ghash-clmulni-intel_asm.o] Error 1 make[1]: *** [arch/x86/crypto] Error 2
make: *** [arch/x86] Error 2
make: *** Waiting for unfinished jobs....

cc herbert & huang ying

--
Regards
dave

#2 lore raw
Quoted 3 lines · Dave Young

Hi,

build fails with ghash ghash-clmulni-intel_asm.S:

It is a x86_32 laptop

Quoted 27 lines

 AS      arch/x86/crypto/ghash-clmulni-intel_asm.o arch/x86/crypto/ghash-clmulni-intel_asm.S: Assembler messages:
arch/x86/crypto/ghash-clmulni-intel_asm.S:100: Error: bad register name %rdi)' arch/x86/crypto/ghash-clmulni-intel_asm.S:101: Error: bad register name %rsi)' arch/x86/crypto/ghash-clmulni-intel_asm.S:106: Error: bad register name %rdi)' arch/x86/crypto/ghash-clmulni-intel_asm.S:114: Error: bad register name %rdx' arch/x86/crypto/ghash-clmulni-intel_asm.S:117: Error: bad register name %rdi)' arch/x86/crypto/ghash-clmulni-intel_asm.S:118: Error: bad register name %rcx)' arch/x86/crypto/ghash-clmulni-intel_asm.S:122: Error: bad register name %rsi)' arch/x86/crypto/ghash-clmulni-intel_asm.S:126: Error: bad register name %rdx' arch/x86/crypto/ghash-clmulni-intel_asm.S:127: Error: bad register name %rsi' arch/x86/crypto/ghash-clmulni-intel_asm.S:128: Error: bad register name %rdx' arch/x86/crypto/ghash-clmulni-intel_asm.S:131: Error: bad register name %rdi)' arch/x86/crypto/ghash-clmulni-intel_asm.S:142: Error: bad register name %rsi)' arch/x86/crypto/ghash-clmulni-intel_asm.S:156: Error: bad register name `%rdi)' make[2]: *** [arch/x86/crypto/ghash-clmulni-intel_asm.o] Error 1 make[1]: *** [arch/x86/crypto] Error 2
make: *** [arch/x86] Error 2
make: *** Waiting for unfinished jobs....

cc herbert & huang ying

--
Regards
dave

Signature · 2 lines
Regards
dave
#3 lore raw

Sorry, this should be turned off for x86_32. I will fix this.

Best Regards,
Huang Ying

Quoted 38 lines · Dave Young
Quoted 3 lines · Dave Young

Hi,

build fails with ghash ghash-clmulni-intel_asm.S:

It is a x86_32 laptop

Quoted 27 lines

AS arch/x86/crypto/ghash-clmulni-intel_asm.o
arch/x86/crypto/ghash-clmulni-intel_asm.S: Assembler messages:
arch/x86/crypto/ghash-clmulni-intel_asm.S:100: Error: bad register name %rdi)' arch/x86/crypto/ghash-clmulni-intel_asm.S:101: Error: bad register name %rsi)' arch/x86/crypto/ghash-clmulni-intel_asm.S:106: Error: bad register name %rdi)' arch/x86/crypto/ghash-clmulni-intel_asm.S:114: Error: bad register name %rdx' arch/x86/crypto/ghash-clmulni-intel_asm.S:117: Error: bad register name %rdi)' arch/x86/crypto/ghash-clmulni-intel_asm.S:118: Error: bad register name %rcx)' arch/x86/crypto/ghash-clmulni-intel_asm.S:122: Error: bad register name %rsi)' arch/x86/crypto/ghash-clmulni-intel_asm.S:126: Error: bad register name %rdx' arch/x86/crypto/ghash-clmulni-intel_asm.S:127: Error: bad register name %rsi' arch/x86/crypto/ghash-clmulni-intel_asm.S:128: Error: bad register name %rdx' arch/x86/crypto/ghash-clmulni-intel_asm.S:131: Error: bad register name %rdi)' arch/x86/crypto/ghash-clmulni-intel_asm.S:142: Error: bad register name %rsi)' arch/x86/crypto/ghash-clmulni-intel_asm.S:156: Error: bad register name `%rdi)' make[2]: *** [arch/x86/crypto/ghash-clmulni-intel_asm.o] Error 1 make[1]: *** [arch/x86/crypto] Error 2
make: *** [arch/x86] Error 2
make: *** Waiting for unfinished jobs....

cc herbert & huang ying

--
Regards
dave

#4 lore raw

Re: linux-next: Tree for October 26 (gfs2)

In reply to Stephen Rothwell
Quoted 3 lines · On Mon, 26 Oct 2009 17:21:04 +1100 Stephen Rothwell wrote:

Hi all,

Changes since 20091016:

on i386:

(.text+0x723a8b): undefined reference to `__divdi3'

super.c::gfs2_statfs_change():

		percent = (100 * l_sc->sc_free) / m_sc->sc_free;

I guess it needs to use div64() etc.

---
~Randy

#5 lore raw

Re: linux-next: Tree for October 26 (gfs2)

Hi,

Quoted 11 lines · Randy Dunlap
Quoted 3 lines · On Mon, 26 Oct 2009 17:21:04 +1100 Stephen Rothwell wrote:

Hi all,

Changes since 20091016:

on i386:

(.text+0x723a8b): undefined reference to `__divdi3'

Quoted 8 lines

super.c::gfs2_statfs_change():

		percent = (100 * l_sc->sc_free) / m_sc->sc_free;

I guess it needs to use div64() etc.

---
~Randy

Yes, it looks like it,

Steve.

#6 lore raw

PATCH 1/1 netxen: fix builds for SYSFS=n or MODULES=n

In reply to Stephen Rothwell

From: Randy Dunlap <[email protected]>

When CONFIG_MODULES=n:
drivers/net/netxen/netxen_nic_main.c:2751: error: dereferencing pointer to incomplete type drivers/net/netxen/netxen_nic_main.c:2764: error: dereferencing pointer to incomplete type

Also needs addition of <linux/sysfs.h> for sysfs function prototypes or stubs when CONFIG_SYSFS=n.

---
 drivers/net/netxen/netxen_nic_main.c |    9 +++++++++
 1 file changed, 9 insertions(+)
drivers/net/netxen/netxen_nic_main.c +9 -0
@@ -34,6 +34,7 @@
 #include <net/ip.h>
 #include <linux/ipv6.h>
 #include <linux/inetdevice.h>
+#include <linux/sysfs.h>
 
 MODULE_DESCRIPTION("NetXen Multi port (1/10) Gigabit Network Driver");
 MODULE_LICENSE("GPL");
@@ -2500,6 +2501,7 @@ static struct bin_attribute bin_attr_mem
 	.write = netxen_sysfs_write_mem,
 };
 
+#ifdef CONFIG_MODULES
 static ssize_t
 netxen_store_auto_fw_reset(struct module_attribute *mattr,
 		struct module *mod, const char *buf, size_t count)
@@ -2534,6 +2536,7 @@ static struct module_attribute mod_attr_
 	.show = netxen_show_auto_fw_reset,
 	.store = netxen_store_auto_fw_reset,
 };
+#endif
 
 static void
 netxen_create_sysfs_entries(struct netxen_adapter *adapter)
@@ -2739,7 +2742,9 @@ static struct pci_driver netxen_driver =
 
 static int __init netxen_init_module(void)
 {
+#ifdef CONFIG_MODULES
 	struct module *mod = THIS_MODULE;
+#endif
 
 	printk(KERN_INFO "%s\n", netxen_nic_driver_string);
 
@@ -2748,9 +2753,11 @@ static int __init netxen_init_module(voi
 	register_inetaddr_notifier(&netxen_inetaddr_cb);
 #endif
 
+#ifdef CONFIG_MODULES
 	if (sysfs_create_file(&mod->mkobj.kobj, &mod_attr_fw_reset.attr))
 		printk(KERN_ERR "%s: Failed to create auto_fw_reset "
 				"sysfs entry.", netxen_nic_driver_name);
+#endif
 
 	return pci_register_driver(&netxen_driver);
 }
@@ -2759,9 +2766,11 @@ module_init(netxen_init_module);
 
 static void __exit netxen_exit_module(void)
 {
+#ifdef CONFIG_MODULES
 	struct module *mod = THIS_MODULE;
 
 	sysfs_remove_file(&mod->mkobj.kobj, &mod_attr_fw_reset.attr);
+#endif
 
 	pci_unregister_driver(&netxen_driver);
 
Acked-by on v1 1/1
#7 lore raw

RE: [PATCH -next] netxen: fix builds for SYSFS=n or MODULES=n

Sorry, seems like I am keeping you busy with the build errors. Thanks for fixing it again (may be I need to setup all different build configs).

-----Original Message-----
From: Randy Dunlap [mailto:[email protected]]
Sent: Monday, October 26, 2009 3:10 PM
To: Stephen Rothwell; netdev
Cc: [email protected]; LKML; [email protected]; Dhananjay Phadke
Subject: [PATCH -next] netxen: fix builds for SYSFS=n or MODULES=n

From: Randy Dunlap <[email protected]>

When CONFIG_MODULES=n:
drivers/net/netxen/netxen_nic_main.c:2751: error: dereferencing pointer to incomplete type drivers/net/netxen/netxen_nic_main.c:2764: error: dereferencing pointer to incomplete type

Also needs addition of <linux/sysfs.h> for sysfs function prototypes or stubs when CONFIG_SYSFS=n.

---
 drivers/net/netxen/netxen_nic_main.c |    9 +++++++++
 1 file changed, 9 insertions(+)
drivers/net/netxen/netxen_nic_main.c +9 -0
@@ -34,6 +34,7 @@
 #include <net/ip.h>
 #include <linux/ipv6.h>
 #include <linux/inetdevice.h>
+#include <linux/sysfs.h>
 
 MODULE_DESCRIPTION("NetXen Multi port (1/10) Gigabit Network Driver");
 MODULE_LICENSE("GPL");
@@ -2500,6 +2501,7 @@ static struct bin_attribute bin_attr_mem
 	.write = netxen_sysfs_write_mem,
 };
 
+#ifdef CONFIG_MODULES
 static ssize_t
 netxen_store_auto_fw_reset(struct module_attribute *mattr,
 		struct module *mod, const char *buf, size_t count)
@@ -2534,6 +2536,7 @@ static struct module_attribute mod_attr_
 	.show = netxen_show_auto_fw_reset,
 	.store = netxen_store_auto_fw_reset,
 };
+#endif
 
 static void
 netxen_create_sysfs_entries(struct netxen_adapter *adapter)
@@ -2739,7 +2742,9 @@ static struct pci_driver netxen_driver =
 
 static int __init netxen_init_module(void)
 {
+#ifdef CONFIG_MODULES
 	struct module *mod = THIS_MODULE;
+#endif
 
 	printk(KERN_INFO "%s\n", netxen_nic_driver_string);
 
@@ -2748,9 +2753,11 @@ static int __init netxen_init_module(voi
 	register_inetaddr_notifier(&netxen_inetaddr_cb);
 #endif
 
+#ifdef CONFIG_MODULES
 	if (sysfs_create_file(&mod->mkobj.kobj, &mod_attr_fw_reset.attr))
 		printk(KERN_ERR "%s: Failed to create auto_fw_reset "
 				"sysfs entry.", netxen_nic_driver_name);
+#endif
 
 	return pci_register_driver(&netxen_driver);
 }
@@ -2759,9 +2766,11 @@ module_init(netxen_init_module);
 
 static void __exit netxen_exit_module(void)
 {
+#ifdef CONFIG_MODULES
 	struct module *mod = THIS_MODULE;
 
 	sysfs_remove_file(&mod->mkobj.kobj, &mod_attr_fw_reset.attr);
+#endif
 
 	pci_unregister_driver(&netxen_driver);
 
maintainer
#8 lore raw

Re: [PATCH -next] netxen: fix builds for SYSFS=n or MODULES=n

From: Dhananjay Phadke <[email protected]>
Date: Tue, 27 Oct 2009 15:09:24 -0700

Quoted 4 lines

Sorry, seems like I am keeping you busy with the build errors. Thanks for fixing it again (may be I need to setup all different build configs).

Please adhere to the following netiquette when replying to patches:

1) DO NOT TOP POST.

You can feel free to continue doing this, but I am warning you that soon a day will come when replying to postings in a top-post manner will have your posting completely rejected from the list.

This is absolutely the largest pet peeve amongst kernel developers. Quote only the relevant parts of the message, nothing more, and then afterwards you place your comments. Do not add comments before the quoted material. People need to read the quoted part to gain the context necessary to understand your reply, not the other way around.

2) Do not quote the patch when just adding your ACK or signoff.

That makes the patch appear twice in patchwork, making more work for me and confusion for the patch submitted.

Thank you.

maintainer Applied
#9 lore raw

Re: [PATCH -next] netxen: fix builds for SYSFS=n or MODULES=n

In reply to Randy Dunlap

From: Randy Dunlap <[email protected]>
Date: Mon, 26 Oct 2009 15:09:45 -0700

Quoted 10 lines

From: Randy Dunlap <[email protected]>

When CONFIG_MODULES=n:
drivers/net/netxen/netxen_nic_main.c:2751: error: dereferencing pointer to incomplete type drivers/net/netxen/netxen_nic_main.c:2764: error: dereferencing pointer to incomplete type

Also needs addition of <linux/sysfs.h> for sysfs function prototypes or stubs when CONFIG_SYSFS=n.

Applied, thanks Randy.