Re: linux-next: net tree build failure

Re: linux-next: net tree build failure

[Andy Grover]

Stephen Rothwell wrote:
> Hi Dave,
> 
> On Mon, 02 Mar 2009 01:49:58 -0800 (PST) David Miller <davem@davemloft.net> wrote:
>> From: Stephen Rothwell <sfr@canb.auug.org.au>
>> Date: Mon, 2 Mar 2009 18:05:14 +1100
>>
>>> Today's linux-next build (powerpc allyesconfig) failed like this:
>>>
>>> net/rds/cong.c: In function 'rds_cong_set_bit':
>>> net/rds/cong.c:284: error: implicit declaration of function 'generic___set_le_bit'
>>> net/rds/cong.c: In function 'rds_cong_clear_bit':
>>> net/rds/cong.c:298: error: implicit declaration of function 'generic___clear_le_bit'
>>> net/rds/cong.c: In function 'rds_cong_test_bit':
>>> net/rds/cong.c:309: error: implicit declaration of function 'generic_test_le_bit'
>> I've fixed this up as follows:
> 
> I was actually wondering if this was some API that powerpc had not
> implemented (most other architectures include asm-generic/bitops/le.h in
> their asm/bitops.h via asm-generic/bitops/ext2-non-atomic.h or
> asm-generic/bitops/minix-le.h) or whether RDS should be using some other
> API (since this is the first use of those functions outside the headers
> above).

My 2c,

I think the correct solution is for all archs to define 
generic_*_le_bit. In addition ext2_*_bit callers (there are a bunch 
besides ext2!) should be fixed.

Some examples:

include/linux/reiserfs_fs.h:#define reiserfs_test_and_set_le_bit 
ext2_set_bit
fs/udf/balloc.c:#define udf_clear_bit(nr, addr) ext2_clear_bit(nr, addr)
fs/ext4/ext4.h:#define ext4_set_bit                     ext2_set_bit

And this one:

lib/find_next_bit.c:static inline unsigned long ext2_swabp(const 
unsigned long *

^^^ cargo cult ext2 prefixing???

Regards -- Andy

Re: linux-next: net tree build failure

[Eric W. Biederman]

Stephen Rothwell <sfr@canb.auug.org.au> writes:

> Hi Dave,
>
> Today's linux-next build of at least some av32 and arm configs failed like this:
>
> arch/avr32/kernel/signal.c:216: error: conflicting types for 'restart_syscall'
> include/linux/sched.h:2184: error: previous definition of 'restart_syscall' was here
>
> Caused by commit 690cc3ffe33ac4a2857583c22d4c6244ae11684d ("syscall:
> Implement a convinience function restart_syscall") from the net tree.
>
> grep is your friend ...

Grrr. Some days it feels like all of the good names are already taken.

How does this look for a solution to the name clash?


---

diff --git a/arch/arm/kernel/signal.c b/arch/arm/kernel/signal.c
index 80b8b5c..88a8f0b 100644
--- a/arch/arm/kernel/signal.c
+++ b/arch/arm/kernel/signal.c
@@ -532,7 +532,7 @@ setup_rt_frame(int usig, struct k_sigaction *ka, siginfo_t *info,
 	return err;
 }
 
-static inline void restart_syscall(struct pt_regs *regs)
+static inline void setup_syscall_restart(struct pt_regs *regs)
 {
 	regs->ARM_r0 = regs->ARM_ORIG_r0;
 	regs->ARM_pc -= thumb_mode(regs) ? 2 : 4;
@@ -567,7 +567,7 @@ handle_signal(unsigned long sig, struct k_sigaction *ka,
 			}
 			/* fallthrough */
 		case -ERESTARTNOINTR:
-			restart_syscall(regs);
+			setup_syscall_restart(regs);
 		}
 	}
 
diff --git a/arch/avr32/kernel/signal.c b/arch/avr32/kernel/signal.c
index 803d7be..2722756 100644
--- a/arch/avr32/kernel/signal.c
+++ b/arch/avr32/kernel/signal.c
@@ -212,7 +212,7 @@ out:
 	return err;
 }
 
