Mailinglist Archive: opensuse-commit (1670 mails)
| < Previous | Next > |
commit kernel-source
- From: root@xxxxxxx (h_root)
- Date: Thu, 12 Oct 2006 15:27:48 +0200 (CEST)
- Message-id: <20061012132748.876EB19AA04@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package kernel-source
checked in at Thu Oct 12 15:27:48 CEST 2006.
--------
--- kernel-source/kernel-bigsmp.changes 2006-10-09 21:17:16.000000000 +0200
+++ /mounts/work_src_done/STABLE/kernel-source/kernel-bigsmp.changes 2006-10-11 14:47:35.000000000 +0200
@@ -1,0 +2,25 @@
+Tue Oct 10 11:01:39 CEST 2006 - kraxel@xxxxxxx
+
+- patches.uml/uml-needs-_syscall0: Fix uml build with 2.6.18+
+ kernel headers.
+
+-------------------------------------------------------------------
+Tue Oct 10 10:01:56 CEST 2006 - olh@xxxxxxx
+
+- disable libata on ppc, breaks persistant naming (211236)
+ switch from IDE PDC202XX to libata PDC202XX on ppc64 (74317/173963)
+
+-------------------------------------------------------------------
+Tue Oct 10 09:44:48 CEST 2006 - olh@xxxxxxx
+
+- add patches.fixes/netfilter-compat.patch
+ simplify compat API (205207)
+
+-------------------------------------------------------------------
+Tue Oct 10 08:27:31 CEST 2006 - hare@xxxxxxx
+
+- patches.drivers/libata-acpi-suspend
+- patches.drivers/libata-acpi-suspend-doc-fix
+ Remove obsolete patches.
+
+-------------------------------------------------------------------
kernel-debug.changes: same change
kernel-default.changes: same change
kernel-dummy.changes: same change
kernel-iseries64.changes: same change
kernel-kdump.changes: same change
kernel-ppc64.changes: same change
kernel-s390.changes: same change
kernel-source.changes: same change
kernel-syms.changes: same change
kernel-um.changes: same change
kernel-vanilla.changes: same change
kernel-xen.changes: same change
kernel-xenpae.changes: same change
New:
----
needed_space_in_mb
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kernel-bigsmp.spec ++++++
--- /var/tmp/diff_new_pack.tY0UYf/_old 2006-10-12 15:22:32.000000000 +0200
+++ /var/tmp/diff_new_pack.tY0UYf/_new 2006-10-12 15:22:32.000000000 +0200
@@ -23,7 +23,7 @@
BuildRequires: python
%endif
Version: 2.6.18
-Release: 12
+Release: 13
Summary: Kernel with PAE Support
License: GPL
Group: System/Kernel
@@ -117,7 +117,7 @@
-Source Timestamp: 2006/10/09 15:56:55 UTC
+Source Timestamp: 2006/10/10 13:26:35 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.18.tar.bz2 ]; then
@@ -283,7 +283,7 @@
%else
%if %build_um
add_vmlinux
- chmod 755 %buildroot/boot/linux-$KERNELRELEASE
+ chmod 755 %buildroot/boot/vmlinux-$KERNELRELEASE
image=linux
%else
%if %build_xen
@@ -463,6 +463,19 @@
%files -f kernel.files
%changelog -n kernel-bigsmp
+* Tue Oct 10 2006 - kraxel@xxxxxxx
+- patches.uml/uml-needs-_syscall0: Fix uml build with 2.6.18+
+ kernel headers.
+* Tue Oct 10 2006 - olh@xxxxxxx
+- disable libata on ppc, breaks persistant naming (211236)
+ switch from IDE PDC202XX to libata PDC202XX on ppc64 (74317/173963)
+* Tue Oct 10 2006 - olh@xxxxxxx
+- add patches.fixes/netfilter-compat.patch
+ simplify compat API (205207)
+* Tue Oct 10 2006 - hare@xxxxxxx
+- patches.drivers/libata-acpi-suspend
+- patches.drivers/libata-acpi-suspend-doc-fix
+ Remove obsolete patches.
* Mon Oct 09 2006 - agruen@xxxxxxx
- patches.fixes/disable-nfsv4-posix-acl-hack.diff: Obsoleted by
support for /etc/xattr.conf in libattr and coreutils (169033).
kernel-debug.spec: same change
kernel-default.spec: same change
++++++ kernel-dummy.spec ++++++
--- /var/tmp/diff_new_pack.tY0UYf/_old 2006-10-12 15:22:32.000000000 +0200
+++ /var/tmp/diff_new_pack.tY0UYf/_new 2006-10-12 15:22:32.000000000 +0200
@@ -17,7 +17,7 @@
Summary: Internal dummy package for synchronizing release numbers
Group: System/Kernel
Version: 2.6.18
-Release: 10
+Release: 12
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -27,7 +27,7 @@
--------
Andreas Gruenbacher <agruen@xxxxxxx>
-Source Timestamp: 2006/10/09 15:56:55 UTC
+Source Timestamp: 2006/10/10 13:26:35 UTC
%install
@@ -40,6 +40,19 @@
/etc/dummy
%changelog -n kernel-dummy
+* Tue Oct 10 2006 - kraxel@xxxxxxx
+- patches.uml/uml-needs-_syscall0: Fix uml build with 2.6.18+
+ kernel headers.
+* Tue Oct 10 2006 - olh@xxxxxxx
+- disable libata on ppc, breaks persistant naming (211236)
+ switch from IDE PDC202XX to libata PDC202XX on ppc64 (74317/173963)
+* Tue Oct 10 2006 - olh@xxxxxxx
+- add patches.fixes/netfilter-compat.patch
+ simplify compat API (205207)
+* Tue Oct 10 2006 - hare@xxxxxxx
+- patches.drivers/libata-acpi-suspend
+- patches.drivers/libata-acpi-suspend-doc-fix
+ Remove obsolete patches.
* Mon Oct 09 2006 - agruen@xxxxxxx
- patches.fixes/disable-nfsv4-posix-acl-hack.diff: Obsoleted by
support for /etc/xattr.conf in libattr and coreutils (169033).
++++++ kernel-iseries64.spec ++++++
--- /var/tmp/diff_new_pack.tY0UYf/_old 2006-10-12 15:22:33.000000000 +0200
+++ /var/tmp/diff_new_pack.tY0UYf/_new 2006-10-12 15:22:33.000000000 +0200
@@ -23,7 +23,7 @@
BuildRequires: python
%endif
Version: 2.6.18
-Release: 11
+Release: 12
Summary: 64-Bit Kernel for iSeries
License: GPL
Group: System/Kernel
@@ -118,7 +118,7 @@
-Source Timestamp: 2006/10/09 15:56:55 UTC
+Source Timestamp: 2006/10/10 13:26:35 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.18.tar.bz2 ]; then
@@ -284,7 +284,7 @@
%else
%if %build_um
add_vmlinux
- chmod 755 %buildroot/boot/linux-$KERNELRELEASE
+ chmod 755 %buildroot/boot/vmlinux-$KERNELRELEASE
image=linux
%else
%if %build_xen
@@ -464,6 +464,19 @@
%files -f kernel.files
%changelog -n kernel-iseries64
+* Tue Oct 10 2006 - kraxel@xxxxxxx
+- patches.uml/uml-needs-_syscall0: Fix uml build with 2.6.18+
+ kernel headers.
+* Tue Oct 10 2006 - olh@xxxxxxx
+- disable libata on ppc, breaks persistant naming (211236)
+ switch from IDE PDC202XX to libata PDC202XX on ppc64 (74317/173963)
+* Tue Oct 10 2006 - olh@xxxxxxx
+- add patches.fixes/netfilter-compat.patch
+ simplify compat API (205207)
+* Tue Oct 10 2006 - hare@xxxxxxx
+- patches.drivers/libata-acpi-suspend
+- patches.drivers/libata-acpi-suspend-doc-fix
+ Remove obsolete patches.
* Mon Oct 09 2006 - agruen@xxxxxxx
- patches.fixes/disable-nfsv4-posix-acl-hack.diff: Obsoleted by
support for /etc/xattr.conf in libattr and coreutils (169033).
++++++ kernel-kdump.spec ++++++
--- /var/tmp/diff_new_pack.tY0UYf/_old 2006-10-12 15:22:33.000000000 +0200
+++ /var/tmp/diff_new_pack.tY0UYf/_new 2006-10-12 15:22:33.000000000 +0200
@@ -23,7 +23,7 @@
BuildRequires: python
%endif
Version: 2.6.18
-Release: 12
+Release: 13
Summary: kernel for kdump
License: GPL
Group: System/Kernel
@@ -127,7 +127,7 @@
-Source Timestamp: 2006/10/09 15:56:55 UTC
+Source Timestamp: 2006/10/10 13:26:35 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.18.tar.bz2 ]; then
@@ -293,7 +293,7 @@
%else
%if %build_um
add_vmlinux
- chmod 755 %buildroot/boot/linux-$KERNELRELEASE
+ chmod 755 %buildroot/boot/vmlinux-$KERNELRELEASE
image=linux
%else
%if %build_xen
@@ -473,6 +473,19 @@
%files -f kernel.files
%changelog -n kernel-kdump
+* Tue Oct 10 2006 - kraxel@xxxxxxx
+- patches.uml/uml-needs-_syscall0: Fix uml build with 2.6.18+
+ kernel headers.
+* Tue Oct 10 2006 - olh@xxxxxxx
+- disable libata on ppc, breaks persistant naming (211236)
+ switch from IDE PDC202XX to libata PDC202XX on ppc64 (74317/173963)
+* Tue Oct 10 2006 - olh@xxxxxxx
+- add patches.fixes/netfilter-compat.patch
+ simplify compat API (205207)
+* Tue Oct 10 2006 - hare@xxxxxxx
+- patches.drivers/libata-acpi-suspend
+- patches.drivers/libata-acpi-suspend-doc-fix
+ Remove obsolete patches.
* Mon Oct 09 2006 - agruen@xxxxxxx
- patches.fixes/disable-nfsv4-posix-acl-hack.diff: Obsoleted by
support for /etc/xattr.conf in libattr and coreutils (169033).
++++++ kernel-ppc64.spec ++++++
--- /var/tmp/diff_new_pack.tY0UYf/_old 2006-10-12 15:22:33.000000000 +0200
+++ /var/tmp/diff_new_pack.tY0UYf/_new 2006-10-12 15:22:33.000000000 +0200
@@ -22,7 +22,7 @@
BuildRequires: python
%endif
Version: 2.6.18
-Release: 11
+Release: 12
Summary: Kernel for ppc64 Systems
License: GPL, LGPL
Group: System/Kernel
@@ -132,7 +132,7 @@
Tom Gall <tom_gall@xxxxxxxxxxxx>
see /usr/src/linux-pmac-benh/CREDITS for more details.
-Source Timestamp: 2006/10/09 15:56:55 UTC
+Source Timestamp: 2006/10/10 13:26:35 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.18.tar.bz2 ]; then
@@ -298,7 +298,7 @@
%else
%if %build_um
add_vmlinux
- chmod 755 %buildroot/boot/linux-$KERNELRELEASE
+ chmod 755 %buildroot/boot/vmlinux-$KERNELRELEASE
image=linux
%else
%if %build_xen
@@ -478,6 +478,19 @@
%files -f kernel.files
%changelog -n kernel-ppc64
+* Tue Oct 10 2006 - kraxel@xxxxxxx
+- patches.uml/uml-needs-_syscall0: Fix uml build with 2.6.18+
+ kernel headers.
+* Tue Oct 10 2006 - olh@xxxxxxx
+- disable libata on ppc, breaks persistant naming (211236)
+ switch from IDE PDC202XX to libata PDC202XX on ppc64 (74317/173963)
+* Tue Oct 10 2006 - olh@xxxxxxx
+- add patches.fixes/netfilter-compat.patch
+ simplify compat API (205207)
+* Tue Oct 10 2006 - hare@xxxxxxx
+- patches.drivers/libata-acpi-suspend
+- patches.drivers/libata-acpi-suspend-doc-fix
+ Remove obsolete patches.
* Mon Oct 09 2006 - agruen@xxxxxxx
- patches.fixes/disable-nfsv4-posix-acl-hack.diff: Obsoleted by
support for /etc/xattr.conf in libattr and coreutils (169033).
++++++ kernel-s390.spec ++++++
--- /var/tmp/diff_new_pack.tY0UYf/_old 2006-10-12 15:22:33.000000000 +0200
+++ /var/tmp/diff_new_pack.tY0UYf/_new 2006-10-12 15:22:33.000000000 +0200
@@ -23,7 +23,7 @@
BuildRequires: python
%endif
Version: 2.6.18
-Release: 10
+Release: 11
Summary: The Standard Kernel
License: GPL
Group: System/Kernel
@@ -115,7 +115,7 @@
-Source Timestamp: 2006/10/09 15:56:55 UTC
+Source Timestamp: 2006/10/10 13:26:35 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.18.tar.bz2 ]; then
@@ -281,7 +281,7 @@
%else
%if %build_um
add_vmlinux
- chmod 755 %buildroot/boot/linux-$KERNELRELEASE
+ chmod 755 %buildroot/boot/vmlinux-$KERNELRELEASE
image=linux
%else
%if %build_xen
@@ -461,6 +461,19 @@
%files -f kernel.files
%changelog -n kernel-s390
+* Tue Oct 10 2006 - kraxel@xxxxxxx
+- patches.uml/uml-needs-_syscall0: Fix uml build with 2.6.18+
+ kernel headers.
+* Tue Oct 10 2006 - olh@xxxxxxx
+- disable libata on ppc, breaks persistant naming (211236)
+ switch from IDE PDC202XX to libata PDC202XX on ppc64 (74317/173963)
+* Tue Oct 10 2006 - olh@xxxxxxx
+- add patches.fixes/netfilter-compat.patch
+ simplify compat API (205207)
+* Tue Oct 10 2006 - hare@xxxxxxx
+- patches.drivers/libata-acpi-suspend
+- patches.drivers/libata-acpi-suspend-doc-fix
+ Remove obsolete patches.
* Mon Oct 09 2006 - agruen@xxxxxxx
- patches.fixes/disable-nfsv4-posix-acl-hack.diff: Obsoleted by
support for /etc/xattr.conf in libattr and coreutils (169033).
++++++ kernel-source.spec ++++++
--- /var/tmp/diff_new_pack.tY0UYf/_old 2006-10-12 15:22:33.000000000 +0200
+++ /var/tmp/diff_new_pack.tY0UYf/_new 2006-10-12 15:22:33.000000000 +0200
@@ -26,7 +26,7 @@
%endif
PreReq: /sbin/insserv /usr/bin/grep /bin/sed /bin/uname /bin/mkdir /bin/cat /bin/ln /bin/rm /etc/rc.status
Version: 2.6.18
-Release: 12
+Release: 13
Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.18.tar.bz2
Source1: functions.sh
Source2: source-post.sh
@@ -94,7 +94,7 @@
see /usr/src/linux/CREDITS for more details.
-Source Timestamp: 2006/10/09 15:56:55 UTC
+Source Timestamp: 2006/10/10 13:26:35 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.18.tar.bz2 ]; then
@@ -276,6 +276,19 @@
%files -f kernel-source.files
%changelog -n kernel-source
+* Tue Oct 10 2006 - kraxel@xxxxxxx
+- patches.uml/uml-needs-_syscall0: Fix uml build with 2.6.18+
+ kernel headers.
+* Tue Oct 10 2006 - olh@xxxxxxx
+- disable libata on ppc, breaks persistant naming (211236)
+ switch from IDE PDC202XX to libata PDC202XX on ppc64 (74317/173963)
+* Tue Oct 10 2006 - olh@xxxxxxx
+- add patches.fixes/netfilter-compat.patch
+ simplify compat API (205207)
+* Tue Oct 10 2006 - hare@xxxxxxx
+- patches.drivers/libata-acpi-suspend
+- patches.drivers/libata-acpi-suspend-doc-fix
+ Remove obsolete patches.
* Mon Oct 09 2006 - agruen@xxxxxxx
- patches.fixes/disable-nfsv4-posix-acl-hack.diff: Obsoleted by
support for /etc/xattr.conf in libattr and coreutils (169033).
++++++ kernel-syms.spec ++++++
--- /var/tmp/diff_new_pack.tY0UYf/_old 2006-10-12 15:22:33.000000000 +0200
+++ /var/tmp/diff_new_pack.tY0UYf/_new 2006-10-12 15:22:33.000000000 +0200
@@ -49,7 +49,7 @@
Summary: Kernel Symbol Versions (modversions)
Group: Development/Sources
Version: 2.6.18
-Release: 12
+Release: 13
Requires: linux
Requires: kernel-source = 2.6.18-%release
Source11: arch-symbols
@@ -84,7 +84,7 @@
see /usr/src/linux/CREDITS for more details.
-Source Timestamp: 2006/10/09 15:56:55 UTC
+Source Timestamp: 2006/10/10 13:26:35 UTC
%install
@@ -127,6 +127,19 @@
/boot/symsets-*-*.tar.gz
%changelog -n kernel-syms
+* Tue Oct 10 2006 - kraxel@xxxxxxx
+- patches.uml/uml-needs-_syscall0: Fix uml build with 2.6.18+
+ kernel headers.
+* Tue Oct 10 2006 - olh@xxxxxxx
+- disable libata on ppc, breaks persistant naming (211236)
+ switch from IDE PDC202XX to libata PDC202XX on ppc64 (74317/173963)
+* Tue Oct 10 2006 - olh@xxxxxxx
+- add patches.fixes/netfilter-compat.patch
+ simplify compat API (205207)
+* Tue Oct 10 2006 - hare@xxxxxxx
+- patches.drivers/libata-acpi-suspend
+- patches.drivers/libata-acpi-suspend-doc-fix
+ Remove obsolete patches.
* Mon Oct 09 2006 - agruen@xxxxxxx
- patches.fixes/disable-nfsv4-posix-acl-hack.diff: Obsoleted by
support for /etc/xattr.conf in libattr and coreutils (169033).
++++++ kernel-um.spec ++++++
--- /var/tmp/diff_new_pack.tY0UYf/_old 2006-10-12 15:22:33.000000000 +0200
+++ /var/tmp/diff_new_pack.tY0UYf/_new 2006-10-12 15:22:33.000000000 +0200
@@ -23,7 +23,7 @@
BuildRequires: python
%endif
Version: 2.6.18
-Release: 12
+Release: 13
Summary: The User Mode Linux kernel.
License: GPL
Group: System/Kernel
@@ -123,7 +123,7 @@
-Source Timestamp: 2006/10/09 15:56:55 UTC
+Source Timestamp: 2006/10/10 13:26:35 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.18.tar.bz2 ]; then
@@ -289,7 +289,7 @@
%else
%if %build_um
add_vmlinux
- chmod 755 %buildroot/boot/linux-$KERNELRELEASE
+ chmod 755 %buildroot/boot/vmlinux-$KERNELRELEASE
image=linux
%else
%if %build_xen
@@ -469,6 +469,19 @@
%files -f kernel.files
%changelog -n kernel-um
+* Tue Oct 10 2006 - kraxel@xxxxxxx
+- patches.uml/uml-needs-_syscall0: Fix uml build with 2.6.18+
+ kernel headers.
+* Tue Oct 10 2006 - olh@xxxxxxx
+- disable libata on ppc, breaks persistant naming (211236)
+ switch from IDE PDC202XX to libata PDC202XX on ppc64 (74317/173963)
+* Tue Oct 10 2006 - olh@xxxxxxx
+- add patches.fixes/netfilter-compat.patch
+ simplify compat API (205207)
+* Tue Oct 10 2006 - hare@xxxxxxx
+- patches.drivers/libata-acpi-suspend
+- patches.drivers/libata-acpi-suspend-doc-fix
+ Remove obsolete patches.
* Mon Oct 09 2006 - agruen@xxxxxxx
- patches.fixes/disable-nfsv4-posix-acl-hack.diff: Obsoleted by
support for /etc/xattr.conf in libattr and coreutils (169033).
++++++ kernel-vanilla.spec ++++++
--- /var/tmp/diff_new_pack.tY0UYf/_old 2006-10-12 15:22:33.000000000 +0200
+++ /var/tmp/diff_new_pack.tY0UYf/_new 2006-10-12 15:22:33.000000000 +0200
@@ -23,7 +23,7 @@
BuildRequires: python
%endif
Version: 2.6.18
-Release: 10
+Release: 12
Summary: The Standard Kernel - without any SUSE patches
License: GPL
Group: System/Kernel
@@ -135,7 +135,7 @@
-Source Timestamp: 2006/10/09 15:56:55 UTC
+Source Timestamp: 2006/10/10 13:26:35 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.18.tar.bz2 ]; then
@@ -301,7 +301,7 @@
%else
%if %build_um
add_vmlinux
- chmod 755 %buildroot/boot/linux-$KERNELRELEASE
+ chmod 755 %buildroot/boot/vmlinux-$KERNELRELEASE
image=linux
%else
%if %build_xen
@@ -481,6 +481,19 @@
%files -f kernel.files
%changelog -n kernel-vanilla
+* Tue Oct 10 2006 - kraxel@xxxxxxx
+- patches.uml/uml-needs-_syscall0: Fix uml build with 2.6.18+
+ kernel headers.
+* Tue Oct 10 2006 - olh@xxxxxxx
+- disable libata on ppc, breaks persistant naming (211236)
+ switch from IDE PDC202XX to libata PDC202XX on ppc64 (74317/173963)
+* Tue Oct 10 2006 - olh@xxxxxxx
+- add patches.fixes/netfilter-compat.patch
+ simplify compat API (205207)
+* Tue Oct 10 2006 - hare@xxxxxxx
+- patches.drivers/libata-acpi-suspend
+- patches.drivers/libata-acpi-suspend-doc-fix
+ Remove obsolete patches.
* Mon Oct 09 2006 - agruen@xxxxxxx
- patches.fixes/disable-nfsv4-posix-acl-hack.diff: Obsoleted by
support for /etc/xattr.conf in libattr and coreutils (169033).
kernel-xen.spec: same change
kernel-xenpae.spec: same change
++++++ build-source-timestamp ++++++
--- kernel-source/build-source-timestamp 2006-10-09 21:17:13.000000000 +0200
+++ /mounts/work_src_done/STABLE/kernel-source/build-source-timestamp 2006-10-11 14:47:32.000000000 +0200
@@ -1 +1 @@
-2006/10/09 15:56:55 UTC
+2006/10/10 13:26:35 UTC
++++++ config.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/powerpc/default new/config/powerpc/default
--- old/config/powerpc/default 2006-10-02 20:49:56.000000000 +0200
+++ new/config/powerpc/default 2006-10-11 14:46:50.000000000 +0200
@@ -923,57 +923,7 @@
#
# Serial ATA (prod) and Parallel ATA (experimental) drivers
#
-CONFIG_ATA=m
-CONFIG_SATA_AHCI=m
-# CONFIG_SATA_SVW is not set
-# CONFIG_ATA_PIIX is not set
-# CONFIG_SATA_MV is not set
-# CONFIG_SATA_NV is not set
-CONFIG_PDC_ADMA=m
-CONFIG_SATA_QSTOR=m
-CONFIG_SATA_PROMISE=m
-CONFIG_SATA_SX4=m
-# CONFIG_SATA_SIL is not set
-# CONFIG_SATA_SIL24 is not set
-# CONFIG_SATA_SIS is not set
-CONFIG_SATA_ULI=m
-CONFIG_SATA_VIA=m
-# CONFIG_SATA_VITESSE is not set
-CONFIG_SATA_INTEL_COMBINED=y
-# CONFIG_PATA_ALI is not set
-# CONFIG_PATA_AMD is not set
-# CONFIG_PATA_ARTOP is not set
-# CONFIG_PATA_ATIIXP is not set
-CONFIG_PATA_CMD64X=m
-# CONFIG_PATA_CS5520 is not set
-# CONFIG_PATA_CS5530 is not set
-# CONFIG_PATA_CYPRESS is not set
-# CONFIG_PATA_EFAR is not set
-# CONFIG_ATA_GENERIC is not set
-# CONFIG_PATA_HPT366 is not set
-# CONFIG_PATA_HPT37X is not set
-# CONFIG_PATA_HPT3X2N is not set
-# CONFIG_PATA_HPT3X3 is not set
-# CONFIG_PATA_IT821X is not set
-# CONFIG_PATA_JMICRON is not set
-# CONFIG_PATA_TRIFLEX is not set
-# CONFIG_PATA_MPIIX is not set
-# CONFIG_PATA_OLDPIIX is not set
-# CONFIG_PATA_NETCELL is not set
-# CONFIG_PATA_NS87410 is not set
-# CONFIG_PATA_OPTI is not set
-# CONFIG_PATA_OPTIDMA is not set
-# CONFIG_PATA_PCMCIA is not set
-# CONFIG_PATA_PDC_OLD is not set
-# CONFIG_PATA_RADISYS is not set
-# CONFIG_PATA_RZ1000 is not set
-# CONFIG_PATA_SC1200 is not set
-# CONFIG_PATA_SERVERWORKS is not set
-CONFIG_PATA_PDC2027X=m
-# CONFIG_PATA_SIL680 is not set
-# CONFIG_PATA_SIS is not set
-CONFIG_PATA_VIA=m
-# CONFIG_PATA_WINBOND is not set
+# CONFIG_ATA is not set
#
# Multi-device support (RAID and LVM)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/powerpc/kdump new/config/powerpc/kdump
--- old/config/powerpc/kdump 2006-10-02 20:49:56.000000000 +0200
+++ new/config/powerpc/kdump 2006-10-11 14:46:50.000000000 +0200
@@ -670,7 +670,7 @@
# CONFIG_BLK_DEV_IT821X is not set
# CONFIG_BLK_DEV_NS87415 is not set
# CONFIG_BLK_DEV_PDC202XX_OLD is not set
-CONFIG_BLK_DEV_PDC202XX_NEW=m
+# CONFIG_BLK_DEV_PDC202XX_NEW is not set
# CONFIG_BLK_DEV_SVWKS is not set
CONFIG_BLK_DEV_SIIMAGE=y
# CONFIG_BLK_DEV_SLC90E66 is not set
@@ -760,24 +760,23 @@
# Serial ATA (prod) and Parallel ATA (experimental) drivers
#
CONFIG_ATA=m
-CONFIG_SATA_AHCI=m
+# CONFIG_SATA_AHCI is not set
CONFIG_SATA_SVW=m
# CONFIG_ATA_PIIX is not set
# CONFIG_SATA_MV is not set
-CONFIG_SATA_NV=m
+# CONFIG_SATA_NV is not set
# CONFIG_PDC_ADMA is not set
# CONFIG_SATA_QSTOR is not set
-CONFIG_SATA_PROMISE=m
-CONFIG_SATA_SX4=m
-CONFIG_SATA_SIL=m
-CONFIG_SATA_SIL24=m
-CONFIG_SATA_SIS=m
+# CONFIG_SATA_PROMISE is not set
+# CONFIG_SATA_SX4 is not set
+# CONFIG_SATA_SIL is not set
+# CONFIG_SATA_SIL24 is not set
+# CONFIG_SATA_SIS is not set
# CONFIG_SATA_ULI is not set
-CONFIG_SATA_VIA=m
+# CONFIG_SATA_VIA is not set
# CONFIG_SATA_VITESSE is not set
-CONFIG_SATA_INTEL_COMBINED=y
# CONFIG_PATA_ALI is not set
-CONFIG_PATA_AMD=m
+# CONFIG_PATA_AMD is not set
# CONFIG_PATA_ARTOP is not set
# CONFIG_PATA_ATIIXP is not set
# CONFIG_PATA_CMD64X is not set
@@ -805,9 +804,9 @@
# CONFIG_PATA_SC1200 is not set
# CONFIG_PATA_SERVERWORKS is not set
CONFIG_PATA_PDC2027X=m
-CONFIG_PATA_SIL680=m
-CONFIG_PATA_SIS=m
-CONFIG_PATA_VIA=m
+# CONFIG_PATA_SIL680 is not set
+# CONFIG_PATA_SIS is not set
+# CONFIG_PATA_VIA is not set
# CONFIG_PATA_WINBOND is not set
#
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/powerpc/ppc64 new/config/powerpc/ppc64
--- old/config/powerpc/ppc64 2006-10-02 20:49:56.000000000 +0200
+++ new/config/powerpc/ppc64 2006-10-11 14:46:50.000000000 +0200
@@ -723,7 +723,7 @@
# CONFIG_BLK_DEV_IT821X is not set
# CONFIG_BLK_DEV_NS87415 is not set
# CONFIG_BLK_DEV_PDC202XX_OLD is not set
-CONFIG_BLK_DEV_PDC202XX_NEW=m
+# CONFIG_BLK_DEV_PDC202XX_NEW is not set
# CONFIG_BLK_DEV_SVWKS is not set
CONFIG_BLK_DEV_SIIMAGE=y
# CONFIG_BLK_DEV_SLC90E66 is not set
@@ -816,24 +816,23 @@
# Serial ATA (prod) and Parallel ATA (experimental) drivers
#
CONFIG_ATA=m
-CONFIG_SATA_AHCI=m
+# CONFIG_SATA_AHCI is not set
CONFIG_SATA_SVW=m
# CONFIG_ATA_PIIX is not set
# CONFIG_SATA_MV is not set
# CONFIG_SATA_NV is not set
# CONFIG_PDC_ADMA is not set
# CONFIG_SATA_QSTOR is not set
-CONFIG_SATA_PROMISE=m
-CONFIG_SATA_SX4=m
-CONFIG_SATA_SIL=m
-CONFIG_SATA_SIL24=m
-CONFIG_SATA_SIS=m
+# CONFIG_SATA_PROMISE is not set
+# CONFIG_SATA_SX4 is not set
+# CONFIG_SATA_SIL is not set
+# CONFIG_SATA_SIL24 is not set
+# CONFIG_SATA_SIS is not set
# CONFIG_SATA_ULI is not set
-CONFIG_SATA_VIA=m
+# CONFIG_SATA_VIA is not set
# CONFIG_SATA_VITESSE is not set
-CONFIG_SATA_INTEL_COMBINED=y
# CONFIG_PATA_ALI is not set
-CONFIG_PATA_AMD=m
+# CONFIG_PATA_AMD is not set
# CONFIG_PATA_ARTOP is not set
# CONFIG_PATA_ATIIXP is not set
# CONFIG_PATA_CMD64X is not set
@@ -861,7 +860,7 @@
# CONFIG_PATA_SC1200 is not set
# CONFIG_PATA_SERVERWORKS is not set
CONFIG_PATA_PDC2027X=m
-CONFIG_PATA_SIL680=m
+# CONFIG_PATA_SIL680 is not set
# CONFIG_PATA_SIS is not set
# CONFIG_PATA_VIA is not set
# CONFIG_PATA_WINBOND is not set
++++++ kabi.tar.bz2 ++++++
++++++ patches.fixes.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/netfilter-compat.patch new/patches.fixes/netfilter-compat.patch
--- old/patches.fixes/netfilter-compat.patch 1970-01-01 01:00:00.000000000 +0100
+++ new/patches.fixes/netfilter-compat.patch 2006-10-10 09:45:56.000000000 +0200
@@ -0,0 +1,805 @@
+Subject: iptables.ppc64 no longer needed
+From: Patrick McHardy <kaber@xxxxxxxxx>
+References: 205207
+Patch-mainline: 2.6.19
+
+ip_tables: limit match: invalid size 40 != 32
+
+ diff-tree 9fa492cdc160cd27ce1046cb36f47d3b2b1efa21 (from 79030ed07de673e8451a03aecb9ada9f4d75d491)
+ diff-tree 02c63cf777c331121bfb6e9c1440a9835ad2f2a8 (from 7ce975b9da93b46dbf6ba70a1b4751bec211d079)
+ diff-tree 7ce975b9da93b46dbf6ba70a1b4751bec211d079 (from f1eda05386ade8dad4e8e9b48ecbd9432b6739d9)
+ diff-tree be7263b7b72ed9d5d25958f2b71e77e889e4845a (from bc80b656657251fc936d2d93fc70d5566c1c7d29)
+ diff-tree bc80b656657251fc936d2d93fc70d5566c1c7d29 (from 9fa492cdc160cd27ce1046cb36f47d3b2b1efa21)
+ diff-tree f1eda05386ade8dad4e8e9b48ecbd9432b6739d9 (from be7263b7b72ed9d5d25958f2b71e77e889e4845a)
+
+ [NETFILTER]: x_tables: simplify compat API
+ [NETFILTER]: xt_limit: add compat conversion functions
+ [NETFILTER]: xt_CONNMARK: add compat conversion functions
+ [NETFILTER]: xt_MARK: add compat conversion functions
+ [NETFILTER]: xt_mark: add compat conversion functions
+ [NETFILTER]: xt_connmark: add compat conversion functions
+
+ Split the xt_compat_match/xt_compat_target into smaller type-safe functions
+ performing just one operation. Handle all alignment and size-related
+ conversions centrally in these function instead of requiring each module to
+ implement a full-blown conversion function. Replace ->compat callback by
+ ->compat_from_user and ->compat_to_user callbacks, responsible for
+ converting just a single private structure.
+
+ Signed-off-by: Patrick McHardy <kaber@xxxxxxxxx>
+ Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
+Signed-off-by: Olaf Hering <olh@xxxxxxx>
+
+---
+ include/linux/netfilter/x_tables.h | 29 +++--
+ net/ipv4/netfilter/ip_tables.c | 115 ++++------------------
+ net/netfilter/x_tables.c | 192 +++++++++++++++++++++----------------
+ net/netfilter/xt_CONNMARK.c | 36 ++++++
+ net/netfilter/xt_MARK.c | 34 ++++++
+ net/netfilter/xt_connmark.c | 36 ++++++
+ net/netfilter/xt_limit.c | 49 +++++++++
+ net/netfilter/xt_mark.c | 36 ++++++
+ 8 files changed, 342 insertions(+), 185 deletions(-)
+
+Index: linux-2.6.18/include/linux/netfilter/x_tables.h
+===================================================================
+--- linux-2.6.18.orig/include/linux/netfilter/x_tables.h
++++ linux-2.6.18/include/linux/netfilter/x_tables.h
+@@ -142,12 +142,6 @@ struct xt_counters_info
+ #define ASSERT_WRITE_LOCK(x)
+ #include <linux/netfilter_ipv4/listhelp.h>
+
+-#ifdef CONFIG_COMPAT
+-#define COMPAT_TO_USER 1
+-#define COMPAT_FROM_USER -1
+-#define COMPAT_CALC_SIZE 0
+-#endif
+-
+ struct xt_match
+ {
+ struct list_head list;
+@@ -182,13 +176,15 @@ struct xt_match
+ unsigned int matchinfosize);
+
+ /* Called when userspace align differs from kernel space one */
+- int (*compat)(void *match, void **dstptr, int *size, int convert);
++ void (*compat_from_user)(void *dst, void *src);
++ int (*compat_to_user)(void __user *dst, void *src);
+
+ /* Set this to THIS_MODULE if you are a module, otherwise NULL */
+ struct module *me;
+
+ char *table;
+ unsigned int matchsize;
++ unsigned int compatsize;
+ unsigned int hooks;
+ unsigned short proto;
+
+@@ -230,13 +226,15 @@ struct xt_target
+ unsigned int targinfosize);
+
+ /* Called when userspace align differs from kernel space one */
+- int (*compat)(void *target, void **dstptr, int *size, int convert);
++ void (*compat_from_user)(void *dst, void *src);
++ int (*compat_to_user)(void __user *dst, void *src);
+
+ /* Set this to THIS_MODULE if you are a module, otherwise NULL */
+ struct module *me;
+
+ char *table;
+ unsigned int targetsize;
++ unsigned int compatsize;
+ unsigned int hooks;
+ unsigned short proto;
+
+@@ -388,9 +386,18 @@ struct compat_xt_counters_info
+
+ extern void xt_compat_lock(int af);
+ extern void xt_compat_unlock(int af);
+-extern int xt_compat_match(void *match, void **dstptr, int *size, int convert);
+-extern int xt_compat_target(void *target, void **dstptr, int *size,
+- int convert);
++
++extern int xt_compat_match_offset(struct xt_match *match);
++extern void xt_compat_match_from_user(struct xt_entry_match *m,
++ void **dstptr, int *size);
++extern int xt_compat_match_to_user(struct xt_entry_match *m,
++ void * __user *dstptr, int *size);
++
++extern int xt_compat_target_offset(struct xt_target *target);
++extern void xt_compat_target_from_user(struct xt_entry_target *t,
++ void **dstptr, int *size);
++extern int xt_compat_target_to_user(struct xt_entry_target *t,
++ void * __user *dstptr, int *size);
+
+ #endif /* CONFIG_COMPAT */
+ #endif /* __KERNEL__ */
+Index: linux-2.6.18/net/ipv4/netfilter/ip_tables.c
+===================================================================
+--- linux-2.6.18.orig/net/ipv4/netfilter/ip_tables.c
++++ linux-2.6.18/net/ipv4/netfilter/ip_tables.c
+@@ -950,73 +950,28 @@ static short compat_calc_jump(u_int16_t
+ return delta;
+ }
+
+-struct compat_ipt_standard_target
++static void compat_standard_from_user(void *dst, void *src)
+ {
+- struct compat_xt_entry_target target;
+- compat_int_t verdict;
+-};
+-
+-struct compat_ipt_standard
+-{
+- struct compat_ipt_entry entry;
+- struct compat_ipt_standard_target target;
+-};
++ int v = *(compat_int_t *)src;
+
+-#define IPT_ST_LEN XT_ALIGN(sizeof(struct ipt_standard_target))
+-#define IPT_ST_COMPAT_LEN COMPAT_XT_ALIGN(sizeof(struct compat_ipt_standard_target))
+-#define IPT_ST_OFFSET (IPT_ST_LEN - IPT_ST_COMPAT_LEN)
++ if (v > 0)
++ v += compat_calc_jump(v);
++ memcpy(dst, &v, sizeof(v));
++}
+
+-static int compat_ipt_standard_fn(void *target,
+- void **dstptr, int *size, int convert)
++static int compat_standard_to_user(void __user *dst, void *src)
+ {
+- struct compat_ipt_standard_target compat_st, *pcompat_st;
+- struct ipt_standard_target st, *pst;
+- int ret;
++ compat_int_t cv = *(int *)src;
+
+- ret = 0;
+- switch (convert) {
+- case COMPAT_TO_USER:
+- pst = target;
+- memcpy(&compat_st.target, &pst->target,
+- sizeof(compat_st.target));
+- compat_st.verdict = pst->verdict;
+- if (compat_st.verdict > 0)
+- compat_st.verdict -=
+- compat_calc_jump(compat_st.verdict);
+- compat_st.target.u.user.target_size = IPT_ST_COMPAT_LEN;
+- if (copy_to_user(*dstptr, &compat_st, IPT_ST_COMPAT_LEN))
+- ret = -EFAULT;
+- *size -= IPT_ST_OFFSET;
+- *dstptr += IPT_ST_COMPAT_LEN;
+- break;
+- case COMPAT_FROM_USER:
+- pcompat_st = target;
+- memcpy(&st.target, &pcompat_st->target, IPT_ST_COMPAT_LEN);
+- st.verdict = pcompat_st->verdict;
+- if (st.verdict > 0)
+- st.verdict += compat_calc_jump(st.verdict);
+- st.target.u.user.target_size = IPT_ST_LEN;
+- memcpy(*dstptr, &st, IPT_ST_LEN);
+- *size += IPT_ST_OFFSET;
+- *dstptr += IPT_ST_LEN;
+- break;
+- case COMPAT_CALC_SIZE:
+- *size += IPT_ST_OFFSET;
+- break;
+- default:
+- ret = -ENOPROTOOPT;
+- break;
+- }
+- return ret;
++ if (cv > 0)
++ cv -= compat_calc_jump(cv);
++ return copy_to_user(dst, &cv, sizeof(cv)) ? -EFAULT : 0;
+ }
+
+ static inline int
+ compat_calc_match(struct ipt_entry_match *m, int * size)
+ {
+- if (m->u.kernel.match->compat)
+- m->u.kernel.match->compat(m, NULL, size, COMPAT_CALC_SIZE);
+- else
+- xt_compat_match(m, NULL, size, COMPAT_CALC_SIZE);
++ *size += xt_compat_match_offset(m->u.kernel.match);
+ return 0;
+ }
+
+@@ -1031,10 +986,7 @@ static int compat_calc_entry(struct ipt_
+ entry_offset = (void *)e - base;
+ IPT_MATCH_ITERATE(e, compat_calc_match, &off);
+ t = ipt_get_target(e);
+- if (t->u.kernel.target->compat)
+- t->u.kernel.target->compat(t, NULL, &off, COMPAT_CALC_SIZE);
+- else
+- xt_compat_target(t, NULL, &off, COMPAT_CALC_SIZE);
++ off += xt_compat_target_offset(t->u.kernel.target);
+ newinfo->size -= off;
+ ret = compat_add_offset(entry_offset, off);
+ if (ret)
+@@ -1420,17 +1372,13 @@ struct compat_ipt_replace {
+ };
+
+ static inline int compat_copy_match_to_user(struct ipt_entry_match *m,
+- void __user **dstptr, compat_uint_t *size)
++ void * __user *dstptr, compat_uint_t *size)
+ {
+- if (m->u.kernel.match->compat)
+- return m->u.kernel.match->compat(m, dstptr, size,
+- COMPAT_TO_USER);
+- else
+- return xt_compat_match(m, dstptr, size, COMPAT_TO_USER);
++ return xt_compat_match_to_user(m, dstptr, size);
+ }
+
+ static int compat_copy_entry_to_user(struct ipt_entry *e,
+- void __user **dstptr, compat_uint_t *size)
++ void * __user *dstptr, compat_uint_t *size)
+ {
+ struct ipt_entry_target __user *t;
+ struct compat_ipt_entry __user *ce;
+@@ -1450,11 +1398,7 @@ static int compat_copy_entry_to_user(str
+ if (ret)
+ goto out;
+ t = ipt_get_target(e);
+- if (t->u.kernel.target->compat)
+- ret = t->u.kernel.target->compat(t, dstptr, size,
+- COMPAT_TO_USER);
+- else
+- ret = xt_compat_target(t, dstptr, size, COMPAT_TO_USER);
++ ret = xt_compat_target_to_user(t, dstptr, size);
+ if (ret)
+ goto out;
+ ret = -EFAULT;
+@@ -1486,11 +1430,7 @@ compat_check_calc_match(struct ipt_entry
+ return match ? PTR_ERR(match) : -ENOENT;
+ }
+ m->u.kernel.match = match;
+-
+- if (m->u.kernel.match->compat)
+- m->u.kernel.match->compat(m, NULL, size, COMPAT_CALC_SIZE);
+- else
+- xt_compat_match(m, NULL, size, COMPAT_CALC_SIZE);
++ *size += xt_compat_match_offset(match);
+
+ (*i)++;
+ return 0;
+@@ -1551,10 +1491,7 @@ check_compat_entry_size_and_hooks(struct
+ }
+ t->u.kernel.target = target;
+
+- if (t->u.kernel.target->compat)
+- t->u.kernel.target->compat(t, NULL, &off, COMPAT_CALC_SIZE);
+- else
+- xt_compat_target(t, NULL, &off, COMPAT_CALC_SIZE);
++ off += xt_compat_target_offset(target);
+ *size += off;
+ ret = compat_add_offset(entry_offset, off);
+ if (ret)
+@@ -1589,10 +1526,7 @@ static inline int compat_copy_match_from
+
+ dm = (struct ipt_entry_match *)*dstptr;
+ match = m->u.kernel.match;
+- if (match->compat)
+- match->compat(m, dstptr, size, COMPAT_FROM_USER);
+- else
+- xt_compat_match(m, dstptr, size, COMPAT_FROM_USER);
++ xt_compat_match_from_user(m, dstptr, size);
+
+ ret = xt_check_match(match, AF_INET, dm->u.match_size - sizeof(*dm),
+ name, hookmask, ip->proto,
+@@ -1634,10 +1568,7 @@ static int compat_copy_entry_from_user(s
+ de->target_offset = e->target_offset - (origsize - *size);
+ t = ipt_get_target(e);
+ target = t->u.kernel.target;
+- if (target->compat)
+- target->compat(t, dstptr, size, COMPAT_FROM_USER);
+- else
+- xt_compat_target(t, dstptr, size, COMPAT_FROM_USER);
++ xt_compat_target_from_user(t, dstptr, size);
+
+ de->next_offset = e->next_offset - (origsize - *size);
+ for (h = 0; h < NF_IP_NUMHOOKS; h++) {
+@@ -2200,7 +2131,9 @@ static struct ipt_target ipt_standard_ta
+ .targetsize = sizeof(int),
+ .family = AF_INET,
+ #ifdef CONFIG_COMPAT
+- .compat = &compat_ipt_standard_fn,
++ .compatsize = sizeof(compat_int_t),
++ .compat_from_user = compat_standard_from_user,
++ .compat_to_user = compat_standard_to_user,
+ #endif
+ };
+
+Index: linux-2.6.18/net/netfilter/x_tables.c
+===================================================================
+--- linux-2.6.18.orig/net/netfilter/x_tables.c
++++ linux-2.6.18/net/netfilter/x_tables.c
+@@ -273,52 +273,65 @@ int xt_check_match(const struct xt_match
+ EXPORT_SYMBOL_GPL(xt_check_match);
+
+ #ifdef CONFIG_COMPAT
+-int xt_compat_match(void *match, void **dstptr, int *size, int convert)
++int xt_compat_match_offset(struct xt_match *match)
+ {
+- struct xt_match *m;
+- struct compat_xt_entry_match *pcompat_m;
+- struct xt_entry_match *pm;
+- u_int16_t msize;
+- int off, ret;
++ u_int16_t csize = match->compatsize ? : match->matchsize;
++ return XT_ALIGN(match->matchsize) - COMPAT_XT_ALIGN(csize);
++}
++EXPORT_SYMBOL_GPL(xt_compat_match_offset);
+
+- ret = 0;
+- m = ((struct xt_entry_match *)match)->u.kernel.match;
+- off = XT_ALIGN(m->matchsize) - COMPAT_XT_ALIGN(m->matchsize);
+- switch (convert) {
+- case COMPAT_TO_USER:
+- pm = (struct xt_entry_match *)match;
+- msize = pm->u.user.match_size;
+- if (copy_to_user(*dstptr, pm, msize)) {
+- ret = -EFAULT;
+- break;
+- }
+- msize -= off;
+- if (put_user(msize, (u_int16_t *)*dstptr))
+- ret = -EFAULT;
+- *size -= off;
+- *dstptr += msize;
+- break;
+- case COMPAT_FROM_USER:
+- pcompat_m = (struct compat_xt_entry_match *)match;
+- pm = (struct xt_entry_match *)*dstptr;
+- msize = pcompat_m->u.user.match_size;
+- memcpy(pm, pcompat_m, msize);
+- msize += off;
+- pm->u.user.match_size = msize;
+- *size += off;
+- *dstptr += msize;
+- break;
+- case COMPAT_CALC_SIZE:
+- *size += off;
+- break;
+- default:
+- ret = -ENOPROTOOPT;
+- break;
++void xt_compat_match_from_user(struct xt_entry_match *m, void **dstptr,
++ int *size)
++{
++ struct xt_match *match = m->u.kernel.match;
++ struct compat_xt_entry_match *cm = (struct compat_xt_entry_match *)m;
++ int pad, off = xt_compat_match_offset(match);
++ u_int16_t msize = cm->u.user.match_size;
++
++ m = *dstptr;
++ memcpy(m, cm, sizeof(*cm));
++ if (match->compat_from_user)
++ match->compat_from_user(m->data, cm->data);
++ else
++ memcpy(m->data, cm->data, msize - sizeof(*cm));
++ pad = XT_ALIGN(match->matchsize) - match->matchsize;
++ if (pad > 0)
++ memset(m->data + match->matchsize, 0, pad);
++
++ msize += off;
++ m->u.user.match_size = msize;
++
++ *size += off;
++ *dstptr += msize;
++}
++EXPORT_SYMBOL_GPL(xt_compat_match_from_user);
++
++int xt_compat_match_to_user(struct xt_entry_match *m, void __user **dstptr,
++ int *size)
++{
++ struct xt_match *match = m->u.kernel.match;
++ struct compat_xt_entry_match __user *cm = *dstptr;
++ int off = xt_compat_match_offset(match);
++ u_int16_t msize = m->u.user.match_size - off;
++
++ if (copy_to_user(cm, m, sizeof(*cm)) ||
++ put_user(msize, &cm->u.user.match_size))
++ return -EFAULT;
++
++ if (match->compat_to_user) {
++ if (match->compat_to_user((void __user *)cm->data, m->data))
++ return -EFAULT;
++ } else {
++ if (copy_to_user(cm->data, m->data, msize - sizeof(*cm)))
++ return -EFAULT;
+ }
+- return ret;
++
++ *size -= off;
++ *dstptr += msize;
++ return 0;
+ }
+-EXPORT_SYMBOL_GPL(xt_compat_match);
+-#endif
++EXPORT_SYMBOL_GPL(xt_compat_match_to_user);
++#endif /* CONFIG_COMPAT */
+
+ int xt_check_target(const struct xt_target *target, unsigned short family,
+ unsigned int size, const char *table, unsigned int hook_mask,
+@@ -350,51 +363,64 @@ int xt_check_target(const struct xt_targ
+ EXPORT_SYMBOL_GPL(xt_check_target);
+
+ #ifdef CONFIG_COMPAT
+-int xt_compat_target(void *target, void **dstptr, int *size, int convert)
++int xt_compat_target_offset(struct xt_target *target)
+ {
+- struct xt_target *t;
+- struct compat_xt_entry_target *pcompat;
+- struct xt_entry_target *pt;
+- u_int16_t tsize;
+- int off, ret;
++ u_int16_t csize = target->compatsize ? : target->targetsize;
++ return XT_ALIGN(target->targetsize) - COMPAT_XT_ALIGN(csize);
++}
++EXPORT_SYMBOL_GPL(xt_compat_target_offset);
+
+- ret = 0;
+- t = ((struct xt_entry_target *)target)->u.kernel.target;
+- off = XT_ALIGN(t->targetsize) - COMPAT_XT_ALIGN(t->targetsize);
+- switch (convert) {
+- case COMPAT_TO_USER:
+- pt = (struct xt_entry_target *)target;
+- tsize = pt->u.user.target_size;
+- if (copy_to_user(*dstptr, pt, tsize)) {
+- ret = -EFAULT;
+- break;
+- }
+- tsize -= off;
+- if (put_user(tsize, (u_int16_t *)*dstptr))
+- ret = -EFAULT;
+- *size -= off;
+- *dstptr += tsize;
+- break;
+- case COMPAT_FROM_USER:
+- pcompat = (struct compat_xt_entry_target *)target;
+- pt = (struct xt_entry_target *)*dstptr;
+- tsize = pcompat->u.user.target_size;
+- memcpy(pt, pcompat, tsize);
+- tsize += off;
+- pt->u.user.target_size = tsize;
+- *size += off;
+- *dstptr += tsize;
+- break;
+- case COMPAT_CALC_SIZE:
+- *size += off;
+- break;
+- default:
+- ret = -ENOPROTOOPT;
+- break;
++void xt_compat_target_from_user(struct xt_entry_target *t, void **dstptr,
++ int *size)
++{
++ struct xt_target *target = t->u.kernel.target;
++ struct compat_xt_entry_target *ct = (struct compat_xt_entry_target *)t;
++ int pad, off = xt_compat_target_offset(target);
++ u_int16_t tsize = ct->u.user.target_size;
++
++ t = *dstptr;
++ memcpy(t, ct, sizeof(*ct));
++ if (target->compat_from_user)
++ target->compat_from_user(t->data, ct->data);
++ else
++ memcpy(t->data, ct->data, tsize - sizeof(*ct));
++ pad = XT_ALIGN(target->targetsize) - target->targetsize;
++ if (pad > 0)
++ memset(t->data + target->targetsize, 0, pad);
++
++ tsize += off;
++ t->u.user.target_size = tsize;
++
++ *size += off;
++ *dstptr += tsize;
++}
++EXPORT_SYMBOL_GPL(xt_compat_target_from_user);
++
++int xt_compat_target_to_user(struct xt_entry_target *t, void __user **dstptr,
++ int *size)
++{
++ struct xt_target *target = t->u.kernel.target;
++ struct compat_xt_entry_target __user *ct = *dstptr;
++ int off = xt_compat_target_offset(target);
++ u_int16_t tsize = t->u.user.target_size - off;
++
++ if (copy_to_user(ct, t, sizeof(*ct)) ||
++ put_user(tsize, &ct->u.user.target_size))
++ return -EFAULT;
++
++ if (target->compat_to_user) {
++ if (target->compat_to_user((void __user *)ct->data, t->data))
++ return -EFAULT;
++ } else {
++ if (copy_to_user(ct->data, t->data, tsize - sizeof(*ct)))
++ return -EFAULT;
+ }
+- return ret;
++
++ *size -= off;
++ *dstptr += tsize;
++ return 0;
+ }
+-EXPORT_SYMBOL_GPL(xt_compat_target);
++EXPORT_SYMBOL_GPL(xt_compat_target_to_user);
+ #endif
+
+ struct xt_table_info *xt_alloc_table_info(unsigned int size)
+Index: linux-2.6.18/net/netfilter/xt_CONNMARK.c
+===================================================================
+--- linux-2.6.18.orig/net/netfilter/xt_CONNMARK.c
++++ linux-2.6.18/net/netfilter/xt_CONNMARK.c
+@@ -97,12 +97,48 @@ checkentry(const char *tablename,
+ return 1;
+ }
+
++#ifdef CONFIG_COMPAT
++struct compat_xt_connmark_target_info {
++ compat_ulong_t mark, mask;
++ u_int8_t mode;
++ u_int8_t __pad1;
++ u_int16_t __pad2;
++};
++
++static void compat_from_user(void *dst, void *src)
++{
++ struct compat_xt_connmark_target_info *cm = src;
++ struct xt_connmark_target_info m = {
++ .mark = cm->mark,
++ .mask = cm->mask,
++ .mode = cm->mode,
++ };
++ memcpy(dst, &m, sizeof(m));
++}
++
++static int compat_to_user(void __user *dst, void *src)
++{
++ struct xt_connmark_target_info *m = src;
++ struct compat_xt_connmark_target_info cm = {
++ .mark = m->mark,
++ .mask = m->mask,
++ .mode = m->mode,
++ };
++ return copy_to_user(dst, &cm, sizeof(cm)) ? -EFAULT : 0;
++}
++#endif /* CONFIG_COMPAT */
++
+ static struct xt_target connmark_reg = {
+ .name = "CONNMARK",
+ .target = target,
+ .targetsize = sizeof(struct xt_connmark_target_info),
+ .checkentry = checkentry,
+ .family = AF_INET,
++#ifdef CONFIG_COMPAT
++ .compatsize = sizeof(struct compat_xt_connmark_target_info),
++ .compat_from_user = compat_from_user,
++ .compat_to_user = compat_to_user,
++#endif
+ .me = THIS_MODULE
+ };
+
+Index: linux-2.6.18/net/netfilter/xt_MARK.c
+===================================================================
+--- linux-2.6.18.orig/net/netfilter/xt_MARK.c
++++ linux-2.6.18/net/netfilter/xt_MARK.c
+@@ -112,12 +112,46 @@ checkentry_v1(const char *tablename,
+ return 1;
+ }
+
++#ifdef CONFIG_COMPAT
++struct compat_xt_mark_target_info_v1 {
++ compat_ulong_t mark;
++ u_int8_t mode;
++ u_int8_t __pad1;
++ u_int16_t __pad2;
++};
++
++static void compat_from_user_v1(void *dst, void *src)
++{
++ struct compat_xt_mark_target_info_v1 *cm = src;
++ struct xt_mark_target_info_v1 m = {
++ .mark = cm->mark,
++ .mode = cm->mode,
++ };
++ memcpy(dst, &m, sizeof(m));
++}
++
++static int compat_to_user_v1(void __user *dst, void *src)
++{
++ struct xt_mark_target_info_v1 *m = src;
++ struct compat_xt_mark_target_info_v1 cm = {
++ .mark = m->mark,
++ .mode = m->mode,
++ };
++ return copy_to_user(dst, &cm, sizeof(cm)) ? -EFAULT : 0;
++}
++#endif /* CONFIG_COMPAT */
++
+ static struct xt_target ipt_mark_reg_v0 = {
+ .name = "MARK",
+ .target = target_v0,
+ .targetsize = sizeof(struct xt_mark_target_info),
+ .table = "mangle",
+ .checkentry = checkentry_v0,
++#ifdef CONFIG_COMPAT
++ .compatsize = sizeof(struct compat_xt_mark_target_info_v1),
++ .compat_from_user = compat_from_user_v1,
++ .compat_to_user = compat_to_user_v1,
++#endif
+ .me = THIS_MODULE,
+ .family = AF_INET,
+ .revision = 0,
+Index: linux-2.6.18/net/netfilter/xt_connmark.c
+===================================================================
+--- linux-2.6.18.orig/net/netfilter/xt_connmark.c
++++ linux-2.6.18/net/netfilter/xt_connmark.c
+@@ -82,12 +82,48 @@ destroy(const struct xt_match *match, vo
+ #endif
+ }
+
++#ifdef CONFIG_COMPAT
++struct compat_xt_connmark_info {
++ compat_ulong_t mark, mask;
++ u_int8_t invert;
++ u_int8_t __pad1;
++ u_int16_t __pad2;
++};
++
++static void compat_from_user(void *dst, void *src)
++{
++ struct compat_xt_connmark_info *cm = src;
++ struct xt_connmark_info m = {
++ .mark = cm->mark,
++ .mask = cm->mask,
++ .invert = cm->invert,
++ };
++ memcpy(dst, &m, sizeof(m));
++}
++
++static int compat_to_user(void __user *dst, void *src)
++{
++ struct xt_connmark_info *m = src;
++ struct compat_xt_connmark_info cm = {
++ .mark = m->mark,
++ .mask = m->mask,
++ .invert = m->invert,
++ };
++ return copy_to_user(dst, &cm, sizeof(cm)) ? -EFAULT : 0;
++}
++#endif /* CONFIG_COMPAT */
++
+ static struct xt_match connmark_match = {
+ .name = "connmark",
+ .match = match,
+ .matchsize = sizeof(struct xt_connmark_info),
+ .checkentry = checkentry,
+ .destroy = destroy,
++#ifdef CONFIG_COMPAT
++ .compatsize = sizeof(struct compat_xt_connmark_info),
++ .compat_from_user = compat_from_user,
++ .compat_to_user = compat_to_user,
++#endif
+ .family = AF_INET,
+ .me = THIS_MODULE
+ };
+Index: linux-2.6.18/net/netfilter/xt_limit.c
+===================================================================
+--- linux-2.6.18.orig/net/netfilter/xt_limit.c
++++ linux-2.6.18/net/netfilter/xt_limit.c
+@@ -136,12 +136,61 @@ ipt_limit_checkentry(const char *tablena
+ return 1;
+ }
+
++#ifdef CONFIG_COMPAT
++struct compat_xt_rateinfo {
++ u_int32_t avg;
++ u_int32_t burst;
++
++ compat_ulong_t prev;
++ u_int32_t credit;
++ u_int32_t credit_cap, cost;
++
++ u_int32_t master;
++};
++
++/* To keep the full "prev" timestamp, the upper 32 bits are stored in the
++ * master pointer, which does not need to be preserved. */
++static void compat_from_user(void *dst, void *src)
++{
++ struct compat_xt_rateinfo *cm = src;
++ struct xt_rateinfo m = {
++ .avg = cm->avg,
++ .burst = cm->burst,
++ .prev = cm->prev | (unsigned long)cm->master << 32,
++ .credit = cm->credit,
++ .credit_cap = cm->credit_cap,
++ .cost = cm->cost,
++ };
++ memcpy(dst, &m, sizeof(m));
++}
++
++static int compat_to_user(void __user *dst, void *src)
++{
++ struct xt_rateinfo *m = src;
++ struct compat_xt_rateinfo cm = {
++ .avg = m->avg,
++ .burst = m->burst,
++ .prev = m->prev,
++ .credit = m->credit,
++ .credit_cap = m->credit_cap,
++ .cost = m->cost,
++ .master = m->prev >> 32,
++ };
++ return copy_to_user(dst, &cm, sizeof(cm)) ? -EFAULT : 0;
++}
++#endif /* CONFIG_COMPAT */
++
+ static struct xt_match ipt_limit_reg = {
+ .name = "limit",
+ .match = ipt_limit_match,
+ .matchsize = sizeof(struct xt_rateinfo),
+ .checkentry = ipt_limit_checkentry,
+ .family = AF_INET,
++#ifdef CONFIG_COMPAT
++ .compatsize = sizeof(struct compat_xt_rateinfo),
++ .compat_from_user = compat_from_user,
++ .compat_to_user = compat_to_user,
++#endif
+ .me = THIS_MODULE,
+ };
+ static struct xt_match limit6_reg = {
+Index: linux-2.6.18/net/netfilter/xt_mark.c
+===================================================================
+--- linux-2.6.18.orig/net/netfilter/xt_mark.c
++++ linux-2.6.18/net/netfilter/xt_mark.c
+@@ -51,11 +51,47 @@ checkentry(const char *tablename,
+ return 1;
+ }
+
++#ifdef CONFIG_COMPAT
++struct compat_xt_mark_info {
++ compat_ulong_t mark, mask;
++ u_int8_t invert;
++ u_int8_t __pad1;
++ u_int16_t __pad2;
++};
++
++static void compat_from_user(void *dst, void *src)
++{
++ struct compat_xt_mark_info *cm = src;
++ struct xt_mark_info m = {
++ .mark = cm->mark,
++ .mask = cm->mask,
++ .invert = cm->invert,
++ };
++ memcpy(dst, &m, sizeof(m));
++}
++
++static int compat_to_user(void __user *dst, void *src)
++{
++ struct xt_mark_info *m = src;
++ struct compat_xt_mark_info cm = {
++ .mark = m->mark,
++ .mask = m->mask,
++ .invert = m->invert,
++ };
++ return copy_to_user(dst, &cm, sizeof(cm)) ? -EFAULT : 0;
++}
++#endif /* CONFIG_COMPAT */
++
+ static struct xt_match mark_match = {
+ .name = "mark",
+ .match = match,
+ .matchsize = sizeof(struct xt_mark_info),
+ .checkentry = checkentry,
++#ifdef CONFIG_COMPAT
++ .compatsize = sizeof(struct compat_xt_mark_info),
++ .compat_from_user = compat_from_user,
++ .compat_to_user = compat_to_user,
++#endif
+ .family = AF_INET,
+ .me = THIS_MODULE,
+ };
++++++ patches.uml.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.uml/uml-needs-_syscall0 new/patches.uml/uml-needs-_syscall0
--- old/patches.uml/uml-needs-_syscall0 1970-01-01 01:00:00.000000000 +0100
+++ new/patches.uml/uml-needs-_syscall0 2006-10-10 12:33:30.000000000 +0200
@@ -0,0 +1,38 @@
+Subject: Fix uml build with 2.6.18+ kernel headers.
+From: kraxel@xxxxxxx
+
+Someone wrapped the syscall defines into #ifdef __KERNEL__,
+breaking the uml kernel build. Workaround that.
+
+---
+ arch/um/os-Linux/process.c | 4 ++++
+ arch/um/os-Linux/sys-i386/tls.c | 4 ++++
+ 2 files changed, 8 insertions(+)
+
+Index: linux-2.6.18/arch/um/os-Linux/process.c
+===================================================================
+--- linux-2.6.18.orig/arch/um/os-Linux/process.c
++++ linux-2.6.18/arch/um/os-Linux/process.c
+@@ -3,6 +3,10 @@
+ * Licensed under the GPL
+ */
+
++#define __KERNEL__ /* need _syscall0 */
++#include <asm/unistd.h>
++#undef __KERNEL__
++
+ #include <unistd.h>
+ #include <stdio.h>
+ #include <errno.h>
+Index: linux-2.6.18/arch/um/os-Linux/sys-i386/tls.c
+===================================================================
+--- linux-2.6.18.orig/arch/um/os-Linux/sys-i386/tls.c
++++ linux-2.6.18/arch/um/os-Linux/sys-i386/tls.c
+@@ -1,3 +1,7 @@
++#define __KERNEL__ /* need _syscall1 */
++#include <asm/unistd.h>
++#undef __KERNEL__
++
+ #include <errno.h>
+ #include <linux/unistd.h>
+ #include "sysdep/tls.h"
++++++ series.conf ++++++
--- kernel-source/series.conf 2006-10-09 21:16:27.000000000 +0200
+++ /mounts/work_src_done/STABLE/kernel-source/series.conf 2006-10-11 14:47:08.000000000 +0200
@@ -226,6 +226,7 @@
# filtering purposes.
########################################################
+ patches.fixes/netfilter-compat.patch
# anyone want to refresh this one?
# patches.suse/netfilter-ipv4options
@@ -348,9 +349,6 @@
########################################################
# Suspend/Resume stuff
########################################################
- # still need?
-# patches.drivers/libata-acpi-suspend
-# patches.drivers/libata-acpi-suspend-doc-fix
patches.fixes/dm-suspend-resume-events
patches.suse/uswsusp-add-pmops-prepareenterfinish-support-aka-platform-mode.patch
@@ -470,6 +468,7 @@
### uml fixes/patches
patches.uml/fix-build
patches.uml/jmpbuf
+ patches.uml/uml-needs-_syscall0
### kraxel's uml framebuffer driver
patches.uml/uml-kconfig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |