rpms/kernel/devel linux-2.6-compile-fixes.patch,1.179,1.180

[Dave Jones]

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12458

Modified Files:
	linux-2.6-compile-fixes.patch 
Log Message:
compile fix

linux-2.6-compile-fixes.patch:

Index: linux-2.6-compile-fixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-compile-fixes.patch,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -r1.179 -r1.180
--- linux-2.6-compile-fixes.patch	12 Nov 2008 16:28:22 -0000	1.179
+++ linux-2.6-compile-fixes.patch	29 Dec 2008 03:54:51 -0000	1.180
@@ -5,21 +5,33 @@
 # to do a compile to figure out what your diff is fixing. Thanks.
 #
 
-CONFIG_MTD_NAND_FSL_UPM can be built modular, but needs to
-use fsl_lbc_lock, which isn't currently exported.
+commit bf66542bef3771a42ad3b1d5dc503c804bc22b33
+Author: Stephen Rothwell <sfr at canb.auug.org.au>
+Date:   Wed Dec 3 13:49:23 2008 +1100
 
-Signed-off-by: Dave Jones <davej at redhat.com>
+    cifs: update for new IP4/6 address printing
+    
+    Signed-off-by: Stephen Rothwell <sfr at canb.auug.org.au>
+    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
 
-diff --git a/arch/powerpc/sysdev/fsl_lbc.c b/arch/powerpc/sysdev/fsl_lbc.c
-index 0494ee5..43a9e56 100644
---- a/arch/powerpc/sysdev/fsl_lbc.c
-+++ b/arch/powerpc/sysdev/fsl_lbc.c
-@@ -23,6 +23,8 @@
- #include <asm/fsl_lbc.h>
- 
- static spinlock_t fsl_lbc_lock = __SPIN_LOCK_UNLOCKED(fsl_lbc_lock);
-+EXPORT_SYMBOL(fsl_lbc_lock);
-+
- static struct fsl_lbc_regs __iomem *fsl_lbc_regs;
- 
- static char __initdata *compat_lbc[] = {
+diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
+index 974c8f0..0005a19 100644
+--- a/fs/cifs/cifsfs.c
++++ b/fs/cifs/cifsfs.c
+@@ -361,12 +361,12 @@ cifs_show_options(struct seq_file *s, struct vfsmount *m)
+ 					switch (server->addr.sockAddr6.
+ 						sin6_family) {
+ 					case AF_INET6:
+-						seq_printf(s, NIP6_FMT,
+-							   NIP6(server->addr.sockAddr6.sin6_addr));
++						seq_printf(s, "%pI6",
++							   &server->addr.sockAddr6.sin6_addr);
+ 						break;
+ 					case AF_INET:
+-						seq_printf(s, NIPQUAD_FMT,
+-							   NIPQUAD(server->addr.sockAddr.sin_addr.s_addr));
++						seq_printf(s, "%pI4",
++							   &server->addr.sockAddr.sin_addr.s_addr);
+ 						break;
+ 					}
+ 				}