-static inline void restart_syscall(struct pt_regs *regs)
+static inline void setup_syscall_restart(struct pt_regs *regs)
 {
 	if (regs->r12 == -ERESTART_RESTARTBLOCK)
 		regs->r8 = __NR_restart_syscall;
@@ -296,7 +296,7 @@ int do_signal(struct pt_regs *regs, sigset_t *oldset, int syscall)
 			}
 			/* fall through */
 		case -ERESTARTNOINTR:
-			restart_syscall(regs);
+			setup_syscall_restart(regs);
 		}
 	}

Re: linux-next: net tree build failure

[David Miller]

From: ebiederm@xmission.com (Eric W. Biederman)
Date: Wed, 20 May 2009 07:53:21 -0700

> Grrr. Some days it feels like all of the good names are already taken.
> 
> How does this look for a solution to the name clash?

Give me a signoff so I can apply this Eric, thanks.

linux-next: net tree build failure

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 475 bytes --]

Hi Dave,

Today's linux-next build (m68k defconfig) failed like this:

drivers/net/sonic.c: In function 'sonic_send_packet':
drivers/net/sonic.c:227: error: expected ';' before '}' token

Caused by commit 5b548140225c6bbbbd560551dd1048b2c0ce58be ("net: use
symbolic values for ndo_start_xmit() return codes") which lost a
semicolon in drivers/net/sonic.c.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: net tree build failure

[David Miller]

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 17 Jun 2009 16:31:12 +1000

> Today's linux-next build (m68k defconfig) failed like this:
> 
> drivers/net/sonic.c: In function 'sonic_send_packet':
> drivers/net/sonic.c:227: error: expected ';' before '}' token
> 
> Caused by commit 5b548140225c6bbbbd560551dd1048b2c0ce58be ("net: use
> symbolic values for ndo_start_xmit() return codes") which lost a
> semicolon in drivers/net/sonic.c.

I just pushed the following fix, thanks!

sonic: Fix build after ndo_start_xmit() changes.

Noticed by Stephen Rothwell.

Signed-off-by: David S. Miller <davem@davemloft.net>
---
 drivers/net/sonic.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/net/sonic.c b/drivers/net/sonic.c
index e4255d8..753a1fb 100644
--- a/drivers/net/sonic.c
+++ b/drivers/net/sonic.c
@@ -223,7 +223,7 @@ static int sonic_send_packet(struct sk_buff *skb, struct net_device *dev)
 	if (!laddr) {
 		printk(KERN_ERR "%s: failed to map tx DMA buffer.\n", dev->name);
 		dev_kfree_skb(skb);
-		return NETDEV_TX_BUSY
+		return NETDEV_TX_BUSY;
 	}
 
 	sonic_tda_put(dev, entry, SONIC_TD_STATUS, 0);       /* clear status */
-- 
1.6.3.2

Re: linux-next: net tree build failure

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 319 bytes --]

Hi Dave,

On Wed, 17 Jun 2009 01:36:58 -0700 (PDT) David Miller <davem@davemloft.net> wrote:
>
> I just pushed the following fix, thanks!
> 
> sonic: Fix build after ndo_start_xmit() changes.

Thanks.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

linux-next: net tree build failure

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 487 bytes --]

Hi Dave,

Today's linux-next build (powerpc allyesconfig) failed like this:

drivers/net/cnic.c: In function 'cnic_init_storm_conn_bufs':
drivers/net/cnic.c:1757: error: implicit declaration of functi
on 'csum_ipv6_magic'

