* Re: linux-next: block tree build failure
From: Stephen Rothwell @ 2009-10-27 5:50 UTC (permalink / raw)
To: Jens Axboe; +Cc: linux-next, linux-kernel
In-Reply-To: <20091027053109.GO10727@kernel.dk>
[-- Attachment #1: Type: text/plain, Size: 323 bytes --]
Hi Jens,
On Tue, 27 Oct 2009 06:31:09 +0100 Jens Axboe <jens.axboe@oracle.com> wrote:
>
> Sorry, not sure why that problem seems so persistent, I just merged the
> newer bits in. Will fix it.
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: block tree build failure
From: Jens Axboe @ 2009-10-27 5:31 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel
In-Reply-To: <20091027143433.bfe08a1b.sfr@canb.auug.org.au>
On Tue, Oct 27 2009, Stephen Rothwell wrote:
> Hi Jens,
>
> Today's linux-next build (x86_64 allmodconfig) failed like this:
>
> drivers/block/drbd/drbd_req.c: In function '_drbd_start_io_acct':
> drivers/block/drbd/drbd_req.c:43: error: lvalue required as increment operand
> drivers/block/drbd/drbd_req.c: In function '_drbd_end_io_acct':
> drivers/block/drbd/drbd_req.c:56: error: lvalue required as decrement operand
>
> This is the dual in_flight changes breaking again ... I have used the
> block tree from next-20091026 for today.
Sorry, not sure why that problem seems so persistent, I just merged the
newer bits in. Will fix it.
--
Jens Axboe
^ permalink raw reply
* Re: [PATCH 9/9] pcmcia: remove pcmcia_get_{first,next}_tuple()
From: Dominik Brodowski @ 2009-10-27 5:12 UTC (permalink / raw)
To: Randy Dunlap; +Cc: devel, linux-next, linux-pcmcia, gregkh
In-Reply-To: <20091026151958.a2e7871b.randy.dunlap@oracle.com>
Randy,
On Mon, Oct 26, 2009 at 03:19:58PM -0700, Randy Dunlap wrote:
> > Remove the pcmcia_get_{first,next}_tuple() calls no longer needed by
> > (current) pcmcia device drivers.
>
> linux-next 20091026:
>
> drivers/staging/comedi/drivers/cb_das16_cs.c:155: error: implicit declaration of function 'pcmcia_get_first_tuple'
> drivers/staging/comedi/drivers/cb_das16_cs.c:156: error: implicit declaration of function 'pcmcia_get_tuple_data'
> drivers/staging/comedi/drivers/cb_das16_cs.c:883: error: implicit declaration of function 'pcmcia_get_next_tuple'
>
> There are also other comedi/ drivers that this randconfig didn't attempt
> to build that are still using these same interfaces.
What are the current rules on drivers in staging/ ? Do they need to be
updated as well on API changes?
Thanks,
Dominik
^ permalink raw reply
* linux-next: ceph tree build warning
From: Stephen Rothwell @ 2009-10-27 4:43 UTC (permalink / raw)
To: Sage Weil; +Cc: linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 330 bytes --]
Hi Sage,
Today's linux-next build (x86_64 allmodconfig) produced this warning:
fs/ceph/super.c: In function 'parse_mount_args':
fs/ceph/super.c:473: warning: the frame size of 4320 bytes is larger than 2048 bytes
--
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: block tree build failure
From: Stephen Rothwell @ 2009-10-27 3:34 UTC (permalink / raw)
To: Jens Axboe; +Cc: linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 592 bytes --]
Hi Jens,
Today's linux-next build (x86_64 allmodconfig) failed like this:
drivers/block/drbd/drbd_req.c: In function '_drbd_start_io_acct':
drivers/block/drbd/drbd_req.c:43: error: lvalue required as increment operand
drivers/block/drbd/drbd_req.c: In function '_drbd_end_io_acct':
drivers/block/drbd/drbd_req.c:56: error: lvalue required as decrement operand
This is the dual in_flight changes breaking again ... I have used the
block tree from next-20091026 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: [PATCH -next] ia64/sn: fix percpu warnings
From: Luck, Tony @ 2009-10-26 23:35 UTC (permalink / raw)
To: Tejun Heo, Randy Dunlap
Cc: Stephen Rothwell, Jes Sorensen, linux-ia64@vger.kernel.org,
linux-next@vger.kernel.org, LKML, akpm
In-Reply-To: <12c511ca0910261124p64f2ad5emc88d00b9957482b3@mail.gmail.com>
> WARNING: "per_cpu____sn_cnodeid_to_nasid" [drivers/misc/sgi-xp/xpc.ko] has no CRC!
Note that this warning goes away if I fix the mismatch declaration so
that we have:
DECLARE_PER_CPU(short, __sn_cnodeide_to_nasid[MAX_COMPACT_NODES]);
in arch.h
and
DEFINE_PER_CPU(short, __sn_cnodeide_to_nasid[MAX_COMPACT_NODES]);
in setup.c
-Tony
^ permalink raw reply
* Re: [PATCH 9/9] pcmcia: remove pcmcia_get_{first,next}_tuple()
From: Randy Dunlap @ 2009-10-26 22:19 UTC (permalink / raw)
To: Dominik Brodowski, devel; +Cc: linux-pcmcia, gregkh, linux-next
In-Reply-To: <1255907255-28297-9-git-send-email-linux@dominikbrodowski.net>
On Mon, 19 Oct 2009 01:07:35 +0200 Dominik Brodowski wrote:
> Remove the pcmcia_get_{first,next}_tuple() calls no longer needed by
> (current) pcmcia device drivers.
linux-next 20091026:
drivers/staging/comedi/drivers/cb_das16_cs.c:155: error: implicit declaration of function 'pcmcia_get_first_tuple'
drivers/staging/comedi/drivers/cb_das16_cs.c:156: error: implicit declaration of function 'pcmcia_get_tuple_data'
drivers/staging/comedi/drivers/cb_das16_cs.c:883: error: implicit declaration of function 'pcmcia_get_next_tuple'
There are also other comedi/ drivers that this randconfig didn't attempt
to build that are still using these same interfaces.
> Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
> ---
> drivers/pcmcia/cs_internal.h | 9 +++++++++
> include/pcmcia/ds.h | 15 ---------------
> 2 files changed, 9 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/pcmcia/cs_internal.h b/drivers/pcmcia/cs_internal.h
> index 06a14c9..70432ca 100644
> --- a/drivers/pcmcia/cs_internal.h
> +++ b/drivers/pcmcia/cs_internal.h
> @@ -206,6 +206,15 @@ int pccard_loop_tuple(struct pcmcia_socket *s, unsigned int function,
> cisparse_t *parse,
> void *priv_data));
>
> +int pccard_get_first_tuple(struct pcmcia_socket *s, unsigned int function,
> + tuple_t *tuple);
> +
> +int pccard_get_next_tuple(struct pcmcia_socket *s, unsigned int function,
> + tuple_t *tuple);
> +
> +int pccard_get_tuple_data(struct pcmcia_socket *s, tuple_t *tuple);
> +
> +
> /* rsrc_mgr.c */
> int pcmcia_validate_mem(struct pcmcia_socket *s);
> struct resource *pcmcia_find_io_region(unsigned long base,
> diff --git a/include/pcmcia/ds.h b/include/pcmcia/ds.h
> index 2eb6e24..6c37d4e 100644
> --- a/include/pcmcia/ds.h
> +++ b/include/pcmcia/ds.h
> @@ -229,21 +229,6 @@ int pcmcia_reset_card(struct pcmcia_socket *skt);
> int pcmcia_access_configuration_register(struct pcmcia_device *p_dev,
> conf_reg_t *reg);
>
> -/* deprecated -- do not use in drivers. */
> -int pccard_get_first_tuple(struct pcmcia_socket *s, unsigned int function,
> - tuple_t *tuple);
> -#define pcmcia_get_first_tuple(p_dev, tuple) \
> - pccard_get_first_tuple(p_dev->socket, p_dev->func, tuple)
> -
> -int pccard_get_next_tuple(struct pcmcia_socket *s, unsigned int function,
> - tuple_t *tuple);
> -#define pcmcia_get_next_tuple(p_dev, tuple) \
> - pccard_get_next_tuple(p_dev->socket, p_dev->func, tuple)
> -
> -int pccard_get_tuple_data(struct pcmcia_socket *s, tuple_t *tuple);
> -#define pcmcia_get_tuple_data(p_dev, tuple) \
> - pccard_get_tuple_data(p_dev->socket, tuple)
> -
> /* device configuration */
> int pcmcia_request_io(struct pcmcia_device *p_dev, io_req_t *req);
> int pcmcia_request_irq(struct pcmcia_device *p_dev, irq_req_t *req);
> --
---
~Randy
^ permalink raw reply
* [PATCH -next] netxen: fix builds for SYSFS=n or MODULES=n
From: Randy Dunlap @ 2009-10-26 22:09 UTC (permalink / raw)
To: Stephen Rothwell, netdev; +Cc: linux-next, LKML, davem, Dhananjay Phadke
In-Reply-To: <20091026172104.205f15af.sfr@canb.auug.org.au>
From: Randy Dunlap <randy.dunlap@oracle.com>
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.
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
---
drivers/net/netxen/netxen_nic_main.c | 9 +++++++++
1 file changed, 9 insertions(+)
--- linux-next-20091026.orig/drivers/net/netxen/netxen_nic_main.c
+++ linux-next-20091026/drivers/net/netxen/netxen_nic_main.c
@@ -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);
^ permalink raw reply
* Re: [PATCH pci-2.6#linux-next] pci: pci_dfl_cache_line_size is __devinitdata
From: Jesse Barnes @ 2009-10-26 20:40 UTC (permalink / raw)
To: Tejun Heo; +Cc: Stephen Rothwell, Jesse Barnes, linux-next, linux-kernel
In-Reply-To: <4ACDB819.4060606@kernel.org>
On Thu, 08 Oct 2009 18:59:53 +0900
Tejun Heo <tj@kernel.org> wrote:
> pci_dfl_cache_line_size is marked as __initdata but referenced by
> pci_init() which is __devinit. Make it __devinitdata instead of
> __initdata.
>
> Signed-off-by: Tejun Heo <tj@kernel.org>
> Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
Applied to my linux-next tree, thanks.
--
Jesse Barnes, Intel Open Source Technology Center
^ permalink raw reply
* Re: [PATCH -next] ia64/sn: fix percpu warnings
From: Tony Luck @ 2009-10-26 18:24 UTC (permalink / raw)
To: Tejun Heo, Randy Dunlap
Cc: Stephen Rothwell, Jes Sorensen, linux-ia64, linux-next, LKML,
akpm
In-Reply-To: <4AD67C05.2030201@kernel.org>
> Acked-by: Tejun Heo <tj@kernel.org>
>
> Can this go through ia64 tree? If not, I can route it through
> percpu#for-fixes.
It can ... but I'm getting a strange warning since I applied it:
Building modules, stage 2.
GZIP arch/ia64/hp/sim/boot/vmlinux.gz
MODPOST 198 modules
WARNING: "per_cpu____sn_cnodeid_to_nasid" [drivers/misc/sgi-xp/xpc.ko]
has no CRC!
Any idea what this means?
-Tony
^ permalink raw reply
* Re: linux-next: Tree for October 26 (gfs2)
From: Steven Whitehouse @ 2009-10-26 16:00 UTC (permalink / raw)
To: Randy Dunlap
Cc: Stephen Rothwell, linux-next, LKML, cluster-devel,
Benjamin Marzinski
In-Reply-To: <20091026084356.847d1ae2.randy.dunlap@oracle.com>
Hi,
On Mon, 2009-10-26 at 08:43 -0700, Randy Dunlap wrote:
> 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
Yes, it looks like it,
Steve.
^ permalink raw reply
* Re: linux-next: Tree for October 26 (gfs2)
From: Randy Dunlap @ 2009-10-26 15:43 UTC (permalink / raw)
To: Stephen Rothwell, Steven Whitehouse; +Cc: cluster-devel, linux-next, LKML
In-Reply-To: <20091026172104.205f15af.sfr@canb.auug.org.au>
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
^ permalink raw reply
* Re: linux-next: manual merge of the net tree with the i2c tree
From: Ben Hutchings @ 2009-10-26 13:46 UTC (permalink / raw)
To: Stephen Rothwell
Cc: David Miller, netdev, linux-next, linux-kernel, Mika Kuoppala,
Jean Delvare
In-Reply-To: <20091026133757.7cf87e49.sfr@canb.auug.org.au>
On Mon, 2009-10-26 at 13:37 +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the net tree got a conflict in
> drivers/net/sfc/sfe4001.c between commit
> 3f7c0648f727a6d5baf6117653e4001dc877b90b ("i2c: Prevent priority
> inversion on top of bus lock") from the i2c tree and commit
> c9597d4f89565b6562bd3026adbe6eac6c317f47 ("sfc: Merge sfe4001.c into
> falcon_boards.c") from the net tree.
>
> I have applied the following merge fixup patch (after removing
> drivers/net/sfc/sfe4001.c) and can carry it as necessary.
>
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 26 Oct 2009 12:24:55 +1100
> Subject: [PATCH] net: merge fixup for drivers/net/sfc/falcon_boards.c
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Acked-by: Ben Hutchings <bhutchings@solarflare.com>
Ben.
--
Ben Hutchings, Senior Software Engineer, Solarflare Communications
Not speaking for my employer; that's the marketing department's job.
They asked us to note that Solarflare product names are trademarked.
^ permalink raw reply
* Re: writable limits to -next
From: Krzysztof Halasa @ 2009-10-26 13:04 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Jiri Slaby, linux-next, linux-kernel@vger.kernel.org,
James Morris, Stephen Smalley, Eric Paris, Andrew Morton
In-Reply-To: <20091026120457.39f7ab83.sfr@canb.auug.org.au>
Stephen Rothwell <sfr@canb.auug.org.au> writes:
>> It's not ok to submit under e.g. GPL v3 only, I'd suggest "under GPL v2
>> and optionally other licence(s)" or something like that.
>
> Or maybe "under a license compatible with the Linux kernel source".
Right, it looks better. Now I think the author doesn't even have to
licence under GPLv2, e.g. BSD alone will do as well.
--
Krzysztof Halasa
^ permalink raw reply
* Re: linux-next: Tree for October 26
From: Huang Ying @ 2009-10-26 7:57 UTC (permalink / raw)
To: Dave Young; +Cc: Stephen Rothwell, linux-next@vger.kernel.org, LKML, Herbert Xu
In-Reply-To: <a8e1da0910260053r245ee675yca4dc984303187df@mail.gmail.com>
Sorry, this should be turned off for x86_32. I will fix this.
Best Regards,
Huang Ying
On Mon, 2009-10-26 at 15:53 +0800, Dave Young wrote:
> On Mon, Oct 26, 2009 at 3:50 PM, Dave Young <hidave.darkstar@gmail.com> wrote:
> > Hi,
> >
> > build fails with ghash ghash-clmulni-intel_asm.S:
>
> It is a x86_32 laptop
>
>
> >
> > 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
> >
>
>
>
^ permalink raw reply
* Re: linux-next: Tree for October 26
From: Dave Young @ 2009-10-26 7:53 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, LKML, Herbert Xu, Huang Ying
In-Reply-To: <a8e1da0910260050y527bdbcbt4171ad6d868fcb29@mail.gmail.com>
On Mon, Oct 26, 2009 at 3:50 PM, Dave Young <hidave.darkstar@gmail.com> wrote:
> Hi,
>
> build fails with ghash ghash-clmulni-intel_asm.S:
It is a x86_32 laptop
>
> 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
>
--
Regards
dave
^ permalink raw reply
* Re: linux-next: Tree for October 26
From: Dave Young @ 2009-10-26 7:50 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, LKML, Herbert Xu, Huang Ying
In-Reply-To: <20091026172104.205f15af.sfr@canb.auug.org.au>
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
^ permalink raw reply
* linux-next: Tree for October 26
From: Stephen Rothwell @ 2009-10-26 6:21 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 7578 bytes --]
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.
--
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
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
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply
* linux-next: manual merge of the net tree with the i2c tree
From: Stephen Rothwell @ 2009-10-26 2:37 UTC (permalink / raw)
To: David Miller, netdev
Cc: linux-next, linux-kernel, Mika Kuoppala, Jean Delvare,
Ben Hutchings
Hi all,
Today's linux-next merge of the net tree got a conflict in
drivers/net/sfc/sfe4001.c between commit
3f7c0648f727a6d5baf6117653e4001dc877b90b ("i2c: Prevent priority
inversion on top of bus lock") from the i2c tree and commit
c9597d4f89565b6562bd3026adbe6eac6c317f47 ("sfc: Merge sfe4001.c into
falcon_boards.c") from the net tree.
I have applied the following merge fixup patch (after removing
drivers/net/sfc/sfe4001.c) and can carry it as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 26 Oct 2009 12:24:55 +1100
Subject: [PATCH] net: merge fixup for drivers/net/sfc/falcon_boards.c
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/net/sfc/falcon_boards.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/sfc/falcon_boards.c b/drivers/net/sfc/falcon_boards.c
index 99f7372..788b336 100644
--- a/drivers/net/sfc/falcon_boards.c
+++ b/drivers/net/sfc/falcon_boards.c
@@ -327,7 +327,7 @@ static int sfn4111t_reset(struct efx_nic *efx)
efx_oword_t reg;
/* GPIO 3 and the GPIO register are shared with I2C, so block that */
- mutex_lock(&efx->i2c_adap.bus_lock);
+ rt_mutex_lock(&efx->i2c_adap.bus_lock);
/* Pull RST_N (GPIO 2) low then let it up again, setting the
* FLASH_CFG_1 strap (GPIO 3) appropriately. Only change the
@@ -343,7 +343,7 @@ static int sfn4111t_reset(struct efx_nic *efx)
efx_writeo(efx, ®, FR_AB_GPIO_CTL);
msleep(1);
- mutex_unlock(&efx->i2c_adap.bus_lock);
+ rt_mutex_unlock(&efx->i2c_adap.bus_lock);
ssleep(1);
return 0;
--
1.6.5
^ permalink raw reply related
* Re: writable limits to -next
From: Stephen Rothwell @ 2009-10-26 1:04 UTC (permalink / raw)
To: Krzysztof Halasa
Cc: Jiri Slaby, linux-next, linux-kernel@vger.kernel.org,
James Morris, Stephen Smalley, Eric Paris, Andrew Morton
In-Reply-To: <m3eiorc7r4.fsf@intrepid.localdomain>
[-- Attachment #1: Type: text/plain, Size: 1260 bytes --]
Hi Krzysztof,
On Mon, 26 Oct 2009 01:35:11 +0100 Krzysztof Halasa <khc@pm.waw.pl> wrote:
>
> BTW you may want to check if the current wording is correct:
>
> Stephen Rothwell <sfr@canb.auug.org.au> writes:
>
> > You will need to ensure that the patches/commits in your tree/series have
> > been:
> > * submitted under GPL v2 (or later) and include the Contributor's
> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
>
> It's not ok to submit under e.g. GPL v3 only, I'd suggest "under GPL v2
> and optionally other licence(s)" or something like that.
Or maybe "under a license compatible with the Linux kernel source".
This was pointed out to me once before but I was hoping not to have to
disturb the IBM lawyers again. I guess I will run it past them and see
what happens.
> For example code under BSD-style licence (in addition to GPLv2) is
> present in Linux, though I think any additional licence (the "later" as
> in "GPL v2 or later", GPL v3, MS EULA etc.) is acceptable as long as it
> is really additional, i.e., if one can ignore it and "use" GPLv2
> exclusively.
>
> IANAL of course.
Me neither :-)
--
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: writable limits to -next
From: Krzysztof Halasa @ 2009-10-26 0:35 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Jiri Slaby, linux-next, linux-kernel@vger.kernel.org,
James Morris, Stephen Smalley, Eric Paris, Andrew Morton
In-Reply-To: <20091026094741.5a1d492c.sfr@canb.auug.org.au>
Hi,
BTW you may want to check if the current wording is correct:
Stephen Rothwell <sfr@canb.auug.org.au> writes:
> You will need to ensure that the patches/commits in your tree/series have
> been:
> * submitted under GPL v2 (or later) and include the Contributor's
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
It's not ok to submit under e.g. GPL v3 only, I'd suggest "under GPL v2
and optionally other licence(s)" or something like that.
For example code under BSD-style licence (in addition to GPLv2) is
present in Linux, though I think any additional licence (the "later" as
in "GPL v2 or later", GPL v3, MS EULA etc.) is acceptable as long as it
is really additional, i.e., if one can ignore it and "use" GPLv2
exclusively.
IANAL of course.
--
Krzysztof Halasa
^ permalink raw reply
* Re: writable limits to -next [was: Adding to linux-next?]
From: Jiri Slaby @ 2009-10-25 23:37 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel@vger.kernel.org, James Morris,
Stephen Smalley, Eric Paris, Andrew Morton
In-Reply-To: <20091026095543.1bb1a25f.sfr@canb.auug.org.au>
On 10/25/2009 11:55 PM, Stephen Rothwell wrote:
> On Mon, 26 Oct 2009 09:47:41 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>
>> On Fri, 23 Oct 2009 10:36:26 +0200 Jiri Slaby <jirislaby@gmail.com> wrote:
>>>
>>> Hi, could you please add git://decibel.fi.muni.cz/~xslaby/linux#limits
>>> into the -next tree?
>>
>> I have added it from today.
>
> It is actually git://decibel.fi.muni.cz/~xslaby/linux#writable_limits, right?
Hi. Oops, of course it is.
/me wondering: am I that dumb?
^ permalink raw reply
* linux-next: device-mapper quilt series import failure
From: Stephen Rothwell @ 2009-10-25 23:04 UTC (permalink / raw)
To: Alasdair G Kergon; +Cc: linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 421 bytes --]
Hi Alasdair,
Today's linux-next import of the device-mapper quilt series failed like
this:
dm-snapshot-abstract-minimum_chunk_size-fn.patch
error: patch failed: drivers/md/dm-snap.c:1400
error: drivers/md/dm-snap.c: patch does not apply
I will use the device-mapper tree from next-20091016 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: writable limits to -next [was: Adding to linux-next?]
From: Stephen Rothwell @ 2009-10-25 22:55 UTC (permalink / raw)
To: Jiri Slaby
Cc: linux-next, linux-kernel@vger.kernel.org, James Morris,
Stephen Smalley, Eric Paris, Andrew Morton
In-Reply-To: <20091026094741.5a1d492c.sfr@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 508 bytes --]
Hi Jiri,
On Mon, 26 Oct 2009 09:47:41 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> On Fri, 23 Oct 2009 10:36:26 +0200 Jiri Slaby <jirislaby@gmail.com> wrote:
> >
> > Hi, could you please add git://decibel.fi.muni.cz/~xslaby/linux#limits
> > into the -next tree?
>
> I have added it from today.
It is actually git://decibel.fi.muni.cz/~xslaby/linux#writable_limits, right?
--
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: writable limits to -next [was: Adding to linux-next?]
From: Stephen Rothwell @ 2009-10-25 22:47 UTC (permalink / raw)
To: Jiri Slaby
Cc: linux-next, linux-kernel@vger.kernel.org, James Morris,
Stephen Smalley, Eric Paris, Andrew Morton
In-Reply-To: <4AE16B0A.7020400@gmail.com>
[-- Attachment #1: Type: text/plain, Size: 1763 bytes --]
Hi Jiri,
On Fri, 23 Oct 2009 10:36:26 +0200 Jiri Slaby <jirislaby@gmail.com> wrote:
>
> Hi, could you please add git://decibel.fi.muni.cz/~xslaby/linux#limits
> into the -next tree?
I have added it from today.
Thanks for adding your subsystem tree as a participant of linux-next. As
you may know, this is not a judgment of your code. The purpose of
linux-next is for integration testing and to lower the impact of
conflicts between subsystems in the next merge window.
You will need to ensure that the patches/commits in your tree/series have
been:
* submitted under GPL v2 (or later) and include the Contributor's
Signed-off-by,
* posted to the relevant mailing list,
* reviewed by you (or another maintainer of your subsystem tree),
* successfully unit tested, and
* destined for the current or next Linux merge window.
Basically, this should be just what you would send to Linus (or ask him
to fetch). It is allowed to be rebased if you deem it necessary.
--
Cheers,
Stephen Rothwell
sfr@canb.auug.org.au
Legal Stuff:
By participating in linux-next, your subsystem tree contributions are
public and will be included in the linux-next trees. You may be sent
e-mail messages indicating errors or other issues when the
patches/commits from your subsystem tree are merged and tested in
linux-next. These messages may also be cross-posted to the linux-next
mailing list, the linux-kernel mailing list, etc. The linux-next tree
project and IBM (my employer) make no warranties regarding the linux-next
project, the testing procedures, the results, the e-mails, etc. If you
don't agree to these ground rules, let me know and I'll remove your tree
from participation in linux-next.
[-- 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