Mailinglist Archive: opensuse-commit (1318 mails)

< Previous Next >
commit kernel-source
  • From: root@xxxxxxx (h_root)
  • Date: Tue, 29 Aug 2006 00:07:33 +0200 (CEST)
  • Message-id: <20060828220733.9920B95238@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package kernel-source
checked in at Tue Aug 29 00:07:33 CEST 2006.

--------
--- kernel-source/kernel-bigsmp.changes 2006-08-23 20:41:57.000000000 +0200
+++ kernel-source/kernel-bigsmp.changes 2006-08-28 22:45:48.000000000 +0200
@@ -1,0 +2,28 @@
+Mon Aug 28 13:19:11 CEST 2006 - olh@xxxxxxx
+
+- add patches.suse/mv643xx_eth.hwinfo.patch
+ load the driver via the PCI bridge id until hwinfo is fixed (199112)
+
+-------------------------------------------------------------------
+Mon Aug 28 11:27:22 CEST 2006 - kraxel@xxxxxxx
+
+- patches.fixes/smpalt-fixup: fix up smp alternatives on x86-64
+ (199984).
+
+-------------------------------------------------------------------
+Mon Aug 28 10:08:11 CEST 2006 - gregkh@xxxxxxx
+
+- Update to 2.6.18-rc5
+
+-------------------------------------------------------------------
+Mon Aug 28 08:33:03 CEST 2006 - olh@xxxxxxx
+
+- update patches.suse/suse-ppc-legacy-io.patch
+ resere legacy IO range only for ppc32 for the time being (195931)
+
+-------------------------------------------------------------------
+Fri Aug 25 20:16:43 CEST 2006 - gregkh@xxxxxxx
+
+- Enable CONFIG_KEYS as per bug number 201737
+
+-------------------------------------------------------------------
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-xen.changes: same change
kernel-xenpae.changes: same change

New:
----
needed_space_in_mb

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ kernel-bigsmp.spec ++++++
--- /var/tmp/diff_new_pack.sjWPje/_old 2006-08-28 23:58:18.000000000 +0200
+++ /var/tmp/diff_new_pack.sjWPje/_new 2006-08-28 23:58:18.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-bigsmp (Version 2.6.18_rc4_git1)
+# spec file for package kernel-bigsmp (Version 2.6.18_rc5)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -20,8 +20,8 @@
# arch/ia64/scripts/unwcheck.py
BuildRequires: python
%endif
-Version: 2.6.18_rc4_git1
-Release: 3
+Version: 2.6.18_rc5
+Release: 1
Summary: Kernel with Multiprocessor Support and PAE
License: GPL
Group: System/Kernel
@@ -29,7 +29,7 @@
#Conflicts: kernel
%else
%if !%build_xen
-Provides: kernel = 2.6.18_rc4_git1-%release
+Provides: kernel = 2.6.18_rc5-%release
%endif
%endif
Provides: kernel-bigsmp-nongpl
@@ -119,12 +119,12 @@



-Source Timestamp: 2006/08/23 18:20:06 UTC
+Source Timestamp: 2006/08/28 11:47:00 UTC