Caused by commit 71034ba845c9ff219373066f904286c0b7506922 ("cnic: Add
main functions to support bnx2x devices") which I have reverted 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 --]

Re: linux-next: net tree build failure

[Michael Chan]

Stephen Rothwell wrote:

> Hi Dave,
>
> Today's linux-next build (powerpc allyesconfig) failed like this:
>
> drivers/net/cnic.c: In function 'cnic_init_storm_conn_bufs':
> drivers/net/cnic.c:1757: error: implicit declaration of functi
> on 'csum_ipv6_magic'
>
> Caused by commit 71034ba845c9ff219373066f904286c0b7506922 ("cnic: Add
> main functions to support bnx2x devices") which I have
> reverted for today.
>

I think adding #include <net/ip6_checksum.h> will work.  Will send a
patch right away.  Thanks.

Re: linux-next: net tree build failure

[David Miller]

From: "Michael Chan" <mchan@broadcom.com>
Date: Mon, 12 Oct 2009 22:14:22 -0700

> I think adding #include <net/ip6_checksum.h> will work.  Will send a
> patch right away.  Thanks.

Too slow, I already fixed this :-)

Re: linux-next: net tree build failure

[David Miller]

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 13 Oct 2009 15:33:08 +1100

> Today's linux-next build (powerpc allyesconfig) failed like this:
> 
> drivers/net/cnic.c: In function 'cnic_init_storm_conn_bufs':
> drivers/net/cnic.c:1757: error: implicit declaration of functi
> on 'csum_ipv6_magic'
> 
> Caused by commit 71034ba845c9ff219373066f904286c0b7506922 ("cnic: Add
> main functions to support bnx2x devices") which I have reverted for today.

It's because x86 and sparc64 seem to get the ipv6 checksum header
implicitly somehow.

I'll fix this as follows, thanks for the report Stephen:

cnic: Need to include net/ip6_checksum.h

drivers/net/cnic.c: In function 'cnic_init_storm_conn_bufs':
drivers/net/cnic.c:1757: error: implicit declaration of function 'csum_ipv6_magic'

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
---
 drivers/net/cnic.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/drivers/net/cnic.c b/drivers/net/cnic.c
index 6e7af7b..333b1d1 100644
--- a/drivers/net/cnic.c
+++ b/drivers/net/cnic.c
@@ -33,6 +33,7 @@
 #include <net/route.h>
 #include <net/ipv6.h>
 #include <net/ip6_route.h>
+#include <net/ip6_checksum.h>
 #include <scsi/iscsi_if.h>
 
 #include "cnic_if.h"
-- 
1.6.4.4

linux-next: net tree build failure

[Stephen Rothwell]

Hi all,

Today's linux-next build (x86_64 allmodconfig) failed like this:

net/appletalk/ddp.c: In function 'atalk_compat_ioctl':
net/appletalk/ddp.c:1866: error: implicit declaration of function 'compat_ptr'

Caused by commit 206602217747382488fcae68351673cc9103debc
("appletalk: handle SIOCATALKDIFADDR compat ioctl").

I applied this patch for today:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 9 Nov 2009 13:11:26 +1100
Subject: [PATCH] net/appletalk: using compat_ptr needs inclusion of linux/compat.h

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 net/appletalk/ddp.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/net/appletalk/ddp.c b/net/appletalk/ddp.c
index b631cc7..73ca4d5 100644
--- a/net/appletalk/ddp.c
+++ b/net/appletalk/ddp.c
@@ -56,6 +56,7 @@
 #include <linux/if_arp.h>
 #include <linux/smp_lock.h>
 #include <linux/termios.h>	/* For TIOCOUTQ/INQ */
+#include <linux/compat.h>
 #include <net/datalink.h>
 #include <net/psnap.h>
 #include <net/sock.h>
-- 
1.6.5.2


-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

Re: linux-next: net tree build failure

[David Miller]

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 9 Nov 2009 13:21:51 +1100

> Subject: [PATCH] net/appletalk: using compat_ptr needs inclusion of linux/compat.h
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

Applied, thanks Stephen.

linux-next: net tree build failure

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 609 bytes --]

Hi Dave,

Today's linux-next build (alpha defconfig) failed like this:

arch/alpha/kernel/systbls.S:507: Error: .err encountered

Caused by commit a2e2725541fad72416326798c2d7fa4dafb7d337 ("net:
Introduce recvmmsg socket syscall") which added a syscall to the alpha
syscall table but forgot to update NR_SYSCALLS in
arch/alpha/include/asm/unistd.h (it also didn't add the __NR_ constant
thee either).

I suspect that this is true for a few other architectures as well
(including sparc?).
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]

Re: linux-next: net tree build failure

[Arnaldo Carvalho de Melo]

Em Sat, Nov 14, 2009 at 05:50:41PM +1100, Stephen Rothwell escreveu:
> Hi Dave,
> 
> Today's linux-next build (alpha defconfig) failed like this:
> 
> arch/alpha/kernel/systbls.S:507: Error: .err encountered
> 
> Caused by commit a2e2725541fad72416326798c2d7fa4dafb7d337 ("net:
> Introduce recvmmsg socket syscall") which added a syscall to the alpha
> syscall table but forgot to update NR_SYSCALLS in
> arch/alpha/include/asm/unistd.h (it also didn't add the __NR_ constant
> thee either).
> 
> I suspect that this is true for a few other architectures as well
> (including sparc?).

I'm trying to get hold of a cross compiler setup now...

- Arnaldo

linux-next: net tree build failure

[Stephen Rothwell]

Hi Dave,

Today's linux-next build (powerpc allyesconfig) failed like this:

drivers/net/vmxnet3/vmxnet3_drv.c: In function 'vmxnet3_prepare_tso':
drivers/net/vmxnet3/vmxnet3_drv.c:826: error: implicit declaration of function 'csum_ipv6_magic'

Revealed by commit 115924b6bdc7cc6bf7da5b933b09281e1f4e17a9 ("net:
Getting rid of the x86 dependency to built vmxnet3") which allowed this
driver to be built on PowerPC at all.

I applied this patch for today:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 18 Nov 2009 16:46:43 +1100
Subject: [PATCH] net: using csum_ipv6_magic requires including net/ip6_checksum.h

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/net/vmxnet3/vmxnet3_drv.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/drivers/net/vmxnet3/vmxnet3_drv.c b/drivers/net/vmxnet3/vmxnet3_drv.c
index 8f24fe5..a4c97e7 100644
--- a/drivers/net/vmxnet3/vmxnet3_drv.c
+++ b/drivers/net/vmxnet3/vmxnet3_drv.c
@@ -24,6 +24,8 @@
  *
  */
 
+#include <net/ip6_checksum.h>
+
 #include "vmxnet3_int.h"
 
 char vmxnet3_driver_name[] = "vmxnet3";
-- 
1.6.5.2

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

Re: linux-next: net tree build failure

[David Miller]

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 18 Nov 2009 16:51:45 +1100

> drivers/net/vmxnet3/vmxnet3_drv.c: In function 'vmxnet3_prepare_tso':
> drivers/net/vmxnet3/vmxnet3_drv.c:826: error: implicit declaration of function 'csum_ipv6_magic'
> 
> Revealed by commit 115924b6bdc7cc6bf7da5b933b09281e1f4e17a9 ("net:
> Getting rid of the x86 dependency to built vmxnet3") which allowed this
> driver to be built on PowerPC at all.

Enabling on more platforms helps find problems like this :-)

> Subject: [PATCH] net: using csum_ipv6_magic requires including net/ip6_checksum.h
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

Applied, thanks!

RE: linux-next: net tree build failure

[Shreyas Bhatewara]

________________________________________
From: David Miller [davem@davemloft.net]
Sent: Tuesday, November 17, 2009 11:05 PM
To: sfr@canb.auug.org.au
Cc: linux-next@vger.kernel.org; linux-kernel@vger.kernel.org; Shreyas Bhatewara
Subject: Re: linux-next: net tree build failure

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 18 Nov 2009 16:51:45 +1100

> drivers/net/vmxnet3/vmxnet3_drv.c: In function 'vmxnet3_prepare_tso':
> drivers/net/vmxnet3/vmxnet3_drv.c:826: error: implicit declaration of function 'csum_ipv6_magic'
>
> Revealed by commit 115924b6bdc7cc6bf7da5b933b09281e1f4e17a9 ("net:
> Getting rid of the x86 dependency to built vmxnet3") which allowed this
> driver to be built on PowerPC at all.

Enabling on more platforms helps find problems like this :-)

> Subject: [PATCH] net: using csum_ipv6_magic requires including net/ip6_checksum.h
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

Applied, thanks!




Thanks Stephen,

I cross-compiled the patched kernel for sparc. Didn't do it for PowerPC :(

->Shreyas

linux-next: net tree build failure

[Stephen Rothwell]

Hi all,

Today's linux-next build (powerpc_allnoconfig) failed like this:

lib/lib.a(vsprintf.o): In function `pointer':
vsprintf.c:(.text+0x21ba): undefined reference to `byte_rev_table'
vsprintf.c:(.text+0x21c2): undefined reference to `byte_rev_table'

Caused by commit bc7259a2ce764ea16200eb9e53f6e136e918d065
("lib/vsprintf.c: Add %pMF to format FDDI bit reversed MAC addresses")
from the net tree.

I applied the following fixup patch (and can carry it for a while):
(BTW after this patch, CONFIG_BITREVERSE appears to not be used anywhere
except where is is selected in Kconfig files.)

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 11 Jan 2010 18:37:16 +1100
Subject: [PATCH] net: vsprintf now depends on the byte_rev_table

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 lib/Makefile |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/lib/Makefile b/lib/Makefile
index 4b78894..e21f9f9 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -7,7 +7,7 @@ ORIG_CFLAGS := $(KBUILD_CFLAGS)
 KBUILD_CFLAGS = $(subst -pg,,$(ORIG_CFLAGS))
 endif
 
-lib-y := ctype.o string.o vsprintf.o cmdline.o \
+lib-y := ctype.o string.o vsprintf.o cmdline.o bitrev.o \
 	 rbtree.o radix-tree.o dump_stack.o \
 	 idr.o int_sqrt.o extable.o prio_tree.o \
 	 sha1.o irq_regs.o reciprocal_div.o argv_split.o \
@@ -50,7 +50,6 @@ ifneq ($(CONFIG_HAVE_DEC_LOCK),y)
   lib-y += dec_and_lock.o
 endif
 
-obj-$(CONFIG_BITREVERSE) += bitrev.o
 obj-$(CONFIG_RATIONAL)	+= rational.o
 obj-$(CONFIG_CRC_CCITT)	+= crc-ccitt.o
 obj-$(CONFIG_CRC16)	+= crc16.o
-- 
1.6.5.7


-- 
Cheers,
Stephen Rothwell                    Stephen@Rothwell.id.au

Re: linux-next: net tree build failure

[David Miller]

From: Stephen Rothwell <Stephen@Rothwell.id.au>
Date: Mon, 11 Jan 2010 18:42:05 +1100

> Hi all,
> 
> Today's linux-next build (powerpc_allnoconfig) failed like this:
> 
> lib/lib.a(vsprintf.o): In function `pointer':
> vsprintf.c:(.text+0x21ba): undefined reference to `byte_rev_table'
> vsprintf.c:(.text+0x21c2): undefined reference to `byte_rev_table'
> 
> Caused by commit bc7259a2ce764ea16200eb9e53f6e136e918d065
> ("lib/vsprintf.c: Add %pMF to format FDDI bit reversed MAC addresses")
> from the net tree.
> 
> I applied the following fixup patch (and can carry it for a while):
> (BTW after this patch, CONFIG_BITREVERSE appears to not be used anywhere
> except where is is selected in Kconfig files.)
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 11 Jan 2010 18:37:16 +1100
> Subject: [PATCH] net: vsprintf now depends on the byte_rev_table
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

Thanks I'll apply this and then add a commit which kills
off CONFIG_BITREVERSE.

Thanks!

Re: linux-next: net tree build failure

[Joe Perches]

On Mon, 2010-01-11 at 00:02 -0800, David Miller wrote:
> From: Stephen Rothwell <Stephen@Rothwell.id.au>
> Date: Mon, 11 Jan 2010 18:42:05 +1100
> 
> > Hi all,
> > 
> > Today's linux-next build (powerpc_allnoconfig) failed like this:
> > 
> > lib/lib.a(vsprintf.o): In function `pointer':
> > vsprintf.c:(.text+0x21ba): undefined reference to `byte_rev_table'
> > vsprintf.c:(.text+0x21c2): undefined reference to `byte_rev_table'
> > 
> > Caused by commit bc7259a2ce764ea16200eb9e53f6e136e918d065
> > ("lib/vsprintf.c: Add %pMF to format FDDI bit reversed MAC addresses")
> > from the net tree.
> > 
> > I applied the following fixup patch (and can carry it for a while):
> > (BTW after this patch, CONFIG_BITREVERSE appears to not be used anywhere
> > except where is is selected in Kconfig files.)
> > 
> > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > Date: Mon, 11 Jan 2010 18:37:16 +1100
> > Subject: [PATCH] net: vsprintf now depends on the byte_rev_table
> > 
> > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> 
> Thanks I'll apply this and then add a commit which kills
> off CONFIG_BITREVERSE.

Perhaps it'd be better to kill off the use of bitrev in
lib/vsprintf as Maciej thinks it broken.

Maybe use something like this?

Signed-off-by: Joe Perches <joe@perches.com>

diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index dc48d2b..e83e3e7 100644
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -25,7 +25,6 @@
 #include <linux/kallsyms.h>
 #include <linux/uaccess.h>
 #include <linux/ioport.h>
-#include <linux/bitrev.h>
 #include <net/addrconf.h>
 
 #include <asm/page.h>		/* for PAGE_SIZE */
@@ -682,19 +681,16 @@ static char *mac_address_string(char *buf, char *end, u8 *addr,
 	char mac_addr[sizeof("xx:xx:xx:xx:xx:xx")];
 	char *p = mac_addr;
 	int i;
-	bool bitrev;
 	char separator;
 
 	if (fmt[1] == 'F') {		/* FDDI canonical format */
-		bitrev = true;
 		separator = '-';
 	} else {
-		bitrev = false;
 		separator = ':';
 	}
 
 	for (i = 0; i < 6; i++) {
-		p = pack_hex_byte(p, bitrev ? bitrev8(addr[i]) : addr[i]);
+		p = pack_hex_byte(p, addr[i]);
 		if (fmt[0] == 'M' && i != 5)
 			*p++ = separator;
 	}
@@ -908,9 +904,7 @@ static char *uuid_string(char *buf, char *end, const u8 *addr,
  *       usual colon-separated hex notation
  * - 'm' For a 6-byte MAC address, it prints the hex address without colons
  * - 'MF' For a 6-byte MAC FDDI address, it prints the address
- *       with a dash-separated hex notation with bit reversed bytes
- * - 'mF' For a 6-byte MAC FDDI address, it prints the address
- *       in hex notation without separators with bit reversed bytes
+ *       with a dash-separated hex notation
  * - 'I' [46] for IPv4/IPv6 addresses printed in the usual way
  *       IPv4 uses dot-separated decimal without leading 0's (1.2.3.4)
  *       IPv6 uses colon separated network-order 16 bit hex with leading 0's

Re: linux-next: net tree build failure

[David Miller]

From: Joe Perches <joe@perches.com>
Date: Mon, 11 Jan 2010 00:16:12 -0800

> Perhaps it'd be better to kill off the use of bitrev in
> lib/vsprintf as Maciej thinks it broken.
> 
> Maybe use something like this?
> 
> Signed-off-by: Joe Perches <joe@perches.com>

Yeah that sounds like a better idea, I think I'll commit
this instead.

Thanks Joe!

Re: linux-next: net tree build failure

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 599 bytes --]

Hi Dave, Joe,

On Mon, 11 Jan 2010 00:44:36 -0800 (PST) David Miller <davem@davemloft.net> wrote:
>
> From: Joe Perches <joe@perches.com>
> Date: Mon, 11 Jan 2010 00:16:12 -0800
> 
> > Perhaps it'd be better to kill off the use of bitrev in
> > lib/vsprintf as Maciej thinks it broken.
> > 
> > Maybe use something like this?
> > 
> > Signed-off-by: Joe Perches <joe@perches.com>
> 
> Yeah that sounds like a better idea, I think I'll commit
> this instead.

Thanks guys.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]

Re: linux-next: net tree build failure

[Maciej W. Rozycki]

On Mon, 11 Jan 2010, Joe Perches wrote:

> Perhaps it'd be better to kill off the use of bitrev in
> lib/vsprintf as Maciej thinks it broken.
> 
> Maybe use something like this?

 Thanks for fixing it.

  Maciej

linux-next: net tree build failure

[Stephen Rothwell]

Hi Dave,

Today's linux-next build (x86_64 allmodconfig) failed like this:

drivers/net/qlge/qlge_main.c: In function 'ql_init_device':
drivers/net/qlge/qlge_main.c:4502: error: label 'err_out' used but not defined

Caused by commit 8aae2600030f54494f9061d2cde141802d774be9 ("qlge: Add
basic firmware dump") interacting with commit
4f9a91c81273b66afe0b6a9be460b47581b28246 ("qlge: Only free resources if
they were allocated") from Linus' tree.

I applied the following merge fixup.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 27 Jan 2010 13:10:17 +1100
Subject: [PATCH] net: merge fixup for qlge_main

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/net/qlge/qlge_main.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/net/qlge/qlge_main.c b/drivers/net/qlge/qlge_main.c
index 4adca94..5be3ae2 100644
--- a/drivers/net/qlge/qlge_main.c
+++ b/drivers/net/qlge/qlge_main.c
@@ -4499,7 +4499,7 @@ static int __devinit ql_init_device(struct pci_dev *pdev,
 		if (qdev->mpi_coredump == NULL) {
 			dev_err(&pdev->dev, "Coredump alloc failed.\n");
 			err = -ENOMEM;
-			goto err_out;
+			goto err_out2;
 		}
 		if (qlge_force_coredump)
 			set_bit(QL_FRC_COREDUMP, &qdev->flags);
-- 
1.6.6

Re: linux-next: net tree build failure

[David Miller]

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 27 Jan 2010 13:18:27 +1100

> Hi Dave,
> 
> Today's linux-next build (x86_64 allmodconfig) failed like this:
> 
> drivers/net/qlge/qlge_main.c: In function 'ql_init_device':
> drivers/net/qlge/qlge_main.c:4502: error: label 'err_out' used but not defined
> 
> Caused by commit 8aae2600030f54494f9061d2cde141802d774be9 ("qlge: Add
> basic firmware dump") interacting with commit
> 4f9a91c81273b66afe0b6a9be460b47581b28246 ("qlge: Only free resources if
> they were allocated") from Linus' tree.
> 
> I applied the following merge fixup.

Thanks for letting me know, I'll do a merge and make sure this
gets cured just how you fixed it.