Home Home > GIT Browse > openSUSE-15.0
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Marek <mmarek@suse.cz>2010-02-25 16:38:36 +0100
committerMichal Marek <mmarek@suse.cz>2010-02-25 16:38:36 +0100
commitab12d21b63a0969173cf4a462a31a9d7e3faf6d6 (patch)
tree5c3dba4610df7d2788f06cece7f8fe802ccd290d
parent36a6ea8f7ca0a1637dcd0378fb6e5f7930f5b27a (diff)
- Drop include of generated/autoconf.h in our patches, it's not
needed since 2.6.15: - patches.suse/novfs-client-module: Refresh. - patches.suse/s390-Kerntypes.diff: Refresh. - patches.suse/suse-ppc32-mol.patch: Refresh.
-rw-r--r--kernel-source.changes9
-rw-r--r--patches.suse/novfs-client-module7
-rw-r--r--patches.suse/s390-Kerntypes.diff27
-rw-r--r--patches.suse/suse-ppc32-mol.patch14
4 files changed, 27 insertions, 30 deletions
diff --git a/kernel-source.changes b/kernel-source.changes
index 9fefb6e194..0f915c5b5c 100644
--- a/kernel-source.changes
+++ b/kernel-source.changes
@@ -1,4 +1,13 @@
-------------------------------------------------------------------
+Thu Feb 25 16:38:31 CET 2010 - mmarek@suse.cz
+
+- Drop include of generated/autoconf.h in our patches, it's not
+ needed since 2.6.15:
+- patches.suse/novfs-client-module: Refresh.
+- patches.suse/s390-Kerntypes.diff: Refresh.
+- patches.suse/suse-ppc32-mol.patch: Refresh.
+
+-------------------------------------------------------------------
Thu Feb 25 08:39:15 CET 2010 - teheo@suse.de
- scripts/run_oldconfig.sh doesn't update ppc/vanilla for some reason.
diff --git a/patches.suse/novfs-client-module b/patches.suse/novfs-client-module
index 60458543f4..ef1c5c5669 100644
--- a/patches.suse/novfs-client-module
+++ b/patches.suse/novfs-client-module
@@ -40,7 +40,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
fs/novfs/commands.h | 955 ++++++++++
fs/novfs/daemon.c | 2085 +++++++++++++++++++++++
fs/novfs/file.c | 1921 +++++++++++++++++++++
- fs/novfs/inode.c | 4639 ++++++++++++++++++++++++++++++++++++++++++++++++++++
+ fs/novfs/inode.c | 4638 ++++++++++++++++++++++++++++++++++++++++++++++++++++
fs/novfs/nwcapi.c | 2202 ++++++++++++++++++++++++
fs/novfs/nwcapi.h | 1416 +++++++++++++++
fs/novfs/nwerror.h | 658 +++++++
@@ -48,7 +48,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
fs/novfs/profile.c | 704 +++++++
fs/novfs/scope.c | 659 +++++++
fs/novfs/vfs.h | 454 +++++
- 15 files changed, 15871 insertions(+)
+ 15 files changed, 15870 insertions(+)
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -5073,7 +5073,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+}
--- /dev/null
+++ b/fs/novfs/inode.c
-@@ -0,0 +1,4639 @@
+@@ -0,0 +1,4638 @@
+/*
+ * Novell NCP Redirector for Linux
+ * Author: James Turner
@@ -5090,7 +5090,6 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+ */
+
+#include <linux/module.h>
-+#include <generated/autoconf.h>
+#include <linux/init.h>
+#include <linux/fs.h>
+#include <linux/dcache.h>
diff --git a/patches.suse/s390-Kerntypes.diff b/patches.suse/s390-Kerntypes.diff
index 8b36a1f569..6aeed46842 100644
--- a/patches.suse/s390-Kerntypes.diff
+++ b/patches.suse/s390-Kerntypes.diff
@@ -12,14 +12,12 @@ Signed-off-by: Michal Marek <mmarek@suse.cz>
arch/s390/Makefile | 4
arch/s390/boot/Makefile | 20 ++
- arch/s390/boot/kerntypes.c | 313 +++++++++++++++++++++++++++++++++++++++++++++
- 3 files changed, 330 insertions(+), 7 deletions(-)
+ arch/s390/boot/kerntypes.c | 311 +++++++++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 328 insertions(+), 7 deletions(-)
-Index: linux-sles11sp1/arch/s390/boot/kerntypes.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-sles11sp1/arch/s390/boot/kerntypes.c 2009-12-09 10:01:56.000000000 +0100
-@@ -0,0 +1,312 @@
+--- /dev/null
++++ b/arch/s390/boot/kerntypes.c
+@@ -0,0 +1,311 @@
+/*
+ * kerntypes.c
+ *
@@ -37,7 +35,6 @@ Index: linux-sles11sp1/arch/s390/boot/kerntypes.c
+
+/* General linux types */
+
-+#include <generated/autoconf.h>
+#include <generated/compile.h>
+#include <linux/utsname.h>
+#include <linux/module.h>
@@ -332,10 +329,8 @@ Index: linux-sles11sp1/arch/s390/boot/kerntypes.c
+
+/* include driver core private structures */
+#include "drivers/base/base.h"
-Index: linux-sles11sp1/arch/s390/boot/Makefile
-===================================================================
---- linux-sles11sp1.orig/arch/s390/boot/Makefile 2009-12-03 04:51:21.000000000 +0100
-+++ linux-sles11sp1/arch/s390/boot/Makefile 2009-12-09 10:45:54.000000000 +0100
+--- a/arch/s390/boot/Makefile
++++ b/arch/s390/boot/Makefile
@@ -2,17 +2,27 @@
# Makefile for the linux s390-specific parts of the memory manager.
#
@@ -369,11 +364,9 @@ Index: linux-sles11sp1/arch/s390/boot/Makefile
sh -x $(srctree)/$(obj)/install.sh $(KERNELRELEASE) $(obj)/image \
- System.map Kerntypes "$(INSTALL_PATH)"
+ System.map "$(INSTALL_PATH)"
-Index: linux-sles11sp1/arch/s390/Makefile
-===================================================================
---- linux-sles11sp1.orig/arch/s390/Makefile 2009-12-03 04:51:21.000000000 +0100
-+++ linux-sles11sp1/arch/s390/Makefile 2009-12-09 10:01:56.000000000 +0100
-@@ -99,12 +99,12 @@
+--- a/arch/s390/Makefile
++++ b/arch/s390/Makefile
+@@ -99,12 +99,12 @@ drivers-$(CONFIG_OPROFILE) += arch/s390/
boot := arch/s390/boot
diff --git a/patches.suse/suse-ppc32-mol.patch b/patches.suse/suse-ppc32-mol.patch
index e7839cdd7f..f8282cdbc8 100644
--- a/patches.suse/suse-ppc32-mol.patch
+++ b/patches.suse/suse-ppc32-mol.patch
@@ -10,7 +10,7 @@ Never modify this patch! Create new patches for build fixes.
drivers/macintosh/mol/_dev.c | 376 ++++++++++
drivers/macintosh/mol/_fault.c | 159 ++++
drivers/macintosh/mol/_hostirq.c | 116 +++
- drivers/macintosh/mol/_kuname.c | 48 +
+ drivers/macintosh/mol/_kuname.c | 46 +
drivers/macintosh/mol/_misc.c | 147 +++
drivers/macintosh/mol/_mmu.c | 41 +
drivers/macintosh/mol/actions.c | 548 ++++++++++++++
@@ -32,7 +32,7 @@ Never modify this patch! Create new patches for build fixes.
drivers/macintosh/mol/hash.c | 126 +++
drivers/macintosh/mol/include/actions.h | 177 ++++
drivers/macintosh/mol/include/alloc.h | 70 +
- drivers/macintosh/mol/include/archinclude.h | 77 ++
+ drivers/macintosh/mol/include/archinclude.h | 75 ++
drivers/macintosh/mol/include/asm.m4 | 141 +++
drivers/macintosh/mol/include/asm_offsets.inc | 136 +++
drivers/macintosh/mol/include/asmdbg.h | 184 ++++
@@ -85,7 +85,7 @@ Never modify this patch! Create new patches for build fixes.
drivers/macintosh/mol/ptaccess.c | 153 ++++
drivers/macintosh/mol/sheep.c | 701 ++++++++++++++++++
drivers/macintosh/mol/skiplist.c | 222 ++++++
- 78 files changed, 14428 insertions(+)
+ 78 files changed, 14424 insertions(+)
--- /dev/null
+++ b/drivers/macintosh/mol/_dev.c
@@ -749,7 +749,7 @@ Never modify this patch! Create new patches for build fixes.
+
--- /dev/null
+++ b/drivers/macintosh/mol/_kuname.c
-@@ -0,0 +1,48 @@
+@@ -0,0 +1,46 @@
+/*
+ * Creation Date: <2001/08/15 01:11:01 samuel>
+ * Time-stamp: <2003/10/24 10:22:00 samuel>
@@ -774,8 +774,6 @@ Never modify this patch! Create new patches for build fixes.
+
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18)
+#include <linux/config.h>
-+#else
-+#include <generated/autoconf.h>
+#endif
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
@@ -6415,7 +6413,7 @@ Never modify this patch! Create new patches for build fixes.
+#endif /* _H_ALLOC */
--- /dev/null
+++ b/drivers/macintosh/mol/include/archinclude.h
-@@ -0,0 +1,77 @@
+@@ -0,0 +1,75 @@
+/*
+ * Creation Date: <2002/01/12 22:11:51 samuel>
+ * Time-stamp: <2004/04/10 22:27:41 samuel>
@@ -6450,8 +6448,6 @@ Never modify this patch! Create new patches for build fixes.
+
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18)
+#include <linux/config.h>
-+#else
-+#include <generated/autoconf.h>
+#endif
+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)