%prep
if ! [ -e %_sourcedir/linux-2.6.17.tar.bz2 ]; then
- echo "The kernel-bigsmp-2.6.18_rc4_git1.nosrc.rpm package does not contain the" \
- "complete sources. Please install kernel-source-2.6.18_rc4_git1.src.rpm."
+ echo "The kernel-bigsmp-2.6.18_rc5.nosrc.rpm package does not contain the" \
+ "complete sources. Please install kernel-source-2.6.18_rc5.src.rpm."
exit 1
fi
symbols=$(
@@ -463,6 +463,19 @@
%files -f kernel.files

%changelog -n kernel-bigsmp
+* Mon Aug 28 2006 - olh@xxxxxxx
+- add patches.suse/mv643xx_eth.hwinfo.patch
+ load the driver via the PCI bridge id until hwinfo is fixed (199112)
+* Mon Aug 28 2006 - kraxel@xxxxxxx
+- patches.fixes/smpalt-fixup: fix up smp alternatives on x86-64
+ (199984).
+* Mon Aug 28 2006 - gregkh@xxxxxxx
+- Update to 2.6.18-rc5
+* Mon Aug 28 2006 - olh@xxxxxxx
+- update patches.suse/suse-ppc-legacy-io.patch
+ resere legacy IO range only for ppc32 for the time being (195931)
+* Fri Aug 25 2006 - gregkh@xxxxxxx
+- Enable CONFIG_KEYS as per bug number 201737
* Wed Aug 23 2006 - agruen@xxxxxxx
- rpm/old-packages.conf: Add kernel-smp so that we'll have the
appropriate Provides and Obsoletes tags in spec files.

kernel-debug.spec: same change
kernel-default.spec: same change
++++++ kernel-dummy.spec ++++++
--- /var/tmp/diff_new_pack.sjWPje/_old 2006-08-28 23:58:18.000000000 +0200
+++ /var/tmp/diff_new_pack.sjWPje/_new 2006-08-28 23:58:18.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-dummy (Version 2.6.18_rc4_git1)
+# spec file for package kernel-dummy (Version 2.6.18_rc5)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -16,8 +16,8 @@
Autoreqprov: off
Summary: Internal dummy package for synchronizing release numbers
Group: System/Kernel
-Version: 2.6.18_rc4_git1
-Release: 3
+Version: 2.6.18_rc5
+Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build

%description
@@ -27,7 +27,7 @@
--------
Andreas Gruenbacher <agruen@xxxxxxx>

-Source Timestamp: 2006/08/23 18:20:06 UTC
+Source Timestamp: 2006/08/28 11:47:00 UTC


%install
@@ -40,6 +40,19 @@
/etc/dummy

%changelog -n kernel-dummy
+* Mon Aug 28 2006 - olh@xxxxxxx
+- add patches.suse/mv643xx_eth.hwinfo.patch
+ load the driver via the PCI bridge id until hwinfo is fixed (199112)
+* Mon Aug 28 2006 - kraxel@xxxxxxx
+- patches.fixes/smpalt-fixup: fix up smp alternatives on x86-64
+ (199984).
+* Mon Aug 28 2006 - gregkh@xxxxxxx
+- Update to 2.6.18-rc5
+* Mon Aug 28 2006 - olh@xxxxxxx
+- update patches.suse/suse-ppc-legacy-io.patch
+ resere legacy IO range only for ppc32 for the time being (195931)
+* Fri Aug 25 2006 - gregkh@xxxxxxx
+- Enable CONFIG_KEYS as per bug number 201737
* Wed Aug 23 2006 - agruen@xxxxxxx
- rpm/old-packages.conf: Add kernel-smp so that we'll have the
appropriate Provides and Obsoletes tags in spec files.

++++++ kernel-iseries64.spec ++++++
--- /var/tmp/diff_new_pack.sjWPje/_old 2006-08-28 23:58:18.000000000 +0200
+++ /var/tmp/diff_new_pack.sjWPje/_new 2006-08-28 23:58:18.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-iseries64 (Version 2.6.18_rc4_git1)
+# spec file for package kernel-iseries64 (Version 2.6.18_rc5)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -20,8 +20,8 @@
# arch/ia64/scripts/unwcheck.py
BuildRequires: python
%endif
-Version: 2.6.18_rc4_git1
-Release: 2
+Version: 2.6.18_rc5
+Release: 1
Summary: 64-Bit Kernel for iSeries
License: GPL
Group: System/Kernel
@@ -29,7 +29,7 @@
#Conflicts: kernel
%else
%if !%build_xen
-Provides: kernel = 2.6.18_rc4_git1-%release
+Provides: kernel = 2.6.18_rc5-%release
%endif
%endif
Provides: kernel-iseries64-nongpl
@@ -120,12 +120,12 @@



-Source Timestamp: 2006/08/23 18:20:06 UTC
+Source Timestamp: 2006/08/28 11:47:00 UTC

%prep
if ! [ -e %_sourcedir/linux-2.6.17.tar.bz2 ]; then
- echo "The kernel-iseries64-2.6.18_rc4_git1.nosrc.rpm package does not contain the" \
- "complete sources. Please install kernel-source-2.6.18_rc4_git1.src.rpm."
+ echo "The kernel-iseries64-2.6.18_rc5.nosrc.rpm package does not contain the" \
+ "complete sources. Please install kernel-source-2.6.18_rc5.src.rpm."
exit 1
fi
symbols=$(
@@ -464,6 +464,19 @@
%files -f kernel.files

%changelog -n kernel-iseries64
+* Mon Aug 28 2006 - olh@xxxxxxx
+- add patches.suse/mv643xx_eth.hwinfo.patch
+ load the driver via the PCI bridge id until hwinfo is fixed (199112)
+* Mon Aug 28 2006 - kraxel@xxxxxxx
+- patches.fixes/smpalt-fixup: fix up smp alternatives on x86-64
+ (199984).
+* Mon Aug 28 2006 - gregkh@xxxxxxx
+- Update to 2.6.18-rc5
+* Mon Aug 28 2006 - olh@xxxxxxx
+- update patches.suse/suse-ppc-legacy-io.patch
+ resere legacy IO range only for ppc32 for the time being (195931)
+* Fri Aug 25 2006 - gregkh@xxxxxxx
+- Enable CONFIG_KEYS as per bug number 201737
* Wed Aug 23 2006 - agruen@xxxxxxx
- rpm/old-packages.conf: Add kernel-smp so that we'll have the
appropriate Provides and Obsoletes tags in spec files.

++++++ kernel-kdump.spec ++++++
--- /var/tmp/diff_new_pack.sjWPje/_old 2006-08-28 23:58:18.000000000 +0200
+++ /var/tmp/diff_new_pack.sjWPje/_new 2006-08-28 23:58:19.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-kdump (Version 2.6.18_rc4_git1)
+# spec file for package kernel-kdump (Version 2.6.18_rc5)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -20,8 +20,8 @@
# arch/ia64/scripts/unwcheck.py
BuildRequires: python
%endif
-Version: 2.6.18_rc4_git1
-Release: 3
+Version: 2.6.18_rc5
+Release: 1
Summary: kernel for kdump
License: GPL
Group: System/Kernel
@@ -29,7 +29,7 @@
#Conflicts: kernel
%else
%if !%build_xen
-Provides: kernel = 2.6.18_rc4_git1-%release
+Provides: kernel = 2.6.18_rc5-%release
%endif
%endif
Provides: kernel-kdump-nongpl
@@ -129,12 +129,12 @@



-Source Timestamp: 2006/08/23 18:20:06 UTC
+Source Timestamp: 2006/08/28 11:47:00 UTC

%prep
if ! [ -e %_sourcedir/linux-2.6.17.tar.bz2 ]; then
- echo "The kernel-kdump-2.6.18_rc4_git1.nosrc.rpm package does not contain the" \
- "complete sources. Please install kernel-source-2.6.18_rc4_git1.src.rpm."
+ echo "The kernel-kdump-2.6.18_rc5.nosrc.rpm package does not contain the" \
+ "complete sources. Please install kernel-source-2.6.18_rc5.src.rpm."
exit 1
fi
symbols=$(
@@ -473,6 +473,19 @@
%files -f kernel.files

%changelog -n kernel-kdump
+* Mon Aug 28 2006 - olh@xxxxxxx
+- add patches.suse/mv643xx_eth.hwinfo.patch
+ load the driver via the PCI bridge id until hwinfo is fixed (199112)
+* Mon Aug 28 2006 - kraxel@xxxxxxx
+- patches.fixes/smpalt-fixup: fix up smp alternatives on x86-64
+ (199984).
+* Mon Aug 28 2006 - gregkh@xxxxxxx
+- Update to 2.6.18-rc5
+* Mon Aug 28 2006 - olh@xxxxxxx
+- update patches.suse/suse-ppc-legacy-io.patch
+ resere legacy IO range only for ppc32 for the time being (195931)
+* Fri Aug 25 2006 - gregkh@xxxxxxx
+- Enable CONFIG_KEYS as per bug number 201737
* Wed Aug 23 2006 - agruen@xxxxxxx
- rpm/old-packages.conf: Add kernel-smp so that we'll have the
appropriate Provides and Obsoletes tags in spec files.

++++++ kernel-ppc64.spec ++++++
--- /var/tmp/diff_new_pack.sjWPje/_old 2006-08-28 23:58:19.000000000 +0200
+++ /var/tmp/diff_new_pack.sjWPje/_new 2006-08-28 23:58:19.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-ppc64 (Version 2.6.18_rc4_git1)
+# spec file for package kernel-ppc64 (Version 2.6.18_rc5)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -19,8 +19,8 @@
# arch/ia64/scripts/unwcheck.py
BuildRequires: python
%endif
-Version: 2.6.18_rc4_git1
-Release: 2
+Version: 2.6.18_rc5
+Release: 1
Summary: Kernel for ppc64 Systems
License: GPL, LGPL
Group: System/Kernel
@@ -28,7 +28,7 @@
#Conflicts: kernel
%else
%if !%build_xen
-Provides: kernel = 2.6.18_rc4_git1-%release
+Provides: kernel = 2.6.18_rc5-%release
%endif
%endif
Provides: kernel-ppc64-nongpl
@@ -134,12 +134,12 @@
Tom Gall <tom_gall@xxxxxxxxxxxx>
see /usr/src/linux-pmac-benh/CREDITS for more details.

-Source Timestamp: 2006/08/23 18:20:06 UTC
+Source Timestamp: 2006/08/28 11:47:00 UTC

%prep
if ! [ -e %_sourcedir/linux-2.6.17.tar.bz2 ]; then
- echo "The kernel-ppc64-2.6.18_rc4_git1.nosrc.rpm package does not contain the" \
- "complete sources. Please install kernel-source-2.6.18_rc4_git1.src.rpm."
+ echo "The kernel-ppc64-2.6.18_rc5.nosrc.rpm package does not contain the" \
+ "complete sources. Please install kernel-source-2.6.18_rc5.src.rpm."
exit 1
fi
symbols=$(
@@ -478,6 +478,19 @@
%files -f kernel.files

%changelog -n kernel-ppc64
+* Mon Aug 28 2006 - olh@xxxxxxx
+- add patches.suse/mv643xx_eth.hwinfo.patch
+ load the driver via the PCI bridge id until hwinfo is fixed (199112)
+* Mon Aug 28 2006 - kraxel@xxxxxxx
+- patches.fixes/smpalt-fixup: fix up smp alternatives on x86-64
+ (199984).
+* Mon Aug 28 2006 - gregkh@xxxxxxx
+- Update to 2.6.18-rc5
+* Mon Aug 28 2006 - olh@xxxxxxx
+- update patches.suse/suse-ppc-legacy-io.patch
+ resere legacy IO range only for ppc32 for the time being (195931)
+* Fri Aug 25 2006 - gregkh@xxxxxxx
+- Enable CONFIG_KEYS as per bug number 201737
* Wed Aug 23 2006 - agruen@xxxxxxx
- rpm/old-packages.conf: Add kernel-smp so that we'll have the
appropriate Provides and Obsoletes tags in spec files.

++++++ kernel-s390.spec ++++++
--- /var/tmp/diff_new_pack.sjWPje/_old 2006-08-28 23:58:19.000000000 +0200
+++ /var/tmp/diff_new_pack.sjWPje/_new 2006-08-28 23:58:19.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-s390 (Version 2.6.18_rc4_git1)
+# spec file for package kernel-s390 (Version 2.6.18_rc5)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -20,8 +20,8 @@
# arch/ia64/scripts/unwcheck.py
BuildRequires: python
%endif
-Version: 2.6.18_rc4_git1
-Release: 2
+Version: 2.6.18_rc5
+Release: 1
Summary: The Standard Kernel
License: GPL
Group: System/Kernel
@@ -29,7 +29,7 @@
#Conflicts: kernel
%else
%if !%build_xen
-Provides: kernel = 2.6.18_rc4_git1-%release
+Provides: kernel = 2.6.18_rc5-%release
%endif
%endif
Provides: kernel-s390-nongpl
@@ -117,12 +117,12 @@



-Source Timestamp: 2006/08/23 18:20:06 UTC
+Source Timestamp: 2006/08/28 11:47:00 UTC

%prep
if ! [ -e %_sourcedir/linux-2.6.17.tar.bz2 ]; then
- echo "The kernel-s390-2.6.18_rc4_git1.nosrc.rpm package does not contain the" \
- "complete sources. Please install kernel-source-2.6.18_rc4_git1.src.rpm."
+ echo "The kernel-s390-2.6.18_rc5.nosrc.rpm package does not contain the" \
+ "complete sources. Please install kernel-source-2.6.18_rc5.src.rpm."
exit 1
fi
symbols=$(
@@ -461,6 +461,19 @@
%files -f kernel.files

%changelog -n kernel-s390
+* Mon Aug 28 2006 - olh@xxxxxxx
+- add patches.suse/mv643xx_eth.hwinfo.patch
+ load the driver via the PCI bridge id until hwinfo is fixed (199112)
+* Mon Aug 28 2006 - kraxel@xxxxxxx
+- patches.fixes/smpalt-fixup: fix up smp alternatives on x86-64
+ (199984).
+* Mon Aug 28 2006 - gregkh@xxxxxxx
+- Update to 2.6.18-rc5
+* Mon Aug 28 2006 - olh@xxxxxxx
+- update patches.suse/suse-ppc-legacy-io.patch
+ resere legacy IO range only for ppc32 for the time being (195931)
+* Fri Aug 25 2006 - gregkh@xxxxxxx
+- Enable CONFIG_KEYS as per bug number 201737
* Wed Aug 23 2006 - agruen@xxxxxxx
- rpm/old-packages.conf: Add kernel-smp so that we'll have the
appropriate Provides and Obsoletes tags in spec files.

++++++ kernel-source.spec ++++++
--- /var/tmp/diff_new_pack.sjWPje/_old 2006-08-28 23:58:19.000000000 +0200
+++ /var/tmp/diff_new_pack.sjWPje/_new 2006-08-28 23:58:19.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-source (Version 2.6.18_rc4_git1)
+# spec file for package kernel-source (Version 2.6.18_rc5)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -24,8 +24,8 @@
Obsoletes: linux lx-gdt lx-hack lx-suse lx1162_1 lx1162_2 lx1212_1 lx1212_2 lx1213_1 lx1213_2 lx121_1 lx121_2 lx126_1 lx126_2 lx129_1 lx129_2 lx_large kernel_headers lx_suse lx_sus22 lx_sus24
%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_rc4_git1
-Release: 3
+Version: 2.6.18_rc5
+Release: 1
Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.17.tar.bz2
Source1: functions.sh
Source2: source-post.sh
@@ -92,7 +92,7 @@

see /usr/src/linux/CREDITS for more details.

-Source Timestamp: 2006/08/23 18:20:06 UTC
+Source Timestamp: 2006/08/28 11:47:00 UTC

%prep
if ! [ -e %_sourcedir/linux-2.6.17.tar.bz2 ]; then
@@ -115,16 +115,16 @@
# Apply the patches needed for this architecture.

%_sourcedir/guards %symbols < %_sourcedir/series.conf \
- > %_builddir/kernel-source-2.6.18_rc4_git1/kernel-source.patches
-for patch in $(< %_builddir/kernel-source-2.6.18_rc4_git1/kernel-source.patches); do
- if ! patch -s -E -p1 --no-backup-if-mismatch -i %_builddir/kernel-source-2.6.18_rc4_git1/$patch; then
+ > %_builddir/kernel-source-2.6.18_rc5/kernel-source.patches
+for patch in $(< %_builddir/kernel-source-2.6.18_rc5/kernel-source.patches); do
+ if ! patch -s -E -p1 --no-backup-if-mismatch -i %_builddir/kernel-source-2.6.18_rc5/$patch; then
echo "*** Patch $patch failed ***"
exit 1
fi
done

-%_sourcedir/install-configs %_sourcedir %_builddir/kernel-source-2.6.18_rc4_git1 %release
-KERNELRELEASE=2.6.18-rc4-git1-%release
+%_sourcedir/install-configs %_sourcedir %_builddir/kernel-source-2.6.18_rc5 %release
+KERNELRELEASE=2.6.18-rc5-%release
cat > %_builddir/%{name}-%{version}/.rpm-defs <<EOF
KERNELRELEASE=$KERNELRELEASE
SYMBOLS=$symbols
@@ -145,8 +145,8 @@
;;
esac
%_sourcedir/guards %symbols kernel-$flavor < %_sourcedir/series.conf \
- > %_builddir/kernel-source-2.6.18_rc4_git1/kernel-$flavor.patches
- diff -q %_builddir/kernel-source-2.6.18_rc4_git1/kernel-{source,$flavor}.patches \
+ > %_builddir/kernel-source-2.6.18_rc5/kernel-$flavor.patches
+ diff -q %_builddir/kernel-source-2.6.18_rc5/kernel-{source,$flavor}.patches \
|| continue
o=$RPM_BUILD_ROOT/usr/src/linux-$KERNELRELEASE-obj/$arch/$flavor
mkdir -p $o
@@ -274,6 +274,19 @@
%files -f kernel-source.files

%changelog -n kernel-source
+* Mon Aug 28 2006 - olh@xxxxxxx
+- add patches.suse/mv643xx_eth.hwinfo.patch
+ load the driver via the PCI bridge id until hwinfo is fixed (199112)
+* Mon Aug 28 2006 - kraxel@xxxxxxx
+- patches.fixes/smpalt-fixup: fix up smp alternatives on x86-64
+ (199984).
+* Mon Aug 28 2006 - gregkh@xxxxxxx
+- Update to 2.6.18-rc5
+* Mon Aug 28 2006 - olh@xxxxxxx
+- update patches.suse/suse-ppc-legacy-io.patch
+ resere legacy IO range only for ppc32 for the time being (195931)
+* Fri Aug 25 2006 - gregkh@xxxxxxx
+- Enable CONFIG_KEYS as per bug number 201737
* Wed Aug 23 2006 - agruen@xxxxxxx
- rpm/old-packages.conf: Add kernel-smp so that we'll have the
appropriate Provides and Obsoletes tags in spec files.

++++++ kernel-syms.spec ++++++
--- /var/tmp/diff_new_pack.sjWPje/_old 2006-08-28 23:58:19.000000000 +0200
+++ /var/tmp/diff_new_pack.sjWPje/_new 2006-08-28 23:58:19.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-syms (Version 2.6.18_rc4_git1)
+# spec file for package kernel-syms (Version 2.6.18_rc5)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -48,10 +48,10 @@
Autoreqprov: off
Summary: Kernel Symbol Versions (modversions)
Group: Development/Sources
-Version: 2.6.18_rc4_git1
-Release: 3
+Version: 2.6.18_rc5
+Release: 1
Requires: linux
-Requires: kernel-source = 2.6.18_rc4_git1-%release
+Requires: kernel-source = 2.6.18_rc5-%release
Source11: arch-symbols
Source12: guards
Source21: config.conf
@@ -84,7 +84,7 @@

see /usr/src/linux/CREDITS for more details.

-Source Timestamp: 2006/08/23 18:20:06 UTC
+Source Timestamp: 2006/08/28 11:47:00 UTC


%install
@@ -127,6 +127,19 @@
/boot/symsets-*-*.tar.gz

%changelog -n kernel-syms
+* Mon Aug 28 2006 - olh@xxxxxxx
+- add patches.suse/mv643xx_eth.hwinfo.patch
+ load the driver via the PCI bridge id until hwinfo is fixed (199112)
+* Mon Aug 28 2006 - kraxel@xxxxxxx
+- patches.fixes/smpalt-fixup: fix up smp alternatives on x86-64
+ (199984).
+* Mon Aug 28 2006 - gregkh@xxxxxxx
+- Update to 2.6.18-rc5
+* Mon Aug 28 2006 - olh@xxxxxxx
+- update patches.suse/suse-ppc-legacy-io.patch
+ resere legacy IO range only for ppc32 for the time being (195931)
+* Fri Aug 25 2006 - gregkh@xxxxxxx
+- Enable CONFIG_KEYS as per bug number 201737
* Wed Aug 23 2006 - agruen@xxxxxxx
- rpm/old-packages.conf: Add kernel-smp so that we'll have the
appropriate Provides and Obsoletes tags in spec files.

++++++ kernel-um.spec ++++++
--- /var/tmp/diff_new_pack.sjWPje/_old 2006-08-28 23:58:19.000000000 +0200
+++ /var/tmp/diff_new_pack.sjWPje/_new 2006-08-28 23:58:19.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-um (Version 2.6.18_rc4_git1)
+# spec file for package kernel-um (Version 2.6.18_rc5)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -20,8 +20,8 @@
# arch/ia64/scripts/unwcheck.py
BuildRequires: python
%endif
-Version: 2.6.18_rc4_git1
-Release: 3
+Version: 2.6.18_rc5
+Release: 1
Summary: The User Mode Linux kernel.
License: GPL
Group: System/Kernel
@@ -29,7 +29,7 @@
#Conflicts: kernel
%else
%if !%build_xen
-Provides: kernel = 2.6.18_rc4_git1-%release
+Provides: kernel = 2.6.18_rc5-%release
%endif
%endif
Provides: kernel-um-nongpl
@@ -125,12 +125,12 @@



-Source Timestamp: 2006/08/23 18:20:06 UTC
+Source Timestamp: 2006/08/28 11:47:00 UTC

%prep
if ! [ -e %_sourcedir/linux-2.6.17.tar.bz2 ]; then
- echo "The kernel-um-2.6.18_rc4_git1.nosrc.rpm package does not contain the" \
- "complete sources. Please install kernel-source-2.6.18_rc4_git1.src.rpm."
+ echo "The kernel-um-2.6.18_rc5.nosrc.rpm package does not contain the" \
+ "complete sources. Please install kernel-source-2.6.18_rc5.src.rpm."
exit 1
fi
symbols=$(
@@ -469,6 +469,19 @@
%files -f kernel.files

%changelog -n kernel-um
+* Mon Aug 28 2006 - olh@xxxxxxx
+- add patches.suse/mv643xx_eth.hwinfo.patch
+ load the driver via the PCI bridge id until hwinfo is fixed (199112)
+* Mon Aug 28 2006 - kraxel@xxxxxxx
+- patches.fixes/smpalt-fixup: fix up smp alternatives on x86-64
+ (199984).
+* Mon Aug 28 2006 - gregkh@xxxxxxx
+- Update to 2.6.18-rc5
+* Mon Aug 28 2006 - olh@xxxxxxx
+- update patches.suse/suse-ppc-legacy-io.patch
+ resere legacy IO range only for ppc32 for the time being (195931)
+* Fri Aug 25 2006 - gregkh@xxxxxxx
+- Enable CONFIG_KEYS as per bug number 201737
* Wed Aug 23 2006 - agruen@xxxxxxx
- rpm/old-packages.conf: Add kernel-smp so that we'll have the
appropriate Provides and Obsoletes tags in spec files.

kernel-xen.spec: same change
kernel-xenpae.spec: same change


++++++ build-source-timestamp ++++++
--- kernel-source/build-source-timestamp 2006-08-23 20:41:55.000000000 +0200
+++ kernel-source/build-source-timestamp 2006-08-28 22:45:41.000000000 +0200
@@ -1 +1 @@
-2006/08/23 18:20:06 UTC
+2006/08/28 11:47:00 UTC







++++++ config.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/alpha/default new/config/alpha/default
--- old/config/alpha/default 2006-08-23 10:32:25.000000000 +0200
+++ new/config/alpha/default 2006-08-28 09:59:05.000000000 +0200
@@ -24,7 +24,7 @@
#
# General setup
#
-CONFIG_LOCALVERSION="-smp"
+CONFIG_LOCALVERSION="-default"
# CONFIG_LOCALVERSION_AUTO is not set
CONFIG_SUSE_KERNEL=y
CONFIG_SWAP=y
@@ -1233,6 +1233,9 @@
CONFIG_CICADA_PHY=m
CONFIG_VITESSE_PHY=m
CONFIG_SMSC_PHY=m
+CONFIG_FIXED_PHY=m
+CONFIG_FIXED_MII_10_FDX=y
+CONFIG_FIXED_MII_100_FDX=y

#
# Ethernet (10 or 100Mbit)
@@ -1323,6 +1326,7 @@
# CONFIG_SUNDANCE_MMIO is not set
CONFIG_VIA_RHINE=m
# CONFIG_VIA_RHINE_MMIO is not set
+CONFIG_VIA_RHINE_NAPI=y
CONFIG_NET_POCKET=y
CONFIG_DE600=m
CONFIG_DE620=m
@@ -3179,7 +3183,8 @@
#
# Security options
#
-# CONFIG_KEYS is not set
+CONFIG_KEYS=y
+CONFIG_KEYS_DEBUG_PROC_KEYS=y
CONFIG_SECURITY=y
CONFIG_SECURITY_NETWORK=y
# CONFIG_SECURITY_NETWORK_XFRM is not set
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/i386/bigsmp new/config/i386/bigsmp
--- old/config/i386/bigsmp 2006-08-23 20:19:20.000000000 +0200
+++ new/config/i386/bigsmp 2006-08-28 20:03:28.000000000 +0200
@@ -1464,6 +1464,9 @@
CONFIG_CICADA_PHY=m
CONFIG_VITESSE_PHY=m
CONFIG_SMSC_PHY=m
+CONFIG_FIXED_PHY=m
+CONFIG_FIXED_MII_10_FDX=y
+CONFIG_FIXED_MII_100_FDX=y

#
# Ethernet (10 or 100Mbit)
@@ -1551,6 +1554,7 @@
CONFIG_TLAN=m
CONFIG_VIA_RHINE=m
# CONFIG_VIA_RHINE_MMIO is not set
+CONFIG_VIA_RHINE_NAPI=y
CONFIG_NET_POCKET=y
CONFIG_ATP=m
CONFIG_DE600=m
@@ -3534,7 +3538,8 @@
#
# Security options
#
-# CONFIG_KEYS is not set
+CONFIG_KEYS=y
+CONFIG_KEYS_DEBUG_PROC_KEYS=y
CONFIG_SECURITY=y
CONFIG_SECURITY_NETWORK=y
# CONFIG_SECURITY_NETWORK_XFRM is not set
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/i386/debug new/config/i386/debug
--- old/config/i386/debug 2006-08-23 20:19:20.000000000 +0200
+++ new/config/i386/debug 2006-08-28 20:03:28.000000000 +0200
@@ -1464,6 +1464,9 @@
CONFIG_CICADA_PHY=m
CONFIG_VITESSE_PHY=m
CONFIG_SMSC_PHY=m
+CONFIG_FIXED_PHY=m
+CONFIG_FIXED_MII_10_FDX=y
+CONFIG_FIXED_MII_100_FDX=y

#
# Ethernet (10 or 100Mbit)
@@ -1551,6 +1554,7 @@
CONFIG_TLAN=m
CONFIG_VIA_RHINE=m
# CONFIG_VIA_RHINE_MMIO is not set
+CONFIG_VIA_RHINE_NAPI=y
CONFIG_NET_POCKET=y
CONFIG_ATP=m
CONFIG_DE600=m
@@ -3529,7 +3533,8 @@
#
# Security options
#
-# CONFIG_KEYS is not set
+CONFIG_KEYS=y
+CONFIG_KEYS_DEBUG_PROC_KEYS=y
CONFIG_SECURITY=y
CONFIG_SECURITY_NETWORK=y
# CONFIG_SECURITY_NETWORK_XFRM is not set
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/i386/default new/config/i386/default
--- old/config/i386/default 2006-08-23 20:19:20.000000000 +0200
+++ new/config/i386/default 2006-08-28 20:03:28.000000000 +0200
@@ -1461,6 +1461,9 @@
CONFIG_CICADA_PHY=m
CONFIG_VITESSE_PHY=m
CONFIG_SMSC_PHY=m
+CONFIG_FIXED_PHY=m
+CONFIG_FIXED_MII_10_FDX=y
+CONFIG_FIXED_MII_100_FDX=y

#
# Ethernet (10 or 100Mbit)
@@ -1548,6 +1551,7 @@
CONFIG_TLAN=m
CONFIG_VIA_RHINE=m
# CONFIG_VIA_RHINE_MMIO is not set
+CONFIG_VIA_RHINE_NAPI=y
CONFIG_NET_POCKET=y
CONFIG_ATP=m
CONFIG_DE600=m
@@ -3527,7 +3531,8 @@
#
# Security options
#
-# CONFIG_KEYS is not set
+CONFIG_KEYS=y
+CONFIG_KEYS_DEBUG_PROC_KEYS=y
CONFIG_SECURITY=y
CONFIG_SECURITY_NETWORK=y
# CONFIG_SECURITY_NETWORK_XFRM is not set
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/i386/kdump new/config/i386/kdump
--- old/config/i386/kdump 2006-08-23 20:19:20.000000000 +0200
+++ new/config/i386/kdump 2006-08-28 20:03:29.000000000 +0200
@@ -1460,6 +1460,9 @@
CONFIG_CICADA_PHY=m
CONFIG_VITESSE_PHY=m
CONFIG_SMSC_PHY=m
+CONFIG_FIXED_PHY=m
+CONFIG_FIXED_MII_10_FDX=y
+CONFIG_FIXED_MII_100_FDX=y

#
# Ethernet (10 or 100Mbit)
@@ -1549,6 +1552,7 @@
CONFIG_TLAN=m
CONFIG_VIA_RHINE=m
# CONFIG_VIA_RHINE_MMIO is not set
+CONFIG_VIA_RHINE_NAPI=y
CONFIG_NET_POCKET=y
CONFIG_ATP=m
CONFIG_DE600=m
@@ -3559,7 +3563,8 @@
#
# Security options
#
-# CONFIG_KEYS is not set
+CONFIG_KEYS=y
+CONFIG_KEYS_DEBUG_PROC_KEYS=y
CONFIG_SECURITY=y
CONFIG_SECURITY_NETWORK=y
# CONFIG_SECURITY_NETWORK_XFRM is not set
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/i386/um new/config/i386/um
--- old/config/i386/um 2006-08-22 00:09:23.000000000 +0200
+++ new/config/i386/um 2006-08-28 20:03:29.000000000 +0200
@@ -1013,7 +1013,8 @@
#
# Security options
#
-# CONFIG_KEYS is not set
+CONFIG_KEYS=y
+CONFIG_KEYS_DEBUG_PROC_KEYS=y
CONFIG_SECURITY=y
CONFIG_SECURITY_NETWORK=y
# CONFIG_SECURITY_NETWORK_XFRM is not set
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/i386/xen new/config/i386/xen
--- old/config/i386/xen 2006-08-23 20:19:20.000000000 +0200
+++ new/config/i386/xen 2006-08-28 20:03:29.000000000 +0200
@@ -1317,6 +1317,9 @@
CONFIG_CICADA_PHY=m
CONFIG_VITESSE_PHY=m
CONFIG_SMSC_PHY=m
+CONFIG_FIXED_PHY=m
+CONFIG_FIXED_MII_10_FDX=y
+CONFIG_FIXED_MII_100_FDX=y

#
# Ethernet (10 or 100Mbit)
@@ -1373,6 +1376,7 @@
CONFIG_TLAN=m
CONFIG_VIA_RHINE=m
# CONFIG_VIA_RHINE_MMIO is not set
+CONFIG_VIA_RHINE_NAPI=y
CONFIG_NET_POCKET=y
CONFIG_ATP=m
CONFIG_DE600=m
@@ -3239,7 +3243,8 @@
#
# Security options
#
-# CONFIG_KEYS is not set
+CONFIG_KEYS=y
+CONFIG_KEYS_DEBUG_PROC_KEYS=y
CONFIG_SECURITY=y
CONFIG_SECURITY_NETWORK=y
# CONFIG_SECURITY_NETWORK_XFRM is not set
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/i386/xenpae new/config/i386/xenpae
--- old/config/i386/xenpae 2006-08-23 20:19:20.000000000 +0200
+++ new/config/i386/xenpae 2006-08-28 20:03:29.000000000 +0200
@@ -1319,6 +1319,9 @@
CONFIG_CICADA_PHY=m
CONFIG_VITESSE_PHY=m
CONFIG_SMSC_PHY=m
+CONFIG_FIXED_PHY=m
+CONFIG_FIXED_MII_10_FDX=y
+CONFIG_FIXED_MII_100_FDX=y

#
# Ethernet (10 or 100Mbit)
@@ -1375,6 +1378,7 @@
CONFIG_TLAN=m
CONFIG_VIA_RHINE=m
# CONFIG_VIA_RHINE_MMIO is not set
+CONFIG_VIA_RHINE_NAPI=y
CONFIG_NET_POCKET=y
CONFIG_ATP=m
CONFIG_DE600=m
@@ -3241,7 +3245,8 @@
#
# Security options
#
-# CONFIG_KEYS is not set
+CONFIG_KEYS=y
+CONFIG_KEYS_DEBUG_PROC_KEYS=y
CONFIG_SECURITY=y
CONFIG_SECURITY_NETWORK=y
# CONFIG_SECURITY_NETWORK_XFRM is not set
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/ia64/debug new/config/ia64/debug
--- old/config/ia64/debug 2006-08-22 00:09:23.000000000 +0200
+++ new/config/ia64/debug 2006-08-28 20:03:29.000000000 +0200
@@ -1180,6 +1180,9 @@
CONFIG_CICADA_PHY=m
CONFIG_VITESSE_PHY=m
CONFIG_SMSC_PHY=m
+CONFIG_FIXED_PHY=m
+CONFIG_FIXED_MII_10_FDX=y
+CONFIG_FIXED_MII_100_FDX=y

#
# Ethernet (10 or 100Mbit)
@@ -1235,6 +1238,7 @@
# CONFIG_SUNDANCE_MMIO is not set
CONFIG_VIA_RHINE=m
# CONFIG_VIA_RHINE_MMIO is not set
+CONFIG_VIA_RHINE_NAPI=y
# CONFIG_NET_POCKET is not set

#
@@ -2999,7 +3003,8 @@
#
# Security options
#
-# CONFIG_KEYS is not set
+CONFIG_KEYS=y
+CONFIG_KEYS_DEBUG_PROC_KEYS=y
CONFIG_SECURITY=y
CONFIG_SECURITY_NETWORK=y
# CONFIG_SECURITY_NETWORK_XFRM is not set
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/ia64/default new/config/ia64/default
--- old/config/ia64/default 2006-08-22 00:09:23.000000000 +0200
+++ new/config/ia64/default 2006-08-28 20:03:29.000000000 +0200
@@ -1180,6 +1180,9 @@
CONFIG_CICADA_PHY=m
CONFIG_VITESSE_PHY=m
CONFIG_SMSC_PHY=m
+CONFIG_FIXED_PHY=m
+CONFIG_FIXED_MII_10_FDX=y
+CONFIG_FIXED_MII_100_FDX=y

#
# Ethernet (10 or 100Mbit)
@@ -1235,6 +1238,7 @@
# CONFIG_SUNDANCE_MMIO is not set
CONFIG_VIA_RHINE=m
# CONFIG_VIA_RHINE_MMIO is not set
+CONFIG_VIA_RHINE_NAPI=y
# CONFIG_NET_POCKET is not set

#
@@ -2997,7 +3001,8 @@
#
# Security options
#
-# CONFIG_KEYS is not set
+CONFIG_KEYS=y
+CONFIG_KEYS_DEBUG_PROC_KEYS=y
CONFIG_SECURITY=y
CONFIG_SECURITY_NETWORK=y
# CONFIG_SECURITY_NETWORK_XFRM is not set
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/powerpc/default new/config/powerpc/default
--- old/config/powerpc/default 2006-08-22 00:09:23.000000000 +0200
+++ new/config/powerpc/default 2006-08-28 20:03:29.000000000 +0200
@@ -1034,6 +1034,9 @@
CONFIG_CICADA_PHY=m
CONFIG_VITESSE_PHY=m
CONFIG_SMSC_PHY=m
+CONFIG_FIXED_PHY=m
+CONFIG_FIXED_MII_10_FDX=y
+CONFIG_FIXED_MII_100_FDX=y

#
# Ethernet (10 or 100Mbit)
@@ -1093,6 +1096,7 @@
CONFIG_TLAN=m
CONFIG_VIA_RHINE=m
# CONFIG_VIA_RHINE_MMIO is not set
+CONFIG_VIA_RHINE_NAPI=y
# CONFIG_NET_POCKET is not set

#
@@ -2437,7 +2441,8 @@
#
# Security options
#
-# CONFIG_KEYS is not set
+CONFIG_KEYS=y
+CONFIG_KEYS_DEBUG_PROC_KEYS=y
CONFIG_SECURITY=y
CONFIG_SECURITY_NETWORK=y
# CONFIG_SECURITY_NETWORK_XFRM is not set
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/powerpc/iseries64 new/config/powerpc/iseries64
--- old/config/powerpc/iseries64 2006-08-22 00:09:23.000000000 +0200
+++ new/config/powerpc/iseries64 2006-08-28 20:03:29.000000000 +0200
@@ -707,6 +707,9 @@
CONFIG_CICADA_PHY=m
CONFIG_VITESSE_PHY=m
CONFIG_SMSC_PHY=m
+CONFIG_FIXED_PHY=m
+CONFIG_FIXED_MII_10_FDX=y
+CONFIG_FIXED_MII_100_FDX=y

#
# Ethernet (10 or 100Mbit)
@@ -1336,7 +1339,8 @@
#
# Security options
#
-# CONFIG_KEYS is not set
+CONFIG_KEYS=y
+CONFIG_KEYS_DEBUG_PROC_KEYS=y
CONFIG_SECURITY=y
CONFIG_SECURITY_NETWORK=y
# CONFIG_SECURITY_NETWORK_XFRM is not set
@@ -1344,6 +1348,7 @@
CONFIG_SECURITY_SECLVL=m
# CONFIG_SECURITY_SELINUX is not set
CONFIG_SECURITY_APPARMOR=m
+CONFIG_KEYS_COMPAT=y

#
# Cryptographic options
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/powerpc/kdump new/config/powerpc/kdump
--- old/config/powerpc/kdump 2006-08-22 00:09:23.000000000 +0200
+++ new/config/powerpc/kdump 2006-08-28 20:03:29.000000000 +0200
@@ -868,6 +868,9 @@
CONFIG_CICADA_PHY=m
CONFIG_VITESSE_PHY=m
CONFIG_SMSC_PHY=m
+CONFIG_FIXED_PHY=m
+CONFIG_FIXED_MII_10_FDX=y
+CONFIG_FIXED_MII_100_FDX=y

#
# Ethernet (10 or 100Mbit)
@@ -1878,7 +1881,8 @@
#
# Security options
#
-# CONFIG_KEYS is not set
+CONFIG_KEYS=y
+CONFIG_KEYS_DEBUG_PROC_KEYS=y
CONFIG_SECURITY=y
CONFIG_SECURITY_NETWORK=y
# CONFIG_SECURITY_NETWORK_XFRM is not set
@@ -1886,6 +1890,7 @@
CONFIG_SECURITY_ROOTPLUG=m
CONFIG_SECURITY_SECLVL=m
CONFIG_SECURITY_APPARMOR=m
+CONFIG_KEYS_COMPAT=y

#
# Cryptographic options
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/powerpc/ppc64 new/config/powerpc/ppc64
--- old/config/powerpc/ppc64 2006-08-22 00:09:23.000000000 +0200
+++ new/config/powerpc/ppc64 2006-08-28 20:03:29.000000000 +0200
@@ -937,6 +937,9 @@
CONFIG_CICADA_PHY=m
CONFIG_VITESSE_PHY=m
CONFIG_SMSC_PHY=m
+CONFIG_FIXED_PHY=m
+CONFIG_FIXED_MII_10_FDX=y
+CONFIG_FIXED_MII_100_FDX=y

#
# Ethernet (10 or 100Mbit)
@@ -2197,7 +2200,8 @@
#
# Security options
#
-# CONFIG_KEYS is not set
+CONFIG_KEYS=y
+CONFIG_KEYS_DEBUG_PROC_KEYS=y
CONFIG_SECURITY=y
CONFIG_SECURITY_NETWORK=y
# CONFIG_SECURITY_NETWORK_XFRM is not set
@@ -2206,6 +2210,7 @@
CONFIG_SECURITY_SECLVL=m
# CONFIG_SECURITY_SELINUX is not set
CONFIG_SECURITY_APPARMOR=m
+CONFIG_KEYS_COMPAT=y

#
# Cryptographic options
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/s390/default new/config/s390/default
--- old/config/s390/default 2006-08-17 14:51:44.000000000 +0200
+++ new/config/s390/default 2006-08-28 20:03:29.000000000 +0200
@@ -981,7 +981,8 @@
#
# Security options
#
-# CONFIG_KEYS is not set
+CONFIG_KEYS=y
+CONFIG_KEYS_DEBUG_PROC_KEYS=y
CONFIG_SECURITY=y
CONFIG_SECURITY_NETWORK=y
# CONFIG_SECURITY_NETWORK_XFRM is not set
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/s390/s390 new/config/s390/s390
--- old/config/s390/s390 2006-08-17 14:51:44.000000000 +0200
+++ new/config/s390/s390 2006-08-28 20:03:29.000000000 +0200
@@ -976,7 +976,8 @@
#
# Security options
#
-# CONFIG_KEYS is not set
+CONFIG_KEYS=y
+CONFIG_KEYS_DEBUG_PROC_KEYS=y
CONFIG_SECURITY=y
CONFIG_SECURITY_NETWORK=y
# CONFIG_SECURITY_NETWORK_XFRM is not set
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/x86_64/debug new/config/x86_64/debug
--- old/config/x86_64/debug 2006-08-22 00:09:23.000000000 +0200
+++ new/config/x86_64/debug 2006-08-28 20:03:29.000000000 +0200
@@ -1312,6 +1312,9 @@
CONFIG_CICADA_PHY=m
CONFIG_VITESSE_PHY=m
CONFIG_SMSC_PHY=m
+CONFIG_FIXED_PHY=m
+CONFIG_FIXED_MII_10_FDX=y
+CONFIG_FIXED_MII_100_FDX=y

#
# Ethernet (10 or 100Mbit)
@@ -1367,6 +1370,7 @@
# CONFIG_SUNDANCE_MMIO is not set
CONFIG_VIA_RHINE=m
# CONFIG_VIA_RHINE_MMIO is not set
+CONFIG_VIA_RHINE_NAPI=y
# CONFIG_NET_POCKET is not set

#
@@ -3142,7 +3146,8 @@
#
# Security options
#
-# CONFIG_KEYS is not set
+CONFIG_KEYS=y
+CONFIG_KEYS_DEBUG_PROC_KEYS=y
CONFIG_SECURITY=y
CONFIG_SECURITY_NETWORK=y
# CONFIG_SECURITY_NETWORK_XFRM is not set
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/x86_64/default new/config/x86_64/default
--- old/config/x86_64/default 2006-08-23 20:19:20.000000000 +0200
+++ new/config/x86_64/default 2006-08-28 20:03:29.000000000 +0200
@@ -1312,6 +1312,9 @@
CONFIG_CICADA_PHY=m
CONFIG_VITESSE_PHY=m
CONFIG_SMSC_PHY=m
+CONFIG_FIXED_PHY=m
+CONFIG_FIXED_MII_10_FDX=y
+CONFIG_FIXED_MII_100_FDX=y

#
# Ethernet (10 or 100Mbit)
@@ -1367,6 +1370,7 @@
# CONFIG_SUNDANCE_MMIO is not set
CONFIG_VIA_RHINE=m
# CONFIG_VIA_RHINE_MMIO is not set
+CONFIG_VIA_RHINE_NAPI=y
# CONFIG_NET_POCKET is not set

#
@@ -3140,7 +3144,8 @@
#
# Security options
#
-# CONFIG_KEYS is not set
+CONFIG_KEYS=y
+CONFIG_KEYS_DEBUG_PROC_KEYS=y
CONFIG_SECURITY=y
CONFIG_SECURITY_NETWORK=y
# CONFIG_SECURITY_NETWORK_XFRM is not set
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/x86_64/kdump new/config/x86_64/kdump
--- old/config/x86_64/kdump 2006-08-22 00:09:23.000000000 +0200
+++ new/config/x86_64/kdump 2006-08-28 20:03:29.000000000 +0200
@@ -1292,6 +1292,9 @@
CONFIG_CICADA_PHY=m
CONFIG_VITESSE_PHY=m
CONFIG_SMSC_PHY=m
+CONFIG_FIXED_PHY=m
+CONFIG_FIXED_MII_10_FDX=y
+CONFIG_FIXED_MII_100_FDX=y

#
# Ethernet (10 or 100Mbit)
@@ -1348,6 +1351,7 @@
# CONFIG_SUNDANCE_MMIO is not set
CONFIG_VIA_RHINE=m
# CONFIG_VIA_RHINE_MMIO is not set
+CONFIG_VIA_RHINE_NAPI=y
# CONFIG_NET_POCKET is not set

#
@@ -3154,7 +3158,8 @@
#
# Security options
#
-# CONFIG_KEYS is not set
+CONFIG_KEYS=y
+CONFIG_KEYS_DEBUG_PROC_KEYS=y
CONFIG_SECURITY=y
CONFIG_SECURITY_NETWORK=y
# CONFIG_SECURITY_NETWORK_XFRM is not set
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/x86_64/um new/config/x86_64/um
--- old/config/x86_64/um 2006-08-22 00:09:23.000000000 +0200
+++ new/config/x86_64/um 2006-08-28 20:03:29.000000000 +0200
@@ -975,7 +975,8 @@
#
# Security options
#
-# CONFIG_KEYS is not set
+CONFIG_KEYS=y
+CONFIG_KEYS_DEBUG_PROC_KEYS=y
CONFIG_SECURITY=y
CONFIG_SECURITY_NETWORK=y
# CONFIG_SECURITY_NETWORK_XFRM is not set
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/x86_64/xen new/config/x86_64/xen
--- old/config/x86_64/xen 2006-08-22 00:09:23.000000000 +0200
+++ new/config/x86_64/xen 2006-08-28 20:03:30.000000000 +0200
@@ -1251,6 +1251,9 @@
CONFIG_CICADA_PHY=m
CONFIG_VITESSE_PHY=m
CONFIG_SMSC_PHY=m
+CONFIG_FIXED_PHY=m
+CONFIG_FIXED_MII_10_FDX=y
+CONFIG_FIXED_MII_100_FDX=y

#
# Ethernet (10 or 100Mbit)
@@ -1306,6 +1309,7 @@
# CONFIG_SUNDANCE_MMIO is not set
CONFIG_VIA_RHINE=m
# CONFIG_VIA_RHINE_MMIO is not set
+CONFIG_VIA_RHINE_NAPI=y
# CONFIG_NET_POCKET is not set

#
@@ -3066,7 +3070,8 @@
#
# Security options
#
-# CONFIG_KEYS is not set
+CONFIG_KEYS=y
+CONFIG_KEYS_DEBUG_PROC_KEYS=y
CONFIG_SECURITY=y
CONFIG_SECURITY_NETWORK=y
# CONFIG_SECURITY_NETWORK_XFRM is not set









++++++ kabi.tar.bz2 ++++++
++++ 8050 lines of diff (skipped)




++++++ novell-kmp.tar.bz2 ++++++

++++++ patches.arch.tar.bz2 ++++++

++++++ patches.drivers.tar.bz2 ++++++

++++++ patches.fixes.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/cpuset-oom new/patches.fixes/cpuset-oom
--- old/patches.fixes/cpuset-oom 2006-08-17 14:51:45.000000000 +0200
+++ new/patches.fixes/cpuset-oom 1970-01-01 01:00:00.000000000 +0100
@@ -1,22 +0,0 @@
-From: npiggin@xxxxxxx
-Subject: fix oom interaction with cpuset_excl_nodes_overlap
-References: 184759
-Patch-mainline: obsolete
-
-cpuset_excl_nodes_overlap always returns 0 for exiting procs.
-This makes it impossible for the oom killer to properly kill them.
-The fix is to make it return 1 instead.
-
-Index: linux-2.6.16/kernel/cpuset.c
-===================================================================
---- linux-2.6.16.orig/kernel/cpuset.c
-+++ linux-2.6.16/kernel/cpuset.c
-@@ -2364,7 +2364,7 @@ EXPORT_SYMBOL_GPL(cpuset_mem_spread_node
- int cpuset_excl_nodes_overlap(const struct task_struct *p)
- {
- const struct cpuset *cs1, *cs2; /* my and p's cpuset ancestors */
-- int overlap = 0; /* do cpusets overlap? */
-+ int overlap = 1; /* do cpusets overlap? */
-
- task_lock(current);
- if (current->flags & PF_EXITING) {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/nf_bridge-header-size new/patches.fixes/nf_bridge-header-size
--- old/patches.fixes/nf_bridge-header-size 2006-08-17 14:51:45.000000000 +0200
+++ new/patches.fixes/nf_bridge-header-size 2006-08-28 20:03:30.000000000 +0200
@@ -14,24 +14,28 @@
skbuffs are allocated and the memory is managed.

---
- include/linux/netfilter_bridge.h | 2 +-
+ include/linux/netfilter_bridge.h | 4 ++--
net/bridge/br_netfilter.c | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
+ 2 files changed, 3 insertions(+), 3 deletions(-)

--- linux-2.6.17.orig/include/linux/netfilter_bridge.h
+++ linux-2.6.17/include/linux/netfilter_bridge.h
-@@ -57,7 +57,7 @@ void nf_bridge_maybe_copy_header(struct
+@@ -60,10 +60,10 @@ int nf_bridge_maybe_copy_header(struct s
memcpy(skb->data - 18, skb->nf_bridge->data, 18);
skb_push(skb, 4);
- } else
+ } else {
+- err = skb_cow(skb, 16);
++ err = skb_cow(skb, 14);
+ if (err)
+ return err;
- memcpy(skb->data - 16, skb->nf_bridge->data, 16);
+ memcpy(skb->data - 14, skb->nf_bridge->data, 14);
+ }
}
- }
-
+ return 0;
--- linux-2.6.17.orig/net/bridge/br_netfilter.c
+++ linux-2.6.17/net/bridge/br_netfilter.c
-@@ -124,7 +124,7 @@ static inline struct nf_bridge_info *nf_
+@@ -127,7 +127,7 @@ static inline struct nf_bridge_info *nf_

static inline void nf_bridge_save_header(struct sk_buff *skb)
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/smpalt-fixup new/patches.fixes/smpalt-fixup
--- old/patches.fixes/smpalt-fixup 1970-01-01 01:00:00.000000000 +0100
+++ new/patches.fixes/smpalt-fixup 2006-08-28 11:27:35.000000000 +0200
@@ -0,0 +1,88 @@
+Subject: fix up smp alternatives on x86-64
+References: 199984
+Patch-mainline: submitted 2006-08-28
+
+Don't use alternative_smp() in for __raw_spin_lock. gcc
+sometimes generates rip-relative addressing, so we can't
+simply copy the instruction to another place.
+
+Replace some leftover "lock;" with LOCK_PREFIX.
+
+Fillup space with 0x90 (nop) instead of 0x42, so
+"objdump -d -j .smp_altinstr_replacement vmlinux" gives more
+readable results.
+
+Signed-off-by: Gerd Hoffmann <kraxel@xxxxxxx>
+Index: linux-2.6.17/include/asm-i386/alternative.h
+===================================================================
+--- linux-2.6.17.orig/include/asm-i386/alternative.h 2006-08-28 10:21:18.000000000 +0200
++++ linux-2.6.17/include/asm-i386/alternative.h 2006-08-28 10:22:59.000000000 +0200
+@@ -122,7 +122,7 @@ static inline void alternatives_smp_swit
+ ".previous\n" \
+ ".section .smp_altinstr_replacement,\"awx\"\n" \
+ "663:\n\t" upinstr "\n" /* replacement */ \
+- "664:\n\t.fill 662b-661b,1,0x42\n" /* space for original */ \
++ "664:\n\t.fill 662b-661b,1,0x90\n" /* space for original */ \
+ ".previous" : args)
+
+ #define LOCK_PREFIX \
+Index: linux-2.6.17/include/asm-x86_64/alternative.h
+===================================================================
+--- linux-2.6.17.orig/include/asm-x86_64/alternative.h 2006-08-28 10:21:21.000000000 +0200
++++ linux-2.6.17/include/asm-x86_64/alternative.h 2006-08-28 10:23:13.000000000 +0200
+@@ -136,7 +136,7 @@ static inline void alternatives_smp_swit
+ ".previous\n" \
+ ".section .smp_altinstr_replacement,\"awx\"\n" \
+ "663:\n\t" upinstr "\n" /* replacement */ \
+- "664:\n\t.fill 662b-661b,1,0x42\n" /* space for original */ \
++ "664:\n\t.fill 662b-661b,1,0x90\n" /* space for original */ \
+ ".previous" : args)
+
+ #define LOCK_PREFIX \
+Index: linux-2.6.17/include/asm-x86_64/spinlock.h
+===================================================================
+--- linux-2.6.17.orig/include/asm-x86_64/spinlock.h 2006-08-28 10:21:21.000000000 +0200
++++ linux-2.6.17/include/asm-x86_64/spinlock.h 2006-08-28 11:07:14.000000000 +0200
+@@ -21,7 +21,7 @@
+
+ #define __raw_spin_lock_string \
+ "\n1:\t" \
+- "lock ; decl %0\n\t" \
++ LOCK_PREFIX "decl %0\n\t" \
+ "js 2f\n" \
+ LOCK_SECTION_START("") \
+ "2:\t" \
+@@ -40,10 +40,18 @@
+
+ static inline void __raw_spin_lock(raw_spinlock_t *lock)
+ {
++#if 0
++ /* gcc sometimes uses %(rip) addressing, so we can't
++ * simply move around instructions ... */
+ alternative_smp(
+ __raw_spin_lock_string,
+ __raw_spin_lock_string_up,
+ "=m" (lock->slock) : : "memory");
++#else
++ __asm__ __volatile__(
++ __raw_spin_lock_string
++ : "=m" (lock->slock) : : "memory");
++#endif
+ }
+
+ #define __raw_spin_lock_flags(lock, flags) __raw_spin_lock(lock)
+@@ -125,12 +133,12 @@ static inline int __raw_write_trylock(ra
+
+ static inline void __raw_read_unlock(raw_rwlock_t *rw)
+ {
+- asm volatile("lock ; incl %0" :"=m" (rw->lock) : : "memory");
++ asm volatile(LOCK_PREFIX "incl %0" :"=m" (rw->lock) : : "memory");
+ }
+
+ static inline void __raw_write_unlock(raw_rwlock_t *rw)
+ {
+- asm volatile("lock ; addl $" RW_LOCK_BIAS_STR ",%0"
++ asm volatile(LOCK_PREFIX "lock ; addl $" RW_LOCK_BIAS_STR ",%0"
+ : "=m" (rw->lock) : : "memory");
+ }
+

++++++ patches.kernel.org.tar.bz2 ++++++
++++ 44007 lines of diff (skipped)

++++++ patches.rpmify.tar.bz2 ++++++

++++++ patches.suse.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/lockd-file-list new/patches.suse/lockd-file-list
--- old/patches.suse/lockd-file-list 2006-08-17 14:51:51.000000000 +0200
+++ new/patches.suse/lockd-file-list 2006-08-28 20:03:30.000000000 +0200
@@ -13,10 +13,8 @@
include/linux/lockd/lockd.h | 3 +--
2 files changed, 17 insertions(+), 28 deletions(-)

-Index: build/fs/lockd/svcsubs.c
-===================================================================
---- build.orig/fs/lockd/svcsubs.c
-+++ build/fs/lockd/svcsubs.c
+--- linux-2.6.17.orig/fs/lockd/svcsubs.c
++++ linux-2.6.17/fs/lockd/svcsubs.c
@@ -25,9 +25,9 @@
/*
* Global file hash table
@@ -102,17 +100,17 @@
- struct nlm_file *file, **fp;
+ struct hlist_node *pos, *next;
+ struct nlm_file *file;
- int i;
+ int i, ret = 0;

mutex_lock(&nlm_file_mutex);
for (i = 0; i < FILE_NRHASH; i++) {
- fp = nlm_files + i;
- while ((file = *fp) != NULL) {
+ hlist_for_each_entry_safe(file, pos, next, &nlm_files[i], f_list) {
- /* Traverse locks, blocks and shares of this file
- * and update file->f_locks count */
- if (nlm_inspect_file(host, file, action)) {
-@@ -253,11 +245,9 @@ nlm_traverse_files(struct nlm_host *host
+ file->f_count++;
+ mutex_unlock(&nlm_file_mutex);
+
+@@ -256,11 +248,9 @@ nlm_traverse_files(struct nlm_host *host
/* No more references to this file. Let go of it. */
if (list_empty(&file->f_blocks) && !file->f_locks
&& !file->f_shares && !file->f_count) {
@@ -125,10 +123,8 @@
}
}
}
-Index: build/include/linux/lockd/lockd.h
-===================================================================
---- build.orig/include/linux/lockd/lockd.h
-+++ build/include/linux/lockd/lockd.h
+--- linux-2.6.17.orig/include/linux/lockd/lockd.h
++++ linux-2.6.17/include/linux/lockd/lockd.h
@@ -105,7 +105,7 @@ struct nlm_rqst {
* an NFS client.
*/
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/lockd-traverse-rewrite new/patches.suse/lockd-traverse-rewrite
--- old/patches.suse/lockd-traverse-rewrite 2006-08-17 14:51:51.000000000 +0200
+++ new/patches.suse/lockd-traverse-rewrite 2006-08-28 20:03:30.000000000 +0200
@@ -18,10 +18,8 @@
include/linux/lockd/share.h | 3 -
5 files changed, 104 insertions(+), 67 deletions(-)

-Index: build/include/linux/lockd/share.h
-===================================================================
---- build.orig/include/linux/lockd/share.h
-+++ build/include/linux/lockd/share.h
+--- linux-2.6.17.orig/include/linux/lockd/share.h
++++ linux-2.6.17/include/linux/lockd/share.h
@@ -25,6 +25,7 @@ u32 nlmsvc_share_file(struct nlm_host *,
struct nlm_args *);
u32 nlmsvc_unshare_file(struct nlm_host *, struct nlm_file *,
@@ -31,10 +29,8 @@
+ nlm_host_match_fn_t);

#endif /* LINUX_LOCKD_SHARE_H */
-Index: build/fs/lockd/svclock.c
-===================================================================
---- build.orig/fs/lockd/svclock.c
-+++ build/fs/lockd/svclock.c
+--- linux-2.6.17.orig/fs/lockd/svclock.c
++++ linux-2.6.17/fs/lockd/svclock.c
@@ -262,24 +262,30 @@ static void nlmsvc_release_block(struct
kref_put(&block->b_count, nlmsvc_free_block);
}
@@ -91,10 +87,8 @@
* Initialize arguments for GRANTED call. The nlm_rqst structure
* has been cleared already.
*/
-Index: build/fs/lockd/svcsubs.c
-===================================================================
---- build.orig/fs/lockd/svcsubs.c
-+++ build/fs/lockd/svcsubs.c
+--- linux-2.6.17.orig/fs/lockd/svcsubs.c
++++ linux-2.6.17/fs/lockd/svcsubs.c
@@ -165,7 +165,8 @@ nlm_delete_file(struct nlm_file *file)
* action.
*/
@@ -178,16 +172,16 @@
{
struct hlist_node *pos, *next;
struct nlm_file *file;
-@@ -237,7 +247,7 @@ nlm_traverse_files(struct nlm_host *host
- hlist_for_each_entry_safe(file, pos, next, &nlm_files[i], f_list) {
+@@ -240,7 +250,7 @@ nlm_traverse_files(struct nlm_host *host
+
/* Traverse locks, blocks and shares of this file
* and update file->f_locks count */
-- if (nlm_inspect_file(host, file, action)) {
-+ if (nlm_inspect_file(host, file, match)) {
- mutex_unlock(&nlm_file_mutex);
- return 1;
- }
-@@ -274,23 +284,54 @@ nlm_release_file(struct nlm_file *file)
+- if (nlm_inspect_file(host, file, action))
++ if (nlm_inspect_file(host, file, match))
+ ret = 1;
+
+ mutex_lock(&nlm_file_mutex);
+@@ -277,23 +287,54 @@ nlm_release_file(struct nlm_file *file)
mutex_lock(&nlm_file_mutex);

/* If there are no more locks etc, delete the file */
@@ -248,7 +242,7 @@
}

/*
-@@ -301,7 +342,7 @@ nlmsvc_free_host_resources(struct nlm_ho
+@@ -304,7 +345,7 @@ nlmsvc_free_host_resources(struct nlm_ho
{
dprintk("lockd: nlmsvc_free_host_resources\n");

@@ -257,7 +251,7 @@
printk(KERN_WARNING
"lockd: couldn't remove all locks held by %s\n",
host->h_name);
-@@ -316,8 +357,15 @@ void
+@@ -319,8 +360,15 @@ void
nlmsvc_invalidate_all(void)
{
struct nlm_host *host;
@@ -274,11 +268,9 @@
host->h_expires = 0;
host->h_killed = 1;
nlm_release_host(host);
-Index: build/include/linux/lockd/lockd.h
-===================================================================
---- build.orig/include/linux/lockd/lockd.h
-+++ build/include/linux/lockd/lockd.h
-@@ -135,13 +135,6 @@ struct nlm_block {
+--- linux-2.6.17.orig/include/linux/lockd/lockd.h
++++ linux-2.6.17/include/linux/lockd/lockd.h
+@@ -134,13 +134,6 @@ struct nlm_block {
};

/*
@@ -292,7 +284,7 @@
* Global variables
*/
extern struct rpc_program nlm_program;
-@@ -185,6 +178,12 @@ void nsm_release(struct nsm_handle *)
+@@ -184,6 +177,12 @@ void nsm_release(struct nsm_handle *)


/*
@@ -305,7 +297,7 @@
* Server-side lock handling
*/
u32 nlmsvc_lock(struct svc_rqst *, struct nlm_file *,
-@@ -195,7 +194,7 @@ u32 nlmsvc_testlock(struct nlm_file *
+@@ -194,7 +193,7 @@ u32 nlmsvc_testlock(struct nlm_file *
u32 nlmsvc_cancel_blocked(struct nlm_file *, struct nlm_lock *);
unsigned long nlmsvc_retry_blocked(void);
void nlmsvc_traverse_blocks(struct nlm_host *, struct nlm_file *,
@@ -314,10 +306,8 @@
void nlmsvc_grant_reply(struct svc_rqst *, struct nlm_cookie *, u32);

/*
-Index: build/fs/lockd/svcshare.c
-===================================================================
---- build.orig/fs/lockd/svcshare.c
-+++ build/fs/lockd/svcshare.c
+--- linux-2.6.17.orig/fs/lockd/svcshare.c
++++ linux-2.6.17/fs/lockd/svcshare.c
@@ -85,24 +85,20 @@ nlmsvc_unshare_file(struct nlm_host *hos
}

diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/mv643xx_eth.hwinfo.patch new/patches.suse/mv643xx_eth.hwinfo.patch
--- old/patches.suse/mv643xx_eth.hwinfo.patch 1970-01-01 01:00:00.000000000 +0100
+++ new/patches.suse/mv643xx_eth.hwinfo.patch 2006-08-28 13:47:00.000000000 +0200
@@ -0,0 +1,57 @@
+Subject: [patch 18/43] mv643xx_eth_pcidev: implement hotplug for the marvell gige functionality by probing the northbridge pci id
+From: Sven Luther <sl@xxxxxxxxxxxxx>
+Patch-mainline: never
+
+Bug 117053 - add mv643xx_eth detection
+Bug 199112 - mv643xx_eth is not found on Pegasos (again...)
+
+Add Marvell gigabit ethernet hotplug through the northbridge pci id support
+for the Pegasos machines.
+
+This patch is not optimal, as the proper way to handling this is to bring
+full hotplug support to the platform drivers, but this would be much more
+invasive and far reaching a project. This approach matches the marvell
+discovery northbridge pci id to load the driver for the builtin gigabit
+ethernet function, and is similar of what is done already using the
+discover module loading technique. With more and more distributions moving
+to using hotplug only to probe for modules to load, this patch becomes
+necessary.
+
+
+Not political correct, but we need it anyway because there is no hwinfo support for platform devices.
+
+
+Signed-off-by: Olaf Hering <olh@xxxxxxx>
+
+---
+ drivers/net/mv643xx_eth.c | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+Index: linux-2.6.17/drivers/net/mv643xx_eth.c
+===================================================================
+--- linux-2.6.17.orig/drivers/net/mv643xx_eth.c
++++ linux-2.6.17/drivers/net/mv643xx_eth.c
+@@ -37,6 +37,9 @@
+ #include <linux/tcp.h>
+ #include <linux/udp.h>
+ #include <linux/etherdevice.h>
++#ifdef CONFIG_PPC_CHRP
++#include <linux/pci.h>
++#endif
+
+ #include <linux/bitops.h>
+ #include <linux/delay.h>
+@@ -1561,6 +1564,13 @@ MODULE_AUTHOR( "Rabeeh Khoury, Assaf Hof
+ " and Dale Farnsworth");
+ MODULE_DESCRIPTION("Ethernet driver for Marvell MV643XX");
+
++#ifdef CONFIG_PPC_CHRP
++static struct pci_device_id pci_marvell_mv64360[] = {
++ { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, PCI_DEVICE_ID_MARVELL_MV64360) },
++ {}
++};
++MODULE_DEVICE_TABLE(pci, pci_marvell_mv64360);
++#endif
+ /*
+ * The second part is the low level driver of the gigE ethernet ports.
+ */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/scsi-error-test-unit-ready-timeout new/patches.suse/scsi-error-test-unit-ready-timeout
--- old/patches.suse/scsi-error-test-unit-ready-timeout 2006-08-17 14:51:51.000000000 +0200
+++ new/patches.suse/scsi-error-test-unit-ready-timeout 2006-08-28 20:03:31.000000000 +0200
@@ -10,8 +10,8 @@
Signed-off-by: Kurt Garloff <garloff@xxxxxxx>

---
- drivers/scsi/scsi_error.c | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+ drivers/scsi/scsi_error.c | 3 ++-
+ 1 files changed, 2 insertions(+), 1 deletion(-)

--- linux-2.6.17.orig/drivers/scsi/scsi_error.c
+++ linux-2.6.17/drivers/scsi/scsi_error.c
@@ -23,13 +23,12 @@

/*
* These should *probably* be handled by the host itself.
-@@ -738,8 +739,7 @@ static int scsi_eh_tur(struct scsi_cmnd
- retry_tur:
- memcpy(scmd->cmnd, tur_command, sizeof(tur_command));
+@@ -739,7 +740,7 @@ static int scsi_eh_tur(struct scsi_cmnd
+ int retry_cnt = 1, rtn;

--
-- rtn = scsi_send_eh_cmnd(scmd, SENSE_TIMEOUT, 0);
-+ rtn = scsi_send_eh_cmnd(scmd, TEST_UNIT_READY_TIMEOUT, 0);
+ retry_tur:
+- rtn = scsi_send_eh_cmnd(scmd, tur_command, 6, SENSE_TIMEOUT, 0);
++ rtn = scsi_send_eh_cmnd(scmd, tur_command, 6, TEST_UNIT_READY_TIMEOUT, 0);

SCSI_LOG_ERROR_RECOVERY(3, printk("%s: scmd %p rtn %x\n",
__FUNCTION__, scmd, rtn));
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/suse-ppc-legacy-io.patch new/patches.suse/suse-ppc-legacy-io.patch
--- old/patches.suse/suse-ppc-legacy-io.patch 2006-08-17 14:51:51.000000000 +0200
+++ new/patches.suse/suse-ppc-legacy-io.patch 2006-08-28 20:03:31.000000000 +0200
@@ -31,7 +31,7 @@

--- linux-2.6.17.orig/arch/powerpc/platforms/powermac/pci.c
+++ linux-2.6.17/arch/powerpc/platforms/powermac/pci.c
-@@ -985,10 +985,29 @@ static int __init add_bridge(struct devi
+@@ -985,10 +985,31 @@ static int __init add_bridge(struct devi
return 0;
}

@@ -56,7 +56,9 @@
+#if defined(CONFIG_SERIAL_8250) && defined(CONFIG_SERIAL_PMACZILOG)
+ do_not_try_pc_legacy_8250 = 1;
+#endif
++#ifdef CONFIG_PPC32
+ request_region(0x0UL, 0x10000UL, "reserved legacy io");
++#endif
+
for_each_pci_dev(dev) {
/* Read interrupt from the device-tree */

++++++ patches.uml.tar.bz2 ++++++

++++++ patches.xen.tar.bz2 ++++++





++++++ series.conf ++++++
--- kernel-source/series.conf 2006-08-23 20:41:56.000000000 +0200
+++ kernel-source/series.conf 2006-08-28 22:45:29.000000000 +0200
@@ -24,7 +24,7 @@
patches.kernel.org/patch-2.6.18-rc1-rc2
patches.kernel.org/patch-2.6.18-rc2-rc3
patches.kernel.org/patch-2.6.18-rc3-rc4
- patches.kernel.org/patch-2.6.18-rc4-git1
+ patches.kernel.org/patch-2.6.18-rc4-rc5

patches.fixes/setuid-dumpable-wrongdir
# patches.fixes/kbuild-fix-external-module
@@ -78,6 +78,7 @@
# suse ppc
patches.suse/suse-ppc-legacy-io.patch
patches.arch/ppc-tumbler-active_state.patch
+ patches.suse/mv643xx_eth.hwinfo.patch
patches.suse/suse-ppc-pmac_zilog.USE_CTRL_O_SYSRQ.patch
patches.suse/suse-ppc32-mol.patch
patches.suse/suse-ppc32-mol-kbuild.patch
@@ -445,10 +446,10 @@
patches.suse/bh-cache-option
patches.suse/sysctl-add-affinity_load_balancing
patches.fixes/nfsv4-setclientid
- patches.fixes/cpuset-oom

patches.fixes/ipmi-unload-crash
patches.fixes/loop-barriers
+ patches.fixes/smpalt-fixup

# PLEASE KEEP THESE PATCHES AT THE END OF series.conf
# (as all other arch specific patches should be kept at the end




++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >