Hello community,
here is the log from the commit of package kernel-source
checked in at Mon Oct 16 19:43:00 CEST 2006.
--------
--- kernel-source/kernel-bigsmp.changes 2006-10-11 14:47:35.000000000 +0200
+++ kernel-source/kernel-bigsmp.changes 2006-10-16 17:56:31.000000000 +0200
@@ -1,0 +2,36 @@
+Mon Oct 16 16:17:49 CEST 2006 - gregkh@suse.de
+
+- update to 2.6.18.1 release
+
+-------------------------------------------------------------------
+Sun Oct 15 20:57:34 CEST 2006 - jeffm@suse.de
+
+- Update config files: MBCACHE wants to be modular if ext2 and ext3
+ are.
+
+-------------------------------------------------------------------
+Sun Oct 15 17:39:59 CEST 2006 - agruen@suse.de
+
+- Modularize the ext2 filesystem (CONFIG_EXT2_FS=m).
+- patches.suse/ext3-register-filesystem-lifo: Obsolete with
+ modular ext2.
+
+-------------------------------------------------------------------
+Fri Oct 13 20:25:39 CEST 2006 - olh@suse.de
+
+- add patches.arch/ppc-os-term-panic_timeout.patch
+ reboot when panic_timout is set
+
+-------------------------------------------------------------------
+Fri Oct 13 20:20:08 CEST 2006 - olh@suse.de
+
+- add patches.arch/ppc-via-pmu-acpower.patch
+ force AC power when booting without a battery
+
+-------------------------------------------------------------------
+Thu Oct 12 22:06:01 CEST 2006 - jeffm@suse.de
+
+- patches.fixes/grow_buffers-infinite-loop-fix.diff: grow_buffers()
+ infinite loop fix (205384).
+
+-------------------------------------------------------------------
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.us3C6h/_old 2006-10-16 19:25:38.000000000 +0200
+++ /var/tmp/diff_new_pack.us3C6h/_new 2006-10-16 19:25:38.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-bigsmp (Version 2.6.18)
+# spec file for package kernel-bigsmp (Version 2.6.18.1)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -22,8 +22,8 @@
# arch/ia64/scripts/unwcheck.py
BuildRequires: python
%endif
-Version: 2.6.18
-Release: 13
+Version: 2.6.18.1
+Release: 1
Summary: Kernel with PAE Support
License: GPL
Group: System/Kernel
@@ -31,7 +31,7 @@
#Conflicts: kernel
%else
%if !%build_xen
-Provides: kernel = 2.6.18-%dummy_release
+Provides: kernel = 2.6.18.1-%dummy_release
%endif
%endif
Provides: kernel-bigsmp-nongpl
@@ -117,12 +117,12 @@
-Source Timestamp: 2006/10/10 13:26:35 UTC
+Source Timestamp: 2006/10/16 15:31:08 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.18.tar.bz2 ]; then
- echo "The kernel-bigsmp-2.6.18.nosrc.rpm package does not contain the" \
- "complete sources. Please install kernel-source-2.6.18.src.rpm."
+ echo "The kernel-bigsmp-2.6.18.1.nosrc.rpm package does not contain the" \
+ "complete sources. Please install kernel-source-2.6.18.1.src.rpm."
exit 1
fi
symbols=$(
@@ -463,6 +463,24 @@
%files -f kernel.files
%changelog -n kernel-bigsmp
+* Mon Oct 16 2006 - gregkh@suse.de
+- update to 2.6.18.1 release
+* Sun Oct 15 2006 - jeffm@suse.de
+- Update config files: MBCACHE wants to be modular if ext2 and ext3
+ are.
+* Sun Oct 15 2006 - agruen@suse.de
+- Modularize the ext2 filesystem (CONFIG_EXT2_FS=m).
+- patches.suse/ext3-register-filesystem-lifo: Obsolete with
+ modular ext2.
+* Fri Oct 13 2006 - olh@suse.de
+- add patches.arch/ppc-os-term-panic_timeout.patch
+ reboot when panic_timout is set
+* Fri Oct 13 2006 - olh@suse.de
+- add patches.arch/ppc-via-pmu-acpower.patch
+ force AC power when booting without a battery
+* Thu Oct 12 2006 - jeffm@suse.de
+- patches.fixes/grow_buffers-infinite-loop-fix.diff: grow_buffers()
+ infinite loop fix (205384).
* Tue Oct 10 2006 - kraxel@suse.de
- patches.uml/uml-needs-_syscall0: Fix uml build with 2.6.18+
kernel headers.
kernel-debug.spec: same change
kernel-default.spec: same change
++++++ kernel-dummy.spec ++++++
--- /var/tmp/diff_new_pack.us3C6h/_old 2006-10-16 19:25:38.000000000 +0200
+++ /var/tmp/diff_new_pack.us3C6h/_new 2006-10-16 19:25:38.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-dummy (Version 2.6.18)
+# spec file for package kernel-dummy (Version 2.6.18.1)
#
# 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
-Release: 12
+Version: 2.6.18.1
+Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -27,7 +27,7 @@
--------
Andreas Gruenbacher
-Source Timestamp: 2006/10/10 13:26:35 UTC
+Source Timestamp: 2006/10/16 15:31:08 UTC
%install
@@ -40,6 +40,24 @@
/etc/dummy
%changelog -n kernel-dummy
+* Mon Oct 16 2006 - gregkh@suse.de
+- update to 2.6.18.1 release
+* Sun Oct 15 2006 - jeffm@suse.de
+- Update config files: MBCACHE wants to be modular if ext2 and ext3
+ are.
+* Sun Oct 15 2006 - agruen@suse.de
+- Modularize the ext2 filesystem (CONFIG_EXT2_FS=m).
+- patches.suse/ext3-register-filesystem-lifo: Obsolete with
+ modular ext2.
+* Fri Oct 13 2006 - olh@suse.de
+- add patches.arch/ppc-os-term-panic_timeout.patch
+ reboot when panic_timout is set
+* Fri Oct 13 2006 - olh@suse.de
+- add patches.arch/ppc-via-pmu-acpower.patch
+ force AC power when booting without a battery
+* Thu Oct 12 2006 - jeffm@suse.de
+- patches.fixes/grow_buffers-infinite-loop-fix.diff: grow_buffers()
+ infinite loop fix (205384).
* Tue Oct 10 2006 - kraxel@suse.de
- patches.uml/uml-needs-_syscall0: Fix uml build with 2.6.18+
kernel headers.
++++++ kernel-iseries64.spec ++++++
--- /var/tmp/diff_new_pack.us3C6h/_old 2006-10-16 19:25:38.000000000 +0200
+++ /var/tmp/diff_new_pack.us3C6h/_new 2006-10-16 19:25:38.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-iseries64 (Version 2.6.18)
+# spec file for package kernel-iseries64 (Version 2.6.18.1)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -22,8 +22,8 @@
# arch/ia64/scripts/unwcheck.py
BuildRequires: python
%endif
-Version: 2.6.18
-Release: 12
+Version: 2.6.18.1
+Release: 1
Summary: 64-Bit Kernel for iSeries
License: GPL
Group: System/Kernel
@@ -31,7 +31,7 @@
#Conflicts: kernel
%else
%if !%build_xen
-Provides: kernel = 2.6.18-%dummy_release
+Provides: kernel = 2.6.18.1-%dummy_release
%endif
%endif
Provides: kernel-iseries64-nongpl
@@ -118,12 +118,12 @@
-Source Timestamp: 2006/10/10 13:26:35 UTC
+Source Timestamp: 2006/10/16 15:31:08 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.18.tar.bz2 ]; then
- echo "The kernel-iseries64-2.6.18.nosrc.rpm package does not contain the" \
- "complete sources. Please install kernel-source-2.6.18.src.rpm."
+ echo "The kernel-iseries64-2.6.18.1.nosrc.rpm package does not contain the" \
+ "complete sources. Please install kernel-source-2.6.18.1.src.rpm."
exit 1
fi
symbols=$(
@@ -464,6 +464,24 @@
%files -f kernel.files
%changelog -n kernel-iseries64
+* Mon Oct 16 2006 - gregkh@suse.de
+- update to 2.6.18.1 release
+* Sun Oct 15 2006 - jeffm@suse.de
+- Update config files: MBCACHE wants to be modular if ext2 and ext3
+ are.
+* Sun Oct 15 2006 - agruen@suse.de
+- Modularize the ext2 filesystem (CONFIG_EXT2_FS=m).
+- patches.suse/ext3-register-filesystem-lifo: Obsolete with
+ modular ext2.
+* Fri Oct 13 2006 - olh@suse.de
+- add patches.arch/ppc-os-term-panic_timeout.patch
+ reboot when panic_timout is set
+* Fri Oct 13 2006 - olh@suse.de
+- add patches.arch/ppc-via-pmu-acpower.patch
+ force AC power when booting without a battery
+* Thu Oct 12 2006 - jeffm@suse.de
+- patches.fixes/grow_buffers-infinite-loop-fix.diff: grow_buffers()
+ infinite loop fix (205384).
* Tue Oct 10 2006 - kraxel@suse.de
- patches.uml/uml-needs-_syscall0: Fix uml build with 2.6.18+
kernel headers.
++++++ kernel-kdump.spec ++++++
--- /var/tmp/diff_new_pack.us3C6h/_old 2006-10-16 19:25:38.000000000 +0200
+++ /var/tmp/diff_new_pack.us3C6h/_new 2006-10-16 19:25:38.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-kdump (Version 2.6.18)
+# spec file for package kernel-kdump (Version 2.6.18.1)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -22,8 +22,8 @@
# arch/ia64/scripts/unwcheck.py
BuildRequires: python
%endif
-Version: 2.6.18
-Release: 13
+Version: 2.6.18.1
+Release: 1
Summary: kernel for kdump
License: GPL
Group: System/Kernel
@@ -31,7 +31,7 @@
#Conflicts: kernel
%else
%if !%build_xen
-Provides: kernel = 2.6.18-%dummy_release
+Provides: kernel = 2.6.18.1-%dummy_release
%endif
%endif
Provides: kernel-kdump-nongpl
@@ -127,12 +127,12 @@
-Source Timestamp: 2006/10/10 13:26:35 UTC
+Source Timestamp: 2006/10/16 15:31:08 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.18.tar.bz2 ]; then
- echo "The kernel-kdump-2.6.18.nosrc.rpm package does not contain the" \
- "complete sources. Please install kernel-source-2.6.18.src.rpm."
+ echo "The kernel-kdump-2.6.18.1.nosrc.rpm package does not contain the" \
+ "complete sources. Please install kernel-source-2.6.18.1.src.rpm."
exit 1
fi
symbols=$(
@@ -473,6 +473,24 @@
%files -f kernel.files
%changelog -n kernel-kdump
+* Mon Oct 16 2006 - gregkh@suse.de
+- update to 2.6.18.1 release
+* Sun Oct 15 2006 - jeffm@suse.de
+- Update config files: MBCACHE wants to be modular if ext2 and ext3
+ are.
+* Sun Oct 15 2006 - agruen@suse.de
+- Modularize the ext2 filesystem (CONFIG_EXT2_FS=m).
+- patches.suse/ext3-register-filesystem-lifo: Obsolete with
+ modular ext2.
+* Fri Oct 13 2006 - olh@suse.de
+- add patches.arch/ppc-os-term-panic_timeout.patch
+ reboot when panic_timout is set
+* Fri Oct 13 2006 - olh@suse.de
+- add patches.arch/ppc-via-pmu-acpower.patch
+ force AC power when booting without a battery
+* Thu Oct 12 2006 - jeffm@suse.de
+- patches.fixes/grow_buffers-infinite-loop-fix.diff: grow_buffers()
+ infinite loop fix (205384).
* Tue Oct 10 2006 - kraxel@suse.de
- patches.uml/uml-needs-_syscall0: Fix uml build with 2.6.18+
kernel headers.
++++++ kernel-ppc64.spec ++++++
--- /var/tmp/diff_new_pack.us3C6h/_old 2006-10-16 19:25:38.000000000 +0200
+++ /var/tmp/diff_new_pack.us3C6h/_new 2006-10-16 19:25:38.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-ppc64 (Version 2.6.18)
+# spec file for package kernel-ppc64 (Version 2.6.18.1)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -21,8 +21,8 @@
# arch/ia64/scripts/unwcheck.py
BuildRequires: python
%endif
-Version: 2.6.18
-Release: 12
+Version: 2.6.18.1
+Release: 1
Summary: Kernel for ppc64 Systems
License: GPL, LGPL
Group: System/Kernel
@@ -30,7 +30,7 @@
#Conflicts: kernel
%else
%if !%build_xen
-Provides: kernel = 2.6.18-%dummy_release
+Provides: kernel = 2.6.18.1-%dummy_release
%endif
%endif
Provides: kernel-ppc64-nongpl
@@ -132,12 +132,12 @@
Tom Gall
see /usr/src/linux-pmac-benh/CREDITS for more details.
-Source Timestamp: 2006/10/10 13:26:35 UTC
+Source Timestamp: 2006/10/16 15:31:08 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.18.tar.bz2 ]; then
- echo "The kernel-ppc64-2.6.18.nosrc.rpm package does not contain the" \
- "complete sources. Please install kernel-source-2.6.18.src.rpm."
+ echo "The kernel-ppc64-2.6.18.1.nosrc.rpm package does not contain the" \
+ "complete sources. Please install kernel-source-2.6.18.1.src.rpm."
exit 1
fi
symbols=$(
@@ -478,6 +478,24 @@
%files -f kernel.files
%changelog -n kernel-ppc64
+* Mon Oct 16 2006 - gregkh@suse.de
+- update to 2.6.18.1 release
+* Sun Oct 15 2006 - jeffm@suse.de
+- Update config files: MBCACHE wants to be modular if ext2 and ext3
+ are.
+* Sun Oct 15 2006 - agruen@suse.de
+- Modularize the ext2 filesystem (CONFIG_EXT2_FS=m).
+- patches.suse/ext3-register-filesystem-lifo: Obsolete with
+ modular ext2.
+* Fri Oct 13 2006 - olh@suse.de
+- add patches.arch/ppc-os-term-panic_timeout.patch
+ reboot when panic_timout is set
+* Fri Oct 13 2006 - olh@suse.de
+- add patches.arch/ppc-via-pmu-acpower.patch
+ force AC power when booting without a battery
+* Thu Oct 12 2006 - jeffm@suse.de
+- patches.fixes/grow_buffers-infinite-loop-fix.diff: grow_buffers()
+ infinite loop fix (205384).
* Tue Oct 10 2006 - kraxel@suse.de
- patches.uml/uml-needs-_syscall0: Fix uml build with 2.6.18+
kernel headers.
++++++ kernel-s390.spec ++++++
--- /var/tmp/diff_new_pack.us3C6h/_old 2006-10-16 19:25:38.000000000 +0200
+++ /var/tmp/diff_new_pack.us3C6h/_new 2006-10-16 19:25:38.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-s390 (Version 2.6.18)
+# spec file for package kernel-s390 (Version 2.6.18.1)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -22,8 +22,8 @@
# arch/ia64/scripts/unwcheck.py
BuildRequires: python
%endif
-Version: 2.6.18
-Release: 11
+Version: 2.6.18.1
+Release: 1
Summary: The Standard Kernel
License: GPL
Group: System/Kernel
@@ -31,7 +31,7 @@
#Conflicts: kernel
%else
%if !%build_xen
-Provides: kernel = 2.6.18-%dummy_release
+Provides: kernel = 2.6.18.1-%dummy_release
%endif
%endif
Provides: kernel-s390-nongpl
@@ -115,12 +115,12 @@
-Source Timestamp: 2006/10/10 13:26:35 UTC
+Source Timestamp: 2006/10/16 15:31:08 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.18.tar.bz2 ]; then
- echo "The kernel-s390-2.6.18.nosrc.rpm package does not contain the" \
- "complete sources. Please install kernel-source-2.6.18.src.rpm."
+ echo "The kernel-s390-2.6.18.1.nosrc.rpm package does not contain the" \
+ "complete sources. Please install kernel-source-2.6.18.1.src.rpm."
exit 1
fi
symbols=$(
@@ -461,6 +461,24 @@
%files -f kernel.files
%changelog -n kernel-s390
+* Mon Oct 16 2006 - gregkh@suse.de
+- update to 2.6.18.1 release
+* Sun Oct 15 2006 - jeffm@suse.de
+- Update config files: MBCACHE wants to be modular if ext2 and ext3
+ are.
+* Sun Oct 15 2006 - agruen@suse.de
+- Modularize the ext2 filesystem (CONFIG_EXT2_FS=m).
+- patches.suse/ext3-register-filesystem-lifo: Obsolete with
+ modular ext2.
+* Fri Oct 13 2006 - olh@suse.de
+- add patches.arch/ppc-os-term-panic_timeout.patch
+ reboot when panic_timout is set
+* Fri Oct 13 2006 - olh@suse.de
+- add patches.arch/ppc-via-pmu-acpower.patch
+ force AC power when booting without a battery
+* Thu Oct 12 2006 - jeffm@suse.de
+- patches.fixes/grow_buffers-infinite-loop-fix.diff: grow_buffers()
+ infinite loop fix (205384).
* Tue Oct 10 2006 - kraxel@suse.de
- patches.uml/uml-needs-_syscall0: Fix uml build with 2.6.18+
kernel headers.
++++++ kernel-source.spec ++++++
--- /var/tmp/diff_new_pack.us3C6h/_old 2006-10-16 19:25:38.000000000 +0200
+++ /var/tmp/diff_new_pack.us3C6h/_new 2006-10-16 19:25:38.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-source (Version 2.6.18)
+# spec file for package kernel-source (Version 2.6.18.1)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -25,8 +25,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
-Release: 13
+Version: 2.6.18.1
+Release: 1
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/10 13:26:35 UTC
+Source Timestamp: 2006/10/16 15:31:08 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.18.tar.bz2 ]; then
@@ -117,16 +117,16 @@
# Apply the patches needed for this architecture.
%_sourcedir/guards %symbols < %_sourcedir/series.conf \
- > %_builddir/kernel-source-2.6.18/kernel-source.patches
-for patch in $(< %_builddir/kernel-source-2.6.18/kernel-source.patches); do
- if ! patch -s -E -p1 --no-backup-if-mismatch -i %_builddir/kernel-source-2.6.18/$patch; then
+ > %_builddir/kernel-source-2.6.18.1/kernel-source.patches
+for patch in $(< %_builddir/kernel-source-2.6.18.1/kernel-source.patches); do
+ if ! patch -s -E -p1 --no-backup-if-mismatch -i %_builddir/kernel-source-2.6.18.1/$patch; then
echo "*** Patch $patch failed ***"
exit 1
fi
done
-%_sourcedir/install-configs %_sourcedir %_builddir/kernel-source-2.6.18 %dummy_release
-KERNELRELEASE=2.6.18-%dummy_release
+%_sourcedir/install-configs %_sourcedir %_builddir/kernel-source-2.6.18.1 %dummy_release
+KERNELRELEASE=2.6.18.1-%dummy_release
cat > %_builddir/%{name}-%{version}/.rpm-defs < %_builddir/kernel-source-2.6.18/kernel-$flavor.patches
- diff -q %_builddir/kernel-source-2.6.18/kernel-{source,$flavor}.patches \
+ > %_builddir/kernel-source-2.6.18.1/kernel-$flavor.patches
+ diff -q %_builddir/kernel-source-2.6.18.1/kernel-{source,$flavor}.patches \
|| continue
o=$RPM_BUILD_ROOT/usr/src/linux-$KERNELRELEASE-obj/$arch/$flavor
mkdir -p $o
@@ -276,6 +276,24 @@
%files -f kernel-source.files
%changelog -n kernel-source
+* Mon Oct 16 2006 - gregkh@suse.de
+- update to 2.6.18.1 release
+* Sun Oct 15 2006 - jeffm@suse.de
+- Update config files: MBCACHE wants to be modular if ext2 and ext3
+ are.
+* Sun Oct 15 2006 - agruen@suse.de
+- Modularize the ext2 filesystem (CONFIG_EXT2_FS=m).
+- patches.suse/ext3-register-filesystem-lifo: Obsolete with
+ modular ext2.
+* Fri Oct 13 2006 - olh@suse.de
+- add patches.arch/ppc-os-term-panic_timeout.patch
+ reboot when panic_timout is set
+* Fri Oct 13 2006 - olh@suse.de
+- add patches.arch/ppc-via-pmu-acpower.patch
+ force AC power when booting without a battery
+* Thu Oct 12 2006 - jeffm@suse.de
+- patches.fixes/grow_buffers-infinite-loop-fix.diff: grow_buffers()
+ infinite loop fix (205384).
* Tue Oct 10 2006 - kraxel@suse.de
- patches.uml/uml-needs-_syscall0: Fix uml build with 2.6.18+
kernel headers.
++++++ kernel-syms.spec ++++++
--- /var/tmp/diff_new_pack.us3C6h/_old 2006-10-16 19:25:39.000000000 +0200
+++ /var/tmp/diff_new_pack.us3C6h/_new 2006-10-16 19:25:39.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-syms (Version 2.6.18)
+# spec file for package kernel-syms (Version 2.6.18.1)
#
# 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
-Release: 13
+Version: 2.6.18.1
+Release: 1
Requires: linux
-Requires: kernel-source = 2.6.18-%release
+Requires: kernel-source = 2.6.18.1-%release
Source11: arch-symbols
Source12: guards
Source21: config.conf
@@ -84,7 +84,7 @@
see /usr/src/linux/CREDITS for more details.
-Source Timestamp: 2006/10/10 13:26:35 UTC
+Source Timestamp: 2006/10/16 15:31:08 UTC
%install
@@ -127,6 +127,24 @@
/boot/symsets-*-*.tar.gz
%changelog -n kernel-syms
+* Mon Oct 16 2006 - gregkh@suse.de
+- update to 2.6.18.1 release
+* Sun Oct 15 2006 - jeffm@suse.de
+- Update config files: MBCACHE wants to be modular if ext2 and ext3
+ are.
+* Sun Oct 15 2006 - agruen@suse.de
+- Modularize the ext2 filesystem (CONFIG_EXT2_FS=m).
+- patches.suse/ext3-register-filesystem-lifo: Obsolete with
+ modular ext2.
+* Fri Oct 13 2006 - olh@suse.de
+- add patches.arch/ppc-os-term-panic_timeout.patch
+ reboot when panic_timout is set
+* Fri Oct 13 2006 - olh@suse.de
+- add patches.arch/ppc-via-pmu-acpower.patch
+ force AC power when booting without a battery
+* Thu Oct 12 2006 - jeffm@suse.de
+- patches.fixes/grow_buffers-infinite-loop-fix.diff: grow_buffers()
+ infinite loop fix (205384).
* Tue Oct 10 2006 - kraxel@suse.de
- patches.uml/uml-needs-_syscall0: Fix uml build with 2.6.18+
kernel headers.
++++++ kernel-um.spec ++++++
--- /var/tmp/diff_new_pack.us3C6h/_old 2006-10-16 19:25:39.000000000 +0200
+++ /var/tmp/diff_new_pack.us3C6h/_new 2006-10-16 19:25:39.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-um (Version 2.6.18)
+# spec file for package kernel-um (Version 2.6.18.1)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -22,8 +22,8 @@
# arch/ia64/scripts/unwcheck.py
BuildRequires: python
%endif
-Version: 2.6.18
-Release: 13
+Version: 2.6.18.1
+Release: 1
Summary: The User Mode Linux kernel.
License: GPL
Group: System/Kernel
@@ -31,7 +31,7 @@
#Conflicts: kernel
%else
%if !%build_xen
-Provides: kernel = 2.6.18-%dummy_release
+Provides: kernel = 2.6.18.1-%dummy_release
%endif
%endif
Provides: kernel-um-nongpl
@@ -123,12 +123,12 @@
-Source Timestamp: 2006/10/10 13:26:35 UTC
+Source Timestamp: 2006/10/16 15:31:08 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.18.tar.bz2 ]; then
- echo "The kernel-um-2.6.18.nosrc.rpm package does not contain the" \
- "complete sources. Please install kernel-source-2.6.18.src.rpm."
+ echo "The kernel-um-2.6.18.1.nosrc.rpm package does not contain the" \
+ "complete sources. Please install kernel-source-2.6.18.1.src.rpm."
exit 1
fi
symbols=$(
@@ -469,6 +469,24 @@
%files -f kernel.files
%changelog -n kernel-um
+* Mon Oct 16 2006 - gregkh@suse.de
+- update to 2.6.18.1 release
+* Sun Oct 15 2006 - jeffm@suse.de
+- Update config files: MBCACHE wants to be modular if ext2 and ext3
+ are.
+* Sun Oct 15 2006 - agruen@suse.de
+- Modularize the ext2 filesystem (CONFIG_EXT2_FS=m).
+- patches.suse/ext3-register-filesystem-lifo: Obsolete with
+ modular ext2.
+* Fri Oct 13 2006 - olh@suse.de
+- add patches.arch/ppc-os-term-panic_timeout.patch
+ reboot when panic_timout is set
+* Fri Oct 13 2006 - olh@suse.de
+- add patches.arch/ppc-via-pmu-acpower.patch
+ force AC power when booting without a battery
+* Thu Oct 12 2006 - jeffm@suse.de
+- patches.fixes/grow_buffers-infinite-loop-fix.diff: grow_buffers()
+ infinite loop fix (205384).
* Tue Oct 10 2006 - kraxel@suse.de
- patches.uml/uml-needs-_syscall0: Fix uml build with 2.6.18+
kernel headers.
++++++ kernel-vanilla.spec ++++++
--- /var/tmp/diff_new_pack.us3C6h/_old 2006-10-16 19:25:39.000000000 +0200
+++ /var/tmp/diff_new_pack.us3C6h/_new 2006-10-16 19:25:39.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-vanilla (Version 2.6.18)
+# spec file for package kernel-vanilla (Version 2.6.18.1)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -22,8 +22,8 @@
# arch/ia64/scripts/unwcheck.py
BuildRequires: python
%endif
-Version: 2.6.18
-Release: 12
+Version: 2.6.18.1
+Release: 1
Summary: The Standard Kernel - without any SUSE patches
License: GPL
Group: System/Kernel
@@ -31,7 +31,7 @@
#Conflicts: kernel
%else
%if !%build_xen
-Provides: kernel = 2.6.18-%dummy_release
+Provides: kernel = 2.6.18.1-%dummy_release
%endif
%endif
Provides: kernel-vanilla-nongpl
@@ -135,12 +135,12 @@
-Source Timestamp: 2006/10/10 13:26:35 UTC
+Source Timestamp: 2006/10/16 15:31:08 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.18.tar.bz2 ]; then
- echo "The kernel-vanilla-2.6.18.nosrc.rpm package does not contain the" \
- "complete sources. Please install kernel-source-2.6.18.src.rpm."
+ echo "The kernel-vanilla-2.6.18.1.nosrc.rpm package does not contain the" \
+ "complete sources. Please install kernel-source-2.6.18.1.src.rpm."
exit 1
fi
symbols=$(
@@ -481,6 +481,24 @@
%files -f kernel.files
%changelog -n kernel-vanilla
+* Mon Oct 16 2006 - gregkh@suse.de
+- update to 2.6.18.1 release
+* Sun Oct 15 2006 - jeffm@suse.de
+- Update config files: MBCACHE wants to be modular if ext2 and ext3
+ are.
+* Sun Oct 15 2006 - agruen@suse.de
+- Modularize the ext2 filesystem (CONFIG_EXT2_FS=m).
+- patches.suse/ext3-register-filesystem-lifo: Obsolete with
+ modular ext2.
+* Fri Oct 13 2006 - olh@suse.de
+- add patches.arch/ppc-os-term-panic_timeout.patch
+ reboot when panic_timout is set
+* Fri Oct 13 2006 - olh@suse.de
+- add patches.arch/ppc-via-pmu-acpower.patch
+ force AC power when booting without a battery
+* Thu Oct 12 2006 - jeffm@suse.de
+- patches.fixes/grow_buffers-infinite-loop-fix.diff: grow_buffers()
+ infinite loop fix (205384).
* Tue Oct 10 2006 - kraxel@suse.de
- patches.uml/uml-needs-_syscall0: Fix uml build with 2.6.18+
kernel headers.
kernel-xen.spec: same change
kernel-xenpae.spec: same change
++++++ build-source-timestamp ++++++
--- kernel-source/build-source-timestamp 2006-10-11 14:47:32.000000000 +0200
+++ kernel-source/build-source-timestamp 2006-10-16 17:56:32.000000000 +0200
@@ -1 +1 @@
-2006/10/10 13:26:35 UTC
+2006/10/16 15:31:08 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-10-02 20:49:56.000000000 +0200
+++ new/config/alpha/default 2006-10-16 17:56:31.000000000 +0200
@@ -2953,7 +2953,7 @@
#
# File systems
#
-CONFIG_EXT2_FS=y
+CONFIG_EXT2_FS=m
CONFIG_EXT2_FS_XATTR=y
CONFIG_EXT2_FS_POSIX_ACL=y
CONFIG_EXT2_FS_SECURITY=y
@@ -2965,7 +2965,7 @@
CONFIG_EXT3_FS_SECURITY=y
CONFIG_JBD=m
CONFIG_JBD_DEBUG=y
-CONFIG_FS_MBCACHE=y
+CONFIG_FS_MBCACHE=m
CONFIG_REISERFS_FS=m
# CONFIG_REISERFS_CHECK is not set
# CONFIG_REISERFS_PROC_INFO is not set
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/alpha/vanilla new/config/alpha/vanilla
--- old/config/alpha/vanilla 2006-10-06 15:41:23.000000000 +0200
+++ new/config/alpha/vanilla 2006-10-16 17:56:31.000000000 +0200
@@ -2904,7 +2904,7 @@
#
# File systems
#
-CONFIG_EXT2_FS=y
+CONFIG_EXT2_FS=m
CONFIG_EXT2_FS_XATTR=y
CONFIG_EXT2_FS_POSIX_ACL=y
CONFIG_EXT2_FS_SECURITY=y
@@ -2915,7 +2915,7 @@
CONFIG_EXT3_FS_SECURITY=y
CONFIG_JBD=m
CONFIG_JBD_DEBUG=y
-CONFIG_FS_MBCACHE=y
+CONFIG_FS_MBCACHE=m
CONFIG_REISERFS_FS=m
# CONFIG_REISERFS_CHECK is not set
# CONFIG_REISERFS_PROC_INFO 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-10-02 20:49:56.000000000 +0200
+++ new/config/i386/bigsmp 2006-10-16 17:56:31.000000000 +0200
@@ -3292,7 +3292,7 @@
#
# File systems
#
-CONFIG_EXT2_FS=y
+CONFIG_EXT2_FS=m
CONFIG_EXT2_FS_XATTR=y
CONFIG_EXT2_FS_POSIX_ACL=y
CONFIG_EXT2_FS_SECURITY=y
@@ -3304,7 +3304,7 @@
CONFIG_EXT3_FS_SECURITY=y
CONFIG_JBD=m
CONFIG_JBD_DEBUG=y
-CONFIG_FS_MBCACHE=y
+CONFIG_FS_MBCACHE=m
CONFIG_REISERFS_FS=m
# CONFIG_REISERFS_CHECK is not set
# CONFIG_REISERFS_PROC_INFO 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-10-02 20:49:56.000000000 +0200
+++ new/config/i386/debug 2006-10-16 17:56:31.000000000 +0200
@@ -3286,7 +3286,7 @@
#
# File systems
#
-CONFIG_EXT2_FS=y
+CONFIG_EXT2_FS=m
CONFIG_EXT2_FS_XATTR=y
CONFIG_EXT2_FS_POSIX_ACL=y
CONFIG_EXT2_FS_SECURITY=y
@@ -3298,7 +3298,7 @@
CONFIG_EXT3_FS_SECURITY=y
CONFIG_JBD=m
CONFIG_JBD_DEBUG=y
-CONFIG_FS_MBCACHE=y
+CONFIG_FS_MBCACHE=m
CONFIG_REISERFS_FS=m
CONFIG_REISERFS_CHECK=y
CONFIG_REISERFS_PROC_INFO=y
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/i386/default new/config/i386/default
--- old/config/i386/default 2006-10-02 20:49:56.000000000 +0200
+++ new/config/i386/default 2006-10-16 17:56:31.000000000 +0200
@@ -3288,7 +3288,7 @@
#
# File systems
#
-CONFIG_EXT2_FS=y
+CONFIG_EXT2_FS=m
CONFIG_EXT2_FS_XATTR=y
CONFIG_EXT2_FS_POSIX_ACL=y
CONFIG_EXT2_FS_SECURITY=y
@@ -3300,7 +3300,7 @@
CONFIG_EXT3_FS_SECURITY=y
CONFIG_JBD=m
CONFIG_JBD_DEBUG=y
-CONFIG_FS_MBCACHE=y
+CONFIG_FS_MBCACHE=m
CONFIG_REISERFS_FS=m
# CONFIG_REISERFS_CHECK is not set
# CONFIG_REISERFS_PROC_INFO 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-10-02 20:49:56.000000000 +0200
+++ new/config/i386/kdump 2006-10-16 17:56:31.000000000 +0200
@@ -3318,7 +3318,7 @@
#
# File systems
#
-CONFIG_EXT2_FS=y
+CONFIG_EXT2_FS=m
CONFIG_EXT2_FS_XATTR=y
CONFIG_EXT2_FS_POSIX_ACL=y
CONFIG_EXT2_FS_SECURITY=y
@@ -3330,7 +3330,7 @@
CONFIG_EXT3_FS_SECURITY=y
CONFIG_JBD=m
CONFIG_JBD_DEBUG=y
-CONFIG_FS_MBCACHE=y
+CONFIG_FS_MBCACHE=m
CONFIG_REISERFS_FS=m
# CONFIG_REISERFS_CHECK is not set
# CONFIG_REISERFS_PROC_INFO 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-09-29 15:05:16.000000000 +0200
+++ new/config/i386/um 2006-10-16 17:56:31.000000000 +0200
@@ -794,7 +794,7 @@
#
# File systems
#
-CONFIG_EXT2_FS=y
+CONFIG_EXT2_FS=m
CONFIG_EXT2_FS_XATTR=y
CONFIG_EXT2_FS_POSIX_ACL=y
CONFIG_EXT2_FS_SECURITY=y
@@ -806,7 +806,7 @@
CONFIG_EXT3_FS_SECURITY=y
CONFIG_JBD=m
# CONFIG_JBD_DEBUG is not set
-CONFIG_FS_MBCACHE=y
+CONFIG_FS_MBCACHE=m
CONFIG_REISERFS_FS=m
# CONFIG_REISERFS_CHECK is not set
# CONFIG_REISERFS_PROC_INFO is not set
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/i386/vanilla new/config/i386/vanilla
--- old/config/i386/vanilla 2006-10-06 15:41:23.000000000 +0200
+++ new/config/i386/vanilla 2006-10-16 17:56:31.000000000 +0200
@@ -3226,7 +3226,7 @@
#
# File systems
#
-CONFIG_EXT2_FS=y
+CONFIG_EXT2_FS=m
CONFIG_EXT2_FS_XATTR=y
CONFIG_EXT2_FS_POSIX_ACL=y
CONFIG_EXT2_FS_SECURITY=y
@@ -3237,7 +3237,7 @@
CONFIG_EXT3_FS_SECURITY=y
CONFIG_JBD=m
CONFIG_JBD_DEBUG=y
-CONFIG_FS_MBCACHE=y
+CONFIG_FS_MBCACHE=m
CONFIG_REISERFS_FS=m
# CONFIG_REISERFS_CHECK is not set
# CONFIG_REISERFS_PROC_INFO 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-10-09 21:16:01.000000000 +0200
+++ new/config/i386/xen 2006-10-16 17:56:31.000000000 +0200
@@ -3001,7 +3001,7 @@
#
# File systems
#
-CONFIG_EXT2_FS=y
+CONFIG_EXT2_FS=m
CONFIG_EXT2_FS_XATTR=y
CONFIG_EXT2_FS_POSIX_ACL=y
CONFIG_EXT2_FS_SECURITY=y
@@ -3013,7 +3013,7 @@
CONFIG_EXT3_FS_SECURITY=y
CONFIG_JBD=m
CONFIG_JBD_DEBUG=y
-CONFIG_FS_MBCACHE=y
+CONFIG_FS_MBCACHE=m
CONFIG_REISERFS_FS=m
# CONFIG_REISERFS_CHECK is not set
# CONFIG_REISERFS_PROC_INFO 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-10-09 21:16:01.000000000 +0200
+++ new/config/i386/xenpae 2006-10-16 17:56:31.000000000 +0200
@@ -3003,7 +3003,7 @@
#
# File systems
#
-CONFIG_EXT2_FS=y
+CONFIG_EXT2_FS=m
CONFIG_EXT2_FS_XATTR=y
CONFIG_EXT2_FS_POSIX_ACL=y
CONFIG_EXT2_FS_SECURITY=y
@@ -3015,7 +3015,7 @@
CONFIG_EXT3_FS_SECURITY=y
CONFIG_JBD=m
CONFIG_JBD_DEBUG=y
-CONFIG_FS_MBCACHE=y
+CONFIG_FS_MBCACHE=m
CONFIG_REISERFS_FS=m
# CONFIG_REISERFS_CHECK is not set
# CONFIG_REISERFS_PROC_INFO 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-10-02 20:49:56.000000000 +0200
+++ new/config/ia64/debug 2006-10-16 17:56:31.000000000 +0200
@@ -2738,7 +2738,7 @@
#
# File systems
#
-CONFIG_EXT2_FS=y
+CONFIG_EXT2_FS=m
CONFIG_EXT2_FS_XATTR=y
CONFIG_EXT2_FS_POSIX_ACL=y
CONFIG_EXT2_FS_SECURITY=y
@@ -2750,7 +2750,7 @@
CONFIG_EXT3_FS_SECURITY=y
CONFIG_JBD=m
CONFIG_JBD_DEBUG=y
-CONFIG_FS_MBCACHE=y
+CONFIG_FS_MBCACHE=m
CONFIG_REISERFS_FS=m
CONFIG_REISERFS_CHECK=y
CONFIG_REISERFS_PROC_INFO=y
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/ia64/default new/config/ia64/default
--- old/config/ia64/default 2006-10-02 20:49:56.000000000 +0200
+++ new/config/ia64/default 2006-10-16 17:56:31.000000000 +0200
@@ -2737,7 +2737,7 @@
#
# File systems
#
-CONFIG_EXT2_FS=y
+CONFIG_EXT2_FS=m
CONFIG_EXT2_FS_XATTR=y
CONFIG_EXT2_FS_POSIX_ACL=y
CONFIG_EXT2_FS_SECURITY=y
@@ -2749,7 +2749,7 @@
CONFIG_EXT3_FS_SECURITY=y
CONFIG_JBD=m
CONFIG_JBD_DEBUG=y
-CONFIG_FS_MBCACHE=y
+CONFIG_FS_MBCACHE=m
CONFIG_REISERFS_FS=m
# CONFIG_REISERFS_CHECK is not set
# CONFIG_REISERFS_PROC_INFO is not set
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/ia64/vanilla new/config/ia64/vanilla
--- old/config/ia64/vanilla 2006-10-06 15:41:23.000000000 +0200
+++ new/config/ia64/vanilla 2006-10-16 17:56:31.000000000 +0200
@@ -2688,7 +2688,7 @@
#
# File systems
#
-CONFIG_EXT2_FS=y
+CONFIG_EXT2_FS=m
CONFIG_EXT2_FS_XATTR=y
CONFIG_EXT2_FS_POSIX_ACL=y
CONFIG_EXT2_FS_SECURITY=y
@@ -2699,7 +2699,7 @@
CONFIG_EXT3_FS_SECURITY=y
CONFIG_JBD=m
CONFIG_JBD_DEBUG=y
-CONFIG_FS_MBCACHE=y
+CONFIG_FS_MBCACHE=m
CONFIG_REISERFS_FS=m
# CONFIG_REISERFS_CHECK is not set
# CONFIG_REISERFS_PROC_INFO is not set
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/s390/default new/config/s390/default
--- old/config/s390/default 2006-10-02 20:49:56.000000000 +0200
+++ new/config/s390/default 2006-10-16 17:56:31.000000000 +0200
@@ -732,7 +732,7 @@
#
# File systems
#
-CONFIG_EXT2_FS=y
+CONFIG_EXT2_FS=m
CONFIG_EXT2_FS_XATTR=y
CONFIG_EXT2_FS_POSIX_ACL=y
CONFIG_EXT2_FS_SECURITY=y
@@ -745,7 +745,7 @@
CONFIG_EXT3_FS_SECURITY=y
CONFIG_JBD=m
CONFIG_JBD_DEBUG=y
-CONFIG_FS_MBCACHE=y
+CONFIG_FS_MBCACHE=m
CONFIG_REISERFS_FS=m
# CONFIG_REISERFS_CHECK is not set
# CONFIG_REISERFS_PROC_INFO 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-10-02 20:49:56.000000000 +0200
+++ new/config/s390/s390 2006-10-16 17:56:31.000000000 +0200
@@ -727,7 +727,7 @@
#
# File systems
#
-CONFIG_EXT2_FS=y
+CONFIG_EXT2_FS=m
CONFIG_EXT2_FS_XATTR=y
CONFIG_EXT2_FS_POSIX_ACL=y
CONFIG_EXT2_FS_SECURITY=y
@@ -740,7 +740,7 @@
CONFIG_EXT3_FS_SECURITY=y
CONFIG_JBD=m
CONFIG_JBD_DEBUG=y
-CONFIG_FS_MBCACHE=y
+CONFIG_FS_MBCACHE=m
CONFIG_REISERFS_FS=m
# CONFIG_REISERFS_CHECK is not set
# CONFIG_REISERFS_PROC_INFO is not set
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/s390/vanilla new/config/s390/vanilla
--- old/config/s390/vanilla 2006-10-06 15:41:23.000000000 +0200
+++ new/config/s390/vanilla 2006-10-16 17:56:31.000000000 +0200
@@ -731,7 +731,7 @@
#
# File systems
#
-CONFIG_EXT2_FS=y
+CONFIG_EXT2_FS=m
CONFIG_EXT2_FS_XATTR=y
CONFIG_EXT2_FS_POSIX_ACL=y
CONFIG_EXT2_FS_SECURITY=y
@@ -743,7 +743,7 @@
CONFIG_EXT3_FS_SECURITY=y
CONFIG_JBD=m
CONFIG_JBD_DEBUG=y
-CONFIG_FS_MBCACHE=y
+CONFIG_FS_MBCACHE=m
CONFIG_REISERFS_FS=m
# CONFIG_REISERFS_CHECK is not set
# CONFIG_REISERFS_PROC_INFO 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-10-02 20:49:56.000000000 +0200
+++ new/config/x86_64/debug 2006-10-16 17:56:31.000000000 +0200
@@ -2907,7 +2907,7 @@
#
# File systems
#
-CONFIG_EXT2_FS=y
+CONFIG_EXT2_FS=m
CONFIG_EXT2_FS_XATTR=y
CONFIG_EXT2_FS_POSIX_ACL=y
CONFIG_EXT2_FS_SECURITY=y
@@ -2919,7 +2919,7 @@
CONFIG_EXT3_FS_SECURITY=y
CONFIG_JBD=m
CONFIG_JBD_DEBUG=y
-CONFIG_FS_MBCACHE=y
+CONFIG_FS_MBCACHE=m
CONFIG_REISERFS_FS=m
CONFIG_REISERFS_CHECK=y
# CONFIG_REISERFS_PROC_INFO 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-10-02 20:49:56.000000000 +0200
+++ new/config/x86_64/default 2006-10-16 17:56:31.000000000 +0200
@@ -2907,7 +2907,7 @@
#
# File systems
#
-CONFIG_EXT2_FS=y
+CONFIG_EXT2_FS=m
CONFIG_EXT2_FS_XATTR=y
CONFIG_EXT2_FS_POSIX_ACL=y
CONFIG_EXT2_FS_SECURITY=y
@@ -2919,7 +2919,7 @@
CONFIG_EXT3_FS_SECURITY=y
CONFIG_JBD=m
CONFIG_JBD_DEBUG=y
-CONFIG_FS_MBCACHE=y
+CONFIG_FS_MBCACHE=m
CONFIG_REISERFS_FS=m
# CONFIG_REISERFS_CHECK is not set
# CONFIG_REISERFS_PROC_INFO 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-10-02 20:49:56.000000000 +0200
+++ new/config/x86_64/kdump 2006-10-16 17:56:31.000000000 +0200
@@ -2920,7 +2920,7 @@
#
# File systems
#
-CONFIG_EXT2_FS=y
+CONFIG_EXT2_FS=m
CONFIG_EXT2_FS_XATTR=y
CONFIG_EXT2_FS_POSIX_ACL=y
CONFIG_EXT2_FS_SECURITY=y
@@ -2932,7 +2932,7 @@
CONFIG_EXT3_FS_SECURITY=y
CONFIG_JBD=m
CONFIG_JBD_DEBUG=y
-CONFIG_FS_MBCACHE=y
+CONFIG_FS_MBCACHE=m
CONFIG_REISERFS_FS=m
# CONFIG_REISERFS_CHECK is not set
# CONFIG_REISERFS_PROC_INFO 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-09-29 15:05:16.000000000 +0200
+++ new/config/x86_64/um 2006-10-16 17:56:31.000000000 +0200
@@ -756,7 +756,7 @@
#
# File systems
#
-CONFIG_EXT2_FS=y
+CONFIG_EXT2_FS=m
CONFIG_EXT2_FS_XATTR=y
CONFIG_EXT2_FS_POSIX_ACL=y
CONFIG_EXT2_FS_SECURITY=y
@@ -768,7 +768,7 @@
CONFIG_EXT3_FS_SECURITY=y
CONFIG_JBD=m
# CONFIG_JBD_DEBUG is not set
-CONFIG_FS_MBCACHE=y
+CONFIG_FS_MBCACHE=m
CONFIG_REISERFS_FS=m
# CONFIG_REISERFS_CHECK is not set
# CONFIG_REISERFS_PROC_INFO is not set
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/x86_64/vanilla new/config/x86_64/vanilla
--- old/config/x86_64/vanilla 2006-10-06 15:41:23.000000000 +0200
+++ new/config/x86_64/vanilla 2006-10-16 17:56:31.000000000 +0200
@@ -2854,7 +2854,7 @@
#
# File systems
#
-CONFIG_EXT2_FS=y
+CONFIG_EXT2_FS=m
CONFIG_EXT2_FS_XATTR=y
CONFIG_EXT2_FS_POSIX_ACL=y
CONFIG_EXT2_FS_SECURITY=y
@@ -2865,7 +2865,7 @@
CONFIG_EXT3_FS_SECURITY=y
CONFIG_JBD=m
CONFIG_JBD_DEBUG=y
-CONFIG_FS_MBCACHE=y
+CONFIG_FS_MBCACHE=m
CONFIG_REISERFS_FS=m
# CONFIG_REISERFS_CHECK is not set
# CONFIG_REISERFS_PROC_INFO 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-10-09 21:16:01.000000000 +0200
+++ new/config/x86_64/xen 2006-10-16 17:56:31.000000000 +0200
@@ -2835,7 +2835,7 @@
#
# File systems
#
-CONFIG_EXT2_FS=y
+CONFIG_EXT2_FS=m
CONFIG_EXT2_FS_XATTR=y
CONFIG_EXT2_FS_POSIX_ACL=y
CONFIG_EXT2_FS_SECURITY=y
@@ -2847,7 +2847,7 @@
CONFIG_EXT3_FS_SECURITY=y
CONFIG_JBD=m
CONFIG_JBD_DEBUG=y
-CONFIG_FS_MBCACHE=y
+CONFIG_FS_MBCACHE=m
CONFIG_REISERFS_FS=m
# CONFIG_REISERFS_CHECK is not set
# CONFIG_REISERFS_PROC_INFO is not set
++++++ kabi.tar.bz2 ++++++
++++++ novell-kmp.tar.bz2 ++++++
++++++ patches.arch.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.arch/ppc-os-term-panic_timeout.patch new/patches.arch/ppc-os-term-panic_timeout.patch
--- old/patches.arch/ppc-os-term-panic_timeout.patch 1970-01-01 01:00:00.000000000 +0100
+++ new/patches.arch/ppc-os-term-panic_timeout.patch 2006-10-16 17:56:31.000000000 +0200
@@ -0,0 +1,30 @@
+Subject: reboot when panic_timout is set
+From: Olaf Hering
+Patch-mainline: 2.6.19
+
+ [POWERPC] reboot when panic_timout is set
+
+ Only call into RTAS when booted with panic=0 because the RTAS call
+ does not return. The system has to be rebooted via the HMC or via the
+ management console right now. This is cumbersome and not what the
+ default panic=180 is supposed to do.
+
+ Signed-off-by: Olaf Hering
+ Signed-off-by: Paul Mackerras
+
+---
+ arch/powerpc/kernel/rtas.c | 3 +++
+ 1 files changed, 3 insertions(+)
+
+--- linux-2.6.18.orig/arch/powerpc/kernel/rtas.c
++++ linux-2.6.18/arch/powerpc/kernel/rtas.c
+@@ -626,6 +626,9 @@ void rtas_os_term(char *str)
+ {
+ int status;
+
++ if (panic_timeout)
++ return;
++
+ if (RTAS_UNKNOWN_SERVICE == rtas_token("ibm,os-term"))
+ return;
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.arch/ppc-via-pmu-acpower.patch new/patches.arch/ppc-via-pmu-acpower.patch
--- old/patches.arch/ppc-via-pmu-acpower.patch 1970-01-01 01:00:00.000000000 +0100
+++ new/patches.arch/ppc-via-pmu-acpower.patch 2006-10-13 20:21:02.000000000 +0200
@@ -0,0 +1,31 @@
+Date: Sat, 30 Sep 2006 17:25:30 +0200
+From: Olaf Hering
+Subject: [PATCH] AC power not detected if no battery present
+
+/proc/pmu/info contains AC Power: 0 when booting without battery.
+Force AC Power, it will be updated whenever the battery state changes.
+
+Signed-off-by: Olaf Hering
+
+---
+ drivers/macintosh/via-pmu.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: linux-2.6/drivers/macintosh/via-pmu.c
+===================================================================
+--- linux-2.6.orig/drivers/macintosh/via-pmu.c
++++ linux-2.6/drivers/macintosh/via-pmu.c
+@@ -168,7 +168,7 @@ static int option_server_mode;
+
+ int pmu_battery_count;
+ int pmu_cur_battery;
+-unsigned int pmu_power_flags;
++unsigned int pmu_power_flags = PMU_PWR_AC_PRESENT;
+ struct pmu_battery_info pmu_batteries[PMU_MAX_BATTERIES];
+ static int query_batt_timer = BATTERY_POLLING_COUNT;
+ static struct adb_request batt_req;
+_______________________________________________
+Linuxppc-dev mailing list
+Linuxppc-dev@ozlabs.org
+https://ozlabs.org/mailman/listinfo/linuxppc-dev
+
++++++ patches.drivers.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.drivers/libata-acpi-update new/patches.drivers/libata-acpi-update
--- old/patches.drivers/libata-acpi-update 2006-10-02 15:16:26.000000000 +0200
+++ new/patches.drivers/libata-acpi-update 2006-10-16 17:56:31.000000000 +0200
@@ -1,7 +1,17 @@
-diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
-index 137e993..b780646 100644
---- a/Documentation/kernel-parameters.txt
-+++ b/Documentation/kernel-parameters.txt
+---
+ Documentation/kernel-parameters.txt | 5
+ drivers/ata/Kconfig | 15
+ drivers/ata/Makefile | 1
+ drivers/ata/libata-acpi.c | 987 ++++++++++++++++++++++++++++++++++++
+ drivers/ata/libata-core.c | 49 +
+ drivers/ata/libata-eh.c | 21
+ drivers/ata/libata-sff.c | 5
+ drivers/ata/libata.h | 11
+ include/linux/libata.h | 32 +
+ 9 files changed, 1122 insertions(+), 4 deletions(-)
+
+--- linux-2.6.18.orig/Documentation/kernel-parameters.txt
++++ linux-2.6.18/Documentation/kernel-parameters.txt
@@ -48,6 +48,7 @@ parameter is applicable:
ISAPNP ISA PnP code is enabled.
ISDN Appropriate ISDN support is enabled.
@@ -10,7 +20,7 @@
LP Printer support is enabled.
LOOP Loopback device support is enabled.
M68k M68k architecture is enabled.
-@@ -264,6 +265,10 @@ and is between 256 and 4096 characters.
+@@ -257,6 +258,10 @@ running once the system is up.
arcrimi= [HW,NET] ARCnet - "RIM I" (entirely mem-mapped) cards
Format: <io>,<irq>,<nodeID>
@@ -21,10 +31,8 @@
ataflop= [HW,M68k]
atarimouse= [HW,MOUSE] Atari Mouse
-diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
-index 3f4aa0c..96de687 100644
---- a/drivers/ata/Kconfig
-+++ b/drivers/ata/Kconfig
+--- linux-2.6.18.orig/drivers/ata/Kconfig
++++ linux-2.6.18/drivers/ata/Kconfig
@@ -144,9 +144,22 @@ config SATA_VITESSE
config SATA_INTEL_COMBINED
@@ -49,21 +57,16 @@
config PATA_ALI
tristate "ALi PATA support (Experimental)"
depends on PCI && EXPERIMENTAL
-diff --git a/drivers/ata/Makefile b/drivers/ata/Makefile
-index 72243a6..26d72ee 100644
---- a/drivers/ata/Makefile
-+++ b/drivers/ata/Makefile
-@@ -59,4 +59,5 @@ # Should be last libata driver
+--- linux-2.6.18.orig/drivers/ata/Makefile
++++ linux-2.6.18/drivers/ata/Makefile
+@@ -59,4 +59,5 @@ obj-$(CONFIG_ATA_GENERIC) += ata_generic
obj-$(CONFIG_PATA_LEGACY) += pata_legacy.o
libata-objs := libata-core.o libata-scsi.o libata-sff.o libata-eh.o
+libata-$(CONFIG_ATA_ACPI) += libata-acpi.o
-diff --git a/drivers/ata/libata-acpi.c b/drivers/ata/libata-acpi.c
-new file mode 100644
-index 0000000..3b25031
--- /dev/null
-+++ b/drivers/ata/libata-acpi.c
++++ linux-2.6.18/drivers/ata/libata-acpi.c
@@ -0,0 +1,987 @@
+/*
+ * libata-acpi.c
@@ -190,13 +193,13 @@
+ goto err;
+ }
+ dinfo = buffer.pointer;
-+ if (!dinfo || !(dinfo->valid & ACPI_VALID_ADR) ||
++ if (!dinfo || !(dinfo->valid & ACPI_VALID_ADR) ||
+ dinfo->address != bus) {
+ if (ata_msg_probe(ap))
+ ata_port_printk(ap, KERN_DEBUG,
+ "%s: wrong bus for parent of %s"
+ " (%llu, should be %d)\n",
-+ __FUNCTION__, pathname,
++ __FUNCTION__, pathname,
+ dinfo ? (unsigned long long)dinfo->address
+ : -1ULL, bus);
+ goto err;
@@ -341,7 +344,7 @@
+ * _ADR Adress of the device (0 master, 1 slave)
+ *
+ *
-+ * When a correct ACPI handle is found it is being attached to
++ * When a correct ACPI handle is found it is being attached to
+ * @atadev->obj_handle.
+ * Returns 0 on success, <0 on error.
+ */
@@ -380,7 +383,7 @@
+ if (ata_msg_probe(ap))
+ ata_dev_printk(atadev, KERN_DEBUG,
+ "%s: no ACPI handle for drive=%d:%d\n",
-+ __FUNCTION__, ap->port_no,
++ __FUNCTION__, ap->port_no,
+ atadev->devno);
+ return -ENODEV;
+ }
@@ -465,7 +468,7 @@
+ if (ata_msg_probe(ap))
+ ata_port_printk(ap, KERN_DEBUG,
+ "%s: using %s (chan=%d, handle=0x%p)\n",
-+ __FUNCTION__, objname,
++ __FUNCTION__, objname,
+ ap->port_no, chan_handle);
+ kfree(objname);
+
@@ -569,7 +572,7 @@
+ * function return value is 0.
+ */
+static int do_drive_get_GTF(struct ata_device *atadev,
-+ unsigned int *gtf_length,
++ unsigned int *gtf_length,
+ unsigned long *gtf_address,
+ unsigned long *obj_loc)
+{
@@ -825,7 +828,7 @@
+ unsigned long gtf_address;
+ unsigned long obj_loc;
+
-+ if (!(ata_acpi_flags(atadev,libata_acpi) &
++ if (!(ata_acpi_flags(atadev,libata_acpi) &
+ (ATA_ACPI_GTF | ATA_ACPI_TFX))) {
+ if (ata_msg_probe(ap))
+ ata_dev_printk(atadev, KERN_DEBUG,
@@ -1052,10 +1055,8 @@
+out:;
+}
+EXPORT_SYMBOL_GPL(ata_acpi_push_timing);
-diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
-index dce6565..a8e3c2e 100644
---- a/drivers/ata/libata-core.c
-+++ b/drivers/ata/libata-core.c
+--- linux-2.6.18.orig/drivers/ata/libata-core.c
++++ linux-2.6.18/drivers/ata/libata-core.c
@@ -90,6 +90,12 @@ static int ata_probe_timeout = ATA_TMOUT
module_param(ata_probe_timeout, int, 0444);
MODULE_PARM_DESC(ata_probe_timeout, "Set ATA probing timeout (seconds)");
@@ -1148,10 +1149,8 @@
ap->flags & ATA_FLAG_SATA ? 'S' : 'P',
ata_mode_string(xfer_mode_mask),
ap->ioaddr.cmd_addr,
-diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c
-index 02b2b27..8735138 100644
---- a/drivers/ata/libata-eh.c
-+++ b/drivers/ata/libata-eh.c
+--- linux-2.6.18.orig/drivers/ata/libata-eh.c
++++ linux-2.6.18/drivers/ata/libata-eh.c
@@ -1994,6 +1994,21 @@ static int ata_eh_recover(struct ata_por
down_xfermask = 1;
goto dev_fail;
@@ -1168,7 +1167,7 @@
+ ata_acpi_push_id(dev);
+
+ /* retrieve and execute the ATA task file of _GTF */
-+ ata_acpi_exec_tfs(dev);
++ ata_acpi_exec_tfs(dev);
+ }
+#endif
}
@@ -1187,10 +1186,8 @@
if (ap->ops->port_resume)
rc = ap->ops->port_resume(ap);
-diff --git a/drivers/ata/libata-sff.c b/drivers/ata/libata-sff.c
-index 06daaa3..430ac1c 100644
---- a/drivers/ata/libata-sff.c
-+++ b/drivers/ata/libata-sff.c
+--- linux-2.6.18.orig/drivers/ata/libata-sff.c
++++ linux-2.6.18/drivers/ata/libata-sff.c
@@ -976,6 +976,11 @@ int ata_pci_init_one (struct pci_dev *pd
if ((pdev->class >> 8) == PCI_CLASS_STORAGE_IDE) {
u8 tmp8;
@@ -1203,10 +1200,8 @@
/* TODO: What if one channel is in native mode ... */
pci_read_config_byte(pdev, PCI_CLASS_PROG, &tmp8);
mask = (1 << 2) | (1 << 0);
-diff --git a/drivers/ata/libata.h b/drivers/ata/libata.h
-index a5ecb71..2b16dcc 100644
---- a/drivers/ata/libata.h
-+++ b/drivers/ata/libata.h
+--- linux-2.6.18.orig/drivers/ata/libata.h
++++ linux-2.6.18/drivers/ata/libata.h
@@ -43,6 +43,9 @@ extern struct workqueue_struct *ata_aux_
extern int atapi_enabled;
extern int atapi_dmadir;
@@ -1217,7 +1212,7 @@
extern struct ata_queued_cmd *ata_qc_new_init(struct ata_device *dev);
extern int ata_rwcmd_protocol(struct ata_queued_cmd *qc);
extern void ata_dev_disable(struct ata_device *dev);
-@@ -119,4 +136,12 @@ extern void ata_scsi_error(struct Scsi_H
+@@ -119,4 +122,12 @@ extern void ata_scsi_error(struct Scsi_H
extern void ata_port_wait_eh(struct ata_port *ap);
extern void ata_qc_schedule_eh(struct ata_queued_cmd *qc);
@@ -1230,11 +1225,9 @@
+#endif
+
#endif /* __LIBATA_H__ */
-diff --git a/include/linux/libata.h b/include/linux/libata.h
-index d1af1db..9826490 100644
---- a/include/linux/libata.h
-+++ b/include/linux/libata.h
-@@ -35,6 +35,7 @@ #include
+--- linux-2.6.18.orig/include/linux/libata.h
++++ linux-2.6.18/include/linux/libata.h
+@@ -35,6 +35,7 @@
#include
#include
#include
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.drivers/libata-add-ata-drivers new/patches.drivers/libata-add-ata-drivers
--- old/patches.drivers/libata-add-ata-drivers 2006-10-02 15:16:26.000000000 +0200
+++ new/patches.drivers/libata-add-ata-drivers 2006-10-16 17:56:31.000000000 +0200
@@ -1,6 +1,74 @@
-diff -purN linux-2.6/drivers/ata/ahci.c libata-dev/drivers/ata/ahci.c
---- linux-2.6/drivers/ata/ahci.c 1970-01-01 01:00:00.000000000 +0100
-+++ libata-dev/drivers/ata/ahci.c 2006-10-02 11:23:40.760632159 +0200
+---
+ drivers/Kconfig | 2
+ drivers/Makefile | 1
+ drivers/ata/Kconfig | 487 ++
+ drivers/ata/Makefile | 62
+ drivers/ata/ahci.c | 1654 +++++++++
+ drivers/ata/ata_generic.c | 252 +
+ drivers/ata/ata_piix.c | 1256 +++++++
+ drivers/ata/libata-core.c | 6178 +++++++++++++++++++++++++++++++++++
+ drivers/ata/libata-eh.c | 2249 ++++++++++++
+ drivers/ata/libata-scsi.c | 3332 ++++++++++++++++++
+ drivers/ata/libata-sff.c | 1121 ++++++
+ drivers/ata/libata.h | 122
+ drivers/ata/pata_ali.c | 680 +++
+ drivers/ata/pata_amd.c | 709 ++++
+ drivers/ata/pata_artop.c | 512 ++
+ drivers/ata/pata_atiixp.c | 304 +
+ drivers/ata/pata_cmd64x.c | 504 ++
+ drivers/ata/pata_cs5520.c | 334 +
+ drivers/ata/pata_cs5530.c | 386 ++
+ drivers/ata/pata_cs5535.c | 290 +
+ drivers/ata/pata_cypress.c | 228 +
+ drivers/ata/pata_efar.c | 338 +
+ drivers/ata/pata_hpt366.c | 479 ++
+ drivers/ata/pata_hpt37x.c | 1256 +++++++
+ drivers/ata/pata_hpt3x2n.c | 596 +++
+ drivers/ata/pata_hpt3x3.c | 227 +
+ drivers/ata/pata_isapnp.c | 156
+ drivers/ata/pata_it821x.c | 846 ++++
+ drivers/ata/pata_jmicron.c | 266 +
+ drivers/ata/pata_legacy.c | 949 +++++
+ drivers/ata/pata_mpiix.c | 307 +
+ drivers/ata/pata_netcell.c | 175
+ drivers/ata/pata_ns87410.c | 232 +
+ drivers/ata/pata_oldpiix.c | 336 +
+ drivers/ata/pata_opti.c | 290 +
+ drivers/ata/pata_optidma.c | 544 +++
+ drivers/ata/pata_pcmcia.c | 393 ++
+ drivers/ata/pata_pdc2027x.c | 868 ++++
+ drivers/ata/pata_pdc202xx_old.c | 422 ++
+ drivers/ata/pata_qdi.c | 403 ++
+ drivers/ata/pata_radisys.c | 333 +
+ drivers/ata/pata_rz1000.c | 205 +
+ drivers/ata/pata_sc1200.c | 286 +
+ drivers/ata/pata_serverworks.c | 590 +++
+ drivers/ata/pata_sil680.c | 380 ++
+ drivers/ata/pata_sis.c | 1022 +++++
+ drivers/ata/pata_sl82c105.c | 384 ++
+ drivers/ata/pata_triflex.c | 280 +
+ drivers/ata/pata_via.c | 564 +++
+ drivers/ata/pdc_adma.c | 739 ++++
+ drivers/ata/sata_mv.c | 2467 +++++++++++++
+ drivers/ata/sata_nv.c | 582 +++
+ drivers/ata/sata_promise.c | 827 ++++
+ drivers/ata/sata_promise.h | 157
+ drivers/ata/sata_qstor.c | 729 ++++
+ drivers/ata/sata_sil.c | 729 ++++
+ drivers/ata/sata_sil24.c | 1228 ++++++
+ drivers/ata/sata_sis.c | 347 +
+ drivers/ata/sata_svw.c | 505 ++
+ drivers/ata/sata_sx4.c | 1501 ++++++++
+ drivers/ata/sata_uli.c | 300 +
+ drivers/ata/sata_via.c | 503 ++
+ drivers/ata/sata_vsc.c | 478 ++
+ include/asm-generic/libata-portmap.h | 12
+ include/linux/ata.h | 26
+ include/linux/libata.h | 107
+ 66 files changed, 44992 insertions(+), 35 deletions(-)
+
+--- /dev/null
++++ linux-2.6.18/drivers/ata/ahci.c
@@ -0,0 +1,1654 @@
+/*
+ * ahci.c - AHCI SATA support
@@ -1656,9 +1724,8 @@
+
+module_init(ahci_init);
+module_exit(ahci_exit);
-diff -purN linux-2.6/drivers/ata/ata_generic.c libata-dev/drivers/ata/ata_generic.c
---- linux-2.6/drivers/ata/ata_generic.c 1970-01-01 01:00:00.000000000 +0100
-+++ libata-dev/drivers/ata/ata_generic.c 2006-09-29 08:39:45.000000000 +0200
+--- /dev/null
++++ linux-2.6.18/drivers/ata/ata_generic.c
@@ -0,0 +1,252 @@
+/*
+ * ata_generic.c - Generic PATA/SATA controller driver.
@@ -1912,9 +1979,8 @@
+module_exit(ata_generic_exit);
+
+module_param(all_generic_ide, int, 0);
-diff -purN linux-2.6/drivers/ata/ata_piix.c libata-dev/drivers/ata/ata_piix.c
---- linux-2.6/drivers/ata/ata_piix.c 1970-01-01 01:00:00.000000000 +0100
-+++ libata-dev/drivers/ata/ata_piix.c 2006-09-29 08:39:45.000000000 +0200
+--- /dev/null
++++ linux-2.6.18/drivers/ata/ata_piix.c
@@ -0,0 +1,1256 @@
+/*
+ * ata_piix.c - Intel PATA/SATA controllers
@@ -2563,7 +2629,7 @@
+
+ if (!pci_test_config_bits(pdev, &piix_enable_bits[ap->port_no]))
+ return -ENOENT;
-+
++
+ ap->cbl = ATA_CBL_PATA40;
+ return ata_std_prereset(ap);
+}
@@ -3172,9 +3238,8 @@
+
+module_init(piix_init);
+module_exit(piix_exit);
-diff -purN linux-2.6/drivers/ata/Kconfig libata-dev/drivers/ata/Kconfig
---- linux-2.6/drivers/ata/Kconfig 1970-01-01 01:00:00.000000000 +0100
-+++ libata-dev/drivers/ata/Kconfig 2006-10-02 11:59:23.079121422 +0200
+--- /dev/null
++++ linux-2.6.18/drivers/ata/Kconfig
@@ -0,0 +1,487 @@
+#
+# SATA/PATA driver configuration
@@ -3663,9 +3728,8 @@
+endif
+endmenu
+
-diff -purN linux-2.6/drivers/ata/libata-core.c libata-dev/drivers/ata/libata-core.c
---- linux-2.6/drivers/ata/libata-core.c 1970-01-01 01:00:00.000000000 +0100
-+++ libata-dev/drivers/ata/libata-core.c 2006-10-02 11:59:23.109117331 +0200
+--- /dev/null
++++ linux-2.6.18/drivers/ata/libata-core.c
@@ -0,0 +1,6178 @@
+/*
+ * libata-core.c - helper library for ATA
@@ -9124,7 +9188,7 @@
+ int rc;
+
+ DPRINTK("ENTER\n");
-+
++
+ if (ent->irq == 0) {
+ dev_printk(KERN_ERR, dev, "is not available: No interrupt assigned.\n");
+ return 0;
@@ -9845,9 +9909,8 @@
+EXPORT_SYMBOL_GPL(ata_eh_qc_complete);
+EXPORT_SYMBOL_GPL(ata_eh_qc_retry);
+EXPORT_SYMBOL_GPL(ata_do_eh);
-diff -purN linux-2.6/drivers/ata/libata-eh.c libata-dev/drivers/ata/libata-eh.c
---- linux-2.6/drivers/ata/libata-eh.c 1970-01-01 01:00:00.000000000 +0100
-+++ libata-dev/drivers/ata/libata-eh.c 2006-10-02 11:59:23.121115695 +0200
+--- /dev/null
++++ linux-2.6.18/drivers/ata/libata-eh.c
@@ -0,0 +1,2249 @@
+/*
+ * libata-eh.c - libata error handling
@@ -12098,9 +12161,8 @@
+ }
+ spin_unlock_irqrestore(ap->lock, flags);
+}
-diff -purN linux-2.6/drivers/ata/libata.h libata-dev/drivers/ata/libata.h
---- linux-2.6/drivers/ata/libata.h 1970-01-01 01:00:00.000000000 +0100
-+++ libata-dev/drivers/ata/libata.h 2006-10-02 11:59:23.135113786 +0200
+--- /dev/null
++++ linux-2.6.18/drivers/ata/libata.h
@@ -0,0 +1,122 @@
+/*
+ * libata.h - helper library for ATA
@@ -12224,9 +12286,8 @@
+extern void ata_qc_schedule_eh(struct ata_queued_cmd *qc);
+
+#endif /* __LIBATA_H__ */
-diff -purN linux-2.6/drivers/ata/libata-scsi.c libata-dev/drivers/ata/libata-scsi.c
---- linux-2.6/drivers/ata/libata-scsi.c 1970-01-01 01:00:00.000000000 +0100
-+++ libata-dev/drivers/ata/libata-scsi.c 2006-10-02 11:23:40.817624386 +0200
+--- /dev/null
++++ linux-2.6.18/drivers/ata/libata-scsi.c
@@ -0,0 +1,3332 @@
+/*
+ * libata-scsi.c - helper library for ATA
@@ -15560,9 +15621,8 @@
+ return 0;
+}
+EXPORT_SYMBOL_GPL(ata_sas_queuecmd);
-diff -purN linux-2.6/drivers/ata/libata-sff.c libata-dev/drivers/ata/libata-sff.c
---- linux-2.6/drivers/ata/libata-sff.c 1970-01-01 01:00:00.000000000 +0100
-+++ libata-dev/drivers/ata/libata-sff.c 2006-10-02 11:59:23.129114605 +0200
+--- /dev/null
++++ linux-2.6.18/drivers/ata/libata-sff.c
@@ -0,0 +1,1121 @@
+/*
+ * libata-bmdma.c - helper library for PCI IDE BMDMA
@@ -16685,9 +16745,8 @@
+
+#endif /* CONFIG_PCI */
+
-diff -purN linux-2.6/drivers/ata/Makefile libata-dev/drivers/ata/Makefile
---- linux-2.6/drivers/ata/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ libata-dev/drivers/ata/Makefile 2006-10-02 11:59:23.085120604 +0200
+--- /dev/null
++++ linux-2.6.18/drivers/ata/Makefile
@@ -0,0 +1,62 @@
+
+obj-$(CONFIG_ATA) += libata.o
@@ -16751,9 +16810,8 @@
+
+libata-objs := libata-core.o libata-scsi.o libata-sff.o libata-eh.o
+
-diff -purN linux-2.6/drivers/ata/pata_ali.c libata-dev/drivers/ata/pata_ali.c
---- linux-2.6/drivers/ata/pata_ali.c 1970-01-01 01:00:00.000000000 +0100
-+++ libata-dev/drivers/ata/pata_ali.c 2006-10-02 11:23:40.842620976 +0200
+--- /dev/null
++++ linux-2.6.18/drivers/ata/pata_ali.c
@@ -0,0 +1,680 @@
+/*
+ * pata_ali.c - ALI 15x3 PATA for new ATA layer
@@ -17435,9 +17493,8 @@
+
+module_init(ali_init);
+module_exit(ali_exit);
-diff -purN linux-2.6/drivers/ata/pata_amd.c libata-dev/drivers/ata/pata_amd.c
---- linux-2.6/drivers/ata/pata_amd.c 1970-01-01 01:00:00.000000000 +0100
-+++ libata-dev/drivers/ata/pata_amd.c 2006-10-02 11:23:40.849620022 +0200
+--- /dev/null
++++ linux-2.6.18/drivers/ata/pata_amd.c
@@ -0,0 +1,709 @@
+/*
+ * pata_amd.c - AMD PATA for new ATA layer
@@ -18148,9 +18205,8 @@
+
+module_init(amd_init);
+module_exit(amd_exit);
-diff -purN linux-2.6/drivers/ata/pata_artop.c libata-dev/drivers/ata/pata_artop.c
---- linux-2.6/drivers/ata/pata_artop.c 1970-01-01 01:00:00.000000000 +0100
-+++ libata-dev/drivers/ata/pata_artop.c 2006-10-02 11:23:40.856619067 +0200
+--- /dev/null
++++ linux-2.6.18/drivers/ata/pata_artop.c
@@ -0,0 +1,512 @@
+/*
+ * pata_artop.c - ARTOP ATA controller driver
@@ -18664,9 +18720,8 @@
+MODULE_DEVICE_TABLE(pci, artop_pci_tbl);
+MODULE_VERSION(DRV_VERSION);
+
-diff -purN linux-2.6/drivers/ata/pata_atiixp.c libata-dev/drivers/ata/pata_atiixp.c
---- linux-2.6/drivers/ata/pata_atiixp.c 1970-01-01 01:00:00.000000000 +0100
-+++ libata-dev/drivers/ata/pata_atiixp.c 2006-10-02 11:23:40.863618112 +0200
+--- /dev/null
++++ linux-2.6.18/drivers/ata/pata_atiixp.c
@@ -0,0 +1,304 @@
+/*
+ * pata_atiixp.c - ATI PATA for new ATA layer
@@ -18972,9 +19027,8 @@
+
+module_init(atiixp_init);
+module_exit(atiixp_exit);
-diff -purN linux-2.6/drivers/ata/pata_cmd64x.c libata-dev/drivers/ata/pata_cmd64x.c
---- linux-2.6/drivers/ata/pata_cmd64x.c 1970-01-01 01:00:00.000000000 +0100
-+++ libata-dev/drivers/ata/pata_cmd64x.c 2006-10-02 11:23:40.872616885 +0200
+--- /dev/null
++++ linux-2.6.18/drivers/ata/pata_cmd64x.c
@@ -0,0 +1,504 @@
+/*
+ * pata_cmd64x.c - ATI PATA for new ATA layer
@@ -19480,9 +19534,8 @@
+
+module_init(cmd64x_init);
+module_exit(cmd64x_exit);
-diff -purN linux-2.6/drivers/ata/pata_cs5520.c libata-dev/drivers/ata/pata_cs5520.c
---- linux-2.6/drivers/ata/pata_cs5520.c 1970-01-01 01:00:00.000000000 +0100
-+++ libata-dev/drivers/ata/pata_cs5520.c 2006-10-02 11:23:40.879615930 +0200
+--- /dev/null
++++ linux-2.6.18/drivers/ata/pata_cs5520.c
@@ -0,0 +1,334 @@
+/*
+ * IDE tuning and bus mastering support for the CS5510/CS5520
@@ -19818,9 +19871,8 @@
+module_init(cs5520_init);
+module_exit(cs5520_exit);
+
-diff -purN linux-2.6/drivers/ata/pata_cs5530.c libata-dev/drivers/ata/pata_cs5530.c
---- linux-2.6/drivers/ata/pata_cs5530.c 1970-01-01 01:00:00.000000000 +0100
-+++ libata-dev/drivers/ata/pata_cs5530.c 2006-10-02 11:23:40.886614976 +0200
+--- /dev/null
++++ linux-2.6.18/drivers/ata/pata_cs5530.c
@@ -0,0 +1,386 @@
+/*
+ * pata-cs5530.c - CS5530 PATA for new ATA layer
@@ -20208,9 +20260,8 @@
+
+module_init(cs5530_init);
+module_exit(cs5530_exit);
-diff -purN linux-2.6/drivers/ata/pata_cs5535.c libata-dev/drivers/ata/pata_cs5535.c
---- linux-2.6/drivers/ata/pata_cs5535.c 1970-01-01 01:00:00.000000000 +0100
-+++ libata-dev/drivers/ata/pata_cs5535.c 2006-10-02 11:23:40.893614021 +0200
+--- /dev/null
++++ linux-2.6.18/drivers/ata/pata_cs5535.c
@@ -0,0 +1,290 @@
+/*
+ * pata-cs5535.c - CS5535 PATA for new ATA layer
@@ -20502,9 +20553,8 @@
+
+module_init(cs5535_init);
+module_exit(cs5535_exit);
-diff -purN linux-2.6/drivers/ata/pata_cypress.c libata-dev/drivers/ata/pata_cypress.c
---- linux-2.6/drivers/ata/pata_cypress.c 1970-01-01 01:00:00.000000000 +0100
-+++ libata-dev/drivers/ata/pata_cypress.c 2006-10-02 11:23:40.899613203 +0200
+--- /dev/null
++++ linux-2.6.18/drivers/ata/pata_cypress.c
@@ -0,0 +1,228 @@
+/*
+ * pata_cypress.c - Cypress PATA for new ATA layer
@@ -20734,9 +20784,8 @@
+
+module_init(cy82c693_init);
+module_exit(cy82c693_exit);
-diff -purN linux-2.6/drivers/ata/pata_efar.c libata-dev/drivers/ata/pata_efar.c
---- linux-2.6/drivers/ata/pata_efar.c 1970-01-01 01:00:00.000000000 +0100
-+++ libata-dev/drivers/ata/pata_efar.c 2006-10-02 11:23:40.905612385 +0200
+--- /dev/null
++++ linux-2.6.18/drivers/ata/pata_efar.c
@@ -0,0 +1,338 @@
+/*
+ * pata_efar.c - EFAR PIIX clone controller driver
@@ -21076,9 +21125,8 @@
+MODULE_DEVICE_TABLE(pci, efar_pci_tbl);
+MODULE_VERSION(DRV_VERSION);
+
-diff -purN linux-2.6/drivers/ata/pata_hpt366.c libata-dev/drivers/ata/pata_hpt366.c
---- linux-2.6/drivers/ata/pata_hpt366.c 1970-01-01 01:00:00.000000000 +0100
-+++ libata-dev/drivers/ata/pata_hpt366.c 2006-10-02 11:23:40.912611430 +0200
+--- /dev/null
++++ linux-2.6.18/drivers/ata/pata_hpt366.c
@@ -0,0 +1,479 @@
+/*
+ * Libata driver for the highpoint 366 and 368 UDMA66 ATA controllers.
@@ -21559,9 +21607,8 @@
+
+module_init(hpt36x_init);
+module_exit(hpt36x_exit);
-diff -purN linux-2.6/drivers/ata/pata_hpt37x.c libata-dev/drivers/ata/pata_hpt37x.c
---- linux-2.6/drivers/ata/pata_hpt37x.c 1970-01-01 01:00:00.000000000 +0100
-+++ libata-dev/drivers/ata/pata_hpt37x.c 2006-10-02 11:23:40.921610203 +0200
+--- /dev/null
++++ linux-2.6.18/drivers/ata/pata_hpt37x.c
@@ -0,0 +1,1256 @@
+/*
+ * Libata driver for the highpoint 37x and 30x UDMA66 ATA controllers.
@@ -22819,9 +22866,8 @@
+
+module_init(hpt37x_init);
+module_exit(hpt37x_exit);
-diff -purN linux-2.6/drivers/ata/pata_hpt3x2n.c libata-dev/drivers/ata/pata_hpt3x2n.c
---- linux-2.6/drivers/ata/pata_hpt3x2n.c 1970-01-01 01:00:00.000000000 +0100
-+++ libata-dev/drivers/ata/pata_hpt3x2n.c 2006-10-02 11:23:40.928609248 +0200
+--- /dev/null
++++ linux-2.6.18/drivers/ata/pata_hpt3x2n.c
@@ -0,0 +1,596 @@
+/*
+ * Libata driver for the highpoint 372N and 302N UDMA66 ATA controllers.
@@ -23419,9 +23465,8 @@
+
+module_init(hpt3x2n_init);
+module_exit(hpt3x2n_exit);
-diff -purN linux-2.6/drivers/ata/pata_hpt3x3.c libata-dev/drivers/ata/pata_hpt3x3.c
---- linux-2.6/drivers/ata/pata_hpt3x3.c 1970-01-01 01:00:00.000000000 +0100
-+++ libata-dev/drivers/ata/pata_hpt3x3.c 2006-10-02 11:23:40.935608293 +0200
+--- /dev/null
++++ linux-2.6.18/drivers/ata/pata_hpt3x3.c
@@ -0,0 +1,227 @@
+/*
+ * pata_hpt3x3 - HPT3x3 driver
@@ -23650,9 +23695,8 @@
+
+module_init(hpt3x3_init);
+module_exit(hpt3x3_exit);
-diff -purN linux-2.6/drivers/ata/pata_isapnp.c libata-dev/drivers/ata/pata_isapnp.c
---- linux-2.6/drivers/ata/pata_isapnp.c 1970-01-01 01:00:00.000000000 +0100
-+++ libata-dev/drivers/ata/pata_isapnp.c 2006-09-29 08:39:45.000000000 +0200
+--- /dev/null
++++ linux-2.6.18/drivers/ata/pata_isapnp.c
@@ -0,0 +1,156 @@
+
+/*
@@ -23810,9 +23854,8 @@
+
+module_init(isapnp_init);
+module_exit(isapnp_exit);
-diff -purN linux-2.6/drivers/ata/pata_it821x.c libata-dev/drivers/ata/pata_it821x.c
---- linux-2.6/drivers/ata/pata_it821x.c 1970-01-01 01:00:00.000000000 +0100
-+++ libata-dev/drivers/ata/pata_it821x.c 2006-10-02 11:23:40.942607339 +0200
+--- /dev/null
++++ linux-2.6.18/drivers/ata/pata_it821x.c
@@ -0,0 +1,846 @@
+/*
+ * ata-it821x.c - IT821x PATA for new ATA layer
@@ -24660,9 +24703,8 @@
+
+module_init(it821x_init);
+module_exit(it821x_exit);
-diff -purN linux-2.6/drivers/ata/pata_jmicron.c libata-dev/drivers/ata/pata_jmicron.c
---- linux-2.6/drivers/ata/pata_jmicron.c 1970-01-01 01:00:00.000000000 +0100
-+++ libata-dev/drivers/ata/pata_jmicron.c 2006-10-02 11:23:40.949606384 +0200
+--- /dev/null
++++ linux-2.6.18/drivers/ata/pata_jmicron.c
@@ -0,0 +1,266 @@
+/*
+ * pata_jmicron.c - JMicron ATA driver for non AHCI mode. This drives the
@@ -24930,9 +24972,8 @@
+MODULE_DEVICE_TABLE(pci, jmicron_pci_tbl);
+MODULE_VERSION(DRV_VERSION);
+
-diff -purN linux-2.6/drivers/ata/pata_legacy.c libata-dev/drivers/ata/pata_legacy.c
---- linux-2.6/drivers/ata/pata_legacy.c 1970-01-01 01:00:00.000000000 +0100
-+++ libata-dev/drivers/ata/pata_legacy.c 2006-09-29 08:39:45.000000000 +0200
+--- /dev/null
++++ linux-2.6.18/drivers/ata/pata_legacy.c
@@ -0,0 +1,949 @@
+/*
+ * pata-legacy.c - Legacy port PATA/SATA controller driver.
@@ -25883,9 +25924,8 @@
+module_init(legacy_init);
+module_exit(legacy_exit);
+
-diff -purN linux-2.6/drivers/ata/pata_mpiix.c libata-dev/drivers/ata/pata_mpiix.c
---- linux-2.6/drivers/ata/pata_mpiix.c 1970-01-01 01:00:00.000000000 +0100
-+++ libata-dev/drivers/ata/pata_mpiix.c 2006-10-02 11:23:40.955605566 +0200
+--- /dev/null
++++ linux-2.6.18/drivers/ata/pata_mpiix.c
@@ -0,0 +1,307 @@
+/*
+ * pata_mpiix.c - Intel MPIIX PATA for new ATA layer
@@ -26194,9 +26234,8 @@
+
+module_init(mpiix_init);
+module_exit(mpiix_exit);
-diff -purN linux-2.6/drivers/ata/pata_netcell.c libata-dev/drivers/ata/pata_netcell.c
---- linux-2.6/drivers/ata/pata_netcell.c 1970-01-01 01:00:00.000000000 +0100
-+++ libata-dev/drivers/ata/pata_netcell.c 2006-10-02 11:23:40.961604748 +0200
+--- /dev/null
++++ linux-2.6.18/drivers/ata/pata_netcell.c
@@ -0,0 +1,175 @@
+/*
+ * pata_netcell.c - Netcell PATA driver
@@ -26373,9 +26412,8 @@
+MODULE_DEVICE_TABLE(pci, netcell_pci_tbl);
+MODULE_VERSION(DRV_VERSION);
+
-diff -purN linux-2.6/drivers/ata/pata_ns87410.c libata-dev/drivers/ata/pata_ns87410.c
---- linux-2.6/drivers/ata/pata_ns87410.c 1970-01-01 01:00:00.000000000 +0100
-+++ libata-dev/drivers/ata/pata_ns87410.c 2006-10-02 11:23:40.967603929 +0200
+--- /dev/null
++++ linux-2.6.18/drivers/ata/pata_ns87410.c
@@ -0,0 +1,232 @@
+/*
+ * pata_ns87410.c - National Semiconductor 87410 PATA for new ATA layer
@@ -26609,9 +26647,8 @@
+
+module_init(ns87410_init);
+module_exit(ns87410_exit);
-diff -purN linux-2.6/drivers/ata/pata_oldpiix.c libata-dev/drivers/ata/pata_oldpiix.c
---- linux-2.6/drivers/ata/pata_oldpiix.c 1970-01-01 01:00:00.000000000 +0100
-+++ libata-dev/drivers/ata/pata_oldpiix.c 2006-10-02 11:23:40.973603111 +0200
+--- /dev/null
++++ linux-2.6.18/drivers/ata/pata_oldpiix.c
@@ -0,0 +1,336 @@
+/*
+ * pata_oldpiix.c - Intel PATA/SATA controllers
@@ -26949,9 +26986,8 @@
+MODULE_DEVICE_TABLE(pci, oldpiix_pci_tbl);
+MODULE_VERSION(DRV_VERSION);
+
-diff -purN linux-2.6/drivers/ata/pata_opti.c libata-dev/drivers/ata/pata_opti.c
---- linux-2.6/drivers/ata/pata_opti.c 1970-01-01 01:00:00.000000000 +0100
-+++ libata-dev/drivers/ata/pata_opti.c 2006-10-02 11:23:40.980602156 +0200
+--- /dev/null
++++ linux-2.6.18/drivers/ata/pata_opti.c
@@ -0,0 +1,290 @@
+/*
+ * pata_opti.c - ATI PATA for new ATA layer
@@ -27243,9 +27279,8 @@
+
+module_init(opti_init);
+module_exit(opti_exit);
-diff -purN linux-2.6/drivers/ata/pata_optidma.c libata-dev/drivers/ata/pata_optidma.c
---- linux-2.6/drivers/ata/pata_optidma.c 1970-01-01 01:00:00.000000000 +0100
-+++ libata-dev/drivers/ata/pata_optidma.c 2006-10-02 11:23:40.986601338 +0200
+--- /dev/null
++++ linux-2.6.18/drivers/ata/pata_optidma.c
@@ -0,0 +1,544 @@
+/*
+ * pata_optidma.c - Opti DMA PATA for new ATA layer
@@ -27791,9 +27826,8 @@
+
+module_init(optidma_init);
+module_exit(optidma_exit);
-diff -purN linux-2.6/drivers/ata/pata_pcmcia.c libata-dev/drivers/ata/pata_pcmcia.c
---- linux-2.6/drivers/ata/pata_pcmcia.c 1970-01-01 01:00:00.000000000 +0100
-+++ libata-dev/drivers/ata/pata_pcmcia.c 2006-09-29 08:39:45.000000000 +0200
+--- /dev/null
++++ linux-2.6.18/drivers/ata/pata_pcmcia.c
@@ -0,0 +1,393 @@
+/*
+ * pata_pcmcia.c - PCMCIA PATA controller driver.
@@ -28188,9 +28222,8 @@
+
+module_init(pcmcia_init);
+module_exit(pcmcia_exit);
-diff -purN linux-2.6/drivers/ata/pata_pdc2027x.c libata-dev/drivers/ata/pata_pdc2027x.c
---- linux-2.6/drivers/ata/pata_pdc2027x.c 1970-01-01 01:00:00.000000000 +0100
-+++ libata-dev/drivers/ata/pata_pdc2027x.c 2006-10-02 11:23:40.994600247 +0200
+--- /dev/null
++++ linux-2.6.18/drivers/ata/pata_pdc2027x.c
@@ -0,0 +1,868 @@
+/*
+ * Promise PATA TX2/TX4/TX2000/133 IDE driver for pdc20268 to pdc20277.
@@ -29060,9 +29093,8 @@
+
+module_init(pdc2027x_init);
+module_exit(pdc2027x_exit);
-diff -purN linux-2.6/drivers/ata/pata_pdc202xx_old.c libata-dev/drivers/ata/pata_pdc202xx_old.c
---- linux-2.6/drivers/ata/pata_pdc202xx_old.c 1970-01-01 01:00:00.000000000 +0100
-+++ libata-dev/drivers/ata/pata_pdc202xx_old.c 2006-10-02 11:23:41.001599292 +0200
+--- /dev/null
++++ linux-2.6.18/drivers/ata/pata_pdc202xx_old.c
@@ -0,0 +1,422 @@
+/*
+ * pata_pdc202xx_old.c - Promise PDC202xx PATA for new ATA layer
@@ -29486,9 +29518,8 @@
+
+module_init(pdc_init);
+module_exit(pdc_exit);
-diff -purN linux-2.6/drivers/ata/pata_qdi.c libata-dev/drivers/ata/pata_qdi.c
---- linux-2.6/drivers/ata/pata_qdi.c 1970-01-01 01:00:00.000000000 +0100
-+++ libata-dev/drivers/ata/pata_qdi.c 2006-09-29 08:39:45.000000000 +0200
+--- /dev/null
++++ linux-2.6.18/drivers/ata/pata_qdi.c
@@ -0,0 +1,403 @@
+/*
+ * pata_qdi.c - QDI VLB ATA controllers
@@ -29893,9 +29924,8 @@
+
+module_param(probe_qdi, int, 0);
+
-diff -purN linux-2.6/drivers/ata/pata_radisys.c libata-dev/drivers/ata/pata_radisys.c
---- linux-2.6/drivers/ata/pata_radisys.c 1970-01-01 01:00:00.000000000 +0100
-+++ libata-dev/drivers/ata/pata_radisys.c 2006-10-02 11:23:41.008598338 +0200
+--- /dev/null
++++ linux-2.6.18/drivers/ata/pata_radisys.c
@@ -0,0 +1,333 @@
+/*
+ * pata_radisys.c - Intel PATA/SATA controllers
@@ -30230,9 +30260,8 @@
+MODULE_DEVICE_TABLE(pci, radisys_pci_tbl);
+MODULE_VERSION(DRV_VERSION);
+
-diff -purN linux-2.6/drivers/ata/pata_rz1000.c libata-dev/drivers/ata/pata_rz1000.c
---- linux-2.6/drivers/ata/pata_rz1000.c 1970-01-01 01:00:00.000000000 +0100
-+++ libata-dev/drivers/ata/pata_rz1000.c 2006-10-02 11:23:41.014597520 +0200
+--- /dev/null
++++ linux-2.6.18/drivers/ata/pata_rz1000.c
@@ -0,0 +1,205 @@
+/*
+ * RZ1000/1001 driver based upon
@@ -30439,9 +30468,8 @@
+module_init(rz1000_init);
+module_exit(rz1000_exit);
+
-diff -purN linux-2.6/drivers/ata/pata_sc1200.c libata-dev/drivers/ata/pata_sc1200.c
---- linux-2.6/drivers/ata/pata_sc1200.c 1970-01-01 01:00:00.000000000 +0100
-+++ libata-dev/drivers/ata/pata_sc1200.c 2006-10-02 11:23:41.021596565 +0200
+--- /dev/null
++++ linux-2.6.18/drivers/ata/pata_sc1200.c
@@ -0,0 +1,286 @@
+/*
+ * New ATA layer SC1200 driver Alan Cox
@@ -30729,9 +30757,8 @@
+
+module_init(sc1200_init);
+module_exit(sc1200_exit);
-diff -purN linux-2.6/drivers/ata/pata_serverworks.c libata-dev/drivers/ata/pata_serverworks.c
---- linux-2.6/drivers/ata/pata_serverworks.c 1970-01-01 01:00:00.000000000 +0100
-+++ libata-dev/drivers/ata/pata_serverworks.c 2006-10-02 11:23:41.027595747 +0200
+--- /dev/null
++++ linux-2.6.18/drivers/ata/pata_serverworks.c
@@ -0,0 +1,590 @@
+/*
+ * ata-serverworks.c - Serverworks PATA for new ATA layer
@@ -31323,9 +31350,8 @@
+
+module_init(serverworks_init);
+module_exit(serverworks_exit);
-diff -purN linux-2.6/drivers/ata/pata_sil680.c libata-dev/drivers/ata/pata_sil680.c
---- linux-2.6/drivers/ata/pata_sil680.c 1970-01-01 01:00:00.000000000 +0100
-+++ libata-dev/drivers/ata/pata_sil680.c 2006-10-02 11:23:41.034594792 +0200
+--- /dev/null
++++ linux-2.6.18/drivers/ata/pata_sil680.c
@@ -0,0 +1,380 @@
+/*
+ * pata_sil680.c - SIL680 PATA for new ATA layer
@@ -31707,9 +31733,8 @@
+
+module_init(sil680_init);
+module_exit(sil680_exit);
-diff -purN linux-2.6/drivers/ata/pata_sis.c libata-dev/drivers/ata/pata_sis.c
---- linux-2.6/drivers/ata/pata_sis.c 1970-01-01 01:00:00.000000000 +0100
-+++ libata-dev/drivers/ata/pata_sis.c 2006-10-02 11:23:41.043593565 +0200
+--- /dev/null
++++ linux-2.6.18/drivers/ata/pata_sis.c
@@ -0,0 +1,1022 @@
+/*
+ * pata_sis.c - SiS ATA driver
@@ -32558,7 +32583,7 @@
+ struct sis_chipset *chipset = NULL;
+
+ static struct sis_chipset sis_chipsets[] = {
-+
++
+ { 0x0968, &sis_info133 },
+ { 0x0966, &sis_info133 },
+ { 0x0965, &sis_info133 },
@@ -32733,9 +32758,8 @@
+MODULE_DEVICE_TABLE(pci, sis_pci_tbl);
+MODULE_VERSION(DRV_VERSION);
+
-diff -purN linux-2.6/drivers/ata/pata_sl82c105.c libata-dev/drivers/ata/pata_sl82c105.c
---- linux-2.6/drivers/ata/pata_sl82c105.c 1970-01-01 01:00:00.000000000 +0100
-+++ libata-dev/drivers/ata/pata_sl82c105.c 2006-10-02 11:23:41.050592610 +0200
+--- /dev/null
++++ linux-2.6.18/drivers/ata/pata_sl82c105.c
@@ -0,0 +1,384 @@
+/*
+ * pata_sl82c105.c - SL82C105 PATA for new ATA layer
@@ -33121,9 +33145,8 @@
+
+module_init(sl82c105_init);
+module_exit(sl82c105_exit);
-diff -purN linux-2.6/drivers/ata/pata_triflex.c libata-dev/drivers/ata/pata_triflex.c
---- linux-2.6/drivers/ata/pata_triflex.c 1970-01-01 01:00:00.000000000 +0100
-+++ libata-dev/drivers/ata/pata_triflex.c 2006-10-02 11:23:41.056591792 +0200
+--- /dev/null
++++ linux-2.6.18/drivers/ata/pata_triflex.c
@@ -0,0 +1,280 @@
+/*
+ * pata_triflex.c - Compaq PATA for new ATA layer
@@ -33405,9 +33428,8 @@
+
+module_init(triflex_init);
+module_exit(triflex_exit);
-diff -purN linux-2.6/drivers/ata/pata_via.c libata-dev/drivers/ata/pata_via.c
---- linux-2.6/drivers/ata/pata_via.c 1970-01-01 01:00:00.000000000 +0100
-+++ libata-dev/drivers/ata/pata_via.c 2006-10-02 11:23:41.063590837 +0200
+--- /dev/null
++++ linux-2.6.18/drivers/ata/pata_via.c
@@ -0,0 +1,564 @@
+/*
+ * pata_via.c - VIA PATA for new ATA layer
@@ -33973,9 +33995,8 @@
+
+module_init(via_init);
+module_exit(via_exit);
-diff -purN linux-2.6/drivers/ata/pdc_adma.c libata-dev/drivers/ata/pdc_adma.c
---- linux-2.6/drivers/ata/pdc_adma.c 1970-01-01 01:00:00.000000000 +0100
-+++ libata-dev/drivers/ata/pdc_adma.c 2006-10-02 11:23:41.071589746 +0200
+--- /dev/null
++++ linux-2.6.18/drivers/ata/pdc_adma.c
@@ -0,0 +1,739 @@
+/*
+ * pdc_adma.c - Pacific Digital Corporation ADMA
@@ -34716,9 +34737,8 @@
+
+module_init(adma_ata_init);
+module_exit(adma_ata_exit);
-diff -purN linux-2.6/drivers/ata/sata_mv.c libata-dev/drivers/ata/sata_mv.c
---- linux-2.6/drivers/ata/sata_mv.c 1970-01-01 01:00:00.000000000 +0100
-+++ libata-dev/drivers/ata/sata_mv.c 2006-10-02 11:23:41.083588110 +0200
+--- /dev/null
++++ linux-2.6.18/drivers/ata/sata_mv.c
@@ -0,0 +1,2467 @@
+/*
+ * sata_mv.c - Marvell SATA support
@@ -37187,9 +37207,8 @@
+
+module_init(mv_init);
+module_exit(mv_exit);
-diff -purN linux-2.6/drivers/ata/sata_nv.c libata-dev/drivers/ata/sata_nv.c
---- linux-2.6/drivers/ata/sata_nv.c 1970-01-01 01:00:00.000000000 +0100
-+++ libata-dev/drivers/ata/sata_nv.c 2006-10-02 11:23:41.127582109 +0200
+--- /dev/null
++++ linux-2.6.18/drivers/ata/sata_nv.c
@@ -0,0 +1,582 @@
+/*
+ * sata_nv.c - NVIDIA nForce SATA
@@ -37773,9 +37792,8 @@
+
+module_init(nv_init);
+module_exit(nv_exit);
-diff -purN linux-2.6/drivers/ata/sata_promise.c libata-dev/drivers/ata/sata_promise.c
---- linux-2.6/drivers/ata/sata_promise.c 1970-01-01 01:00:00.000000000 +0100
-+++ libata-dev/drivers/ata/sata_promise.c 2006-10-02 11:23:41.135581018 +0200
+--- /dev/null
++++ linux-2.6.18/drivers/ata/sata_promise.c
@@ -0,0 +1,827 @@
+/*
+ * sata_promise.c - Promise SATA
@@ -38604,9 +38622,8 @@
+
+module_init(pdc_ata_init);
+module_exit(pdc_ata_exit);
-diff -purN linux-2.6/drivers/ata/sata_promise.h libata-dev/drivers/ata/sata_promise.h
---- linux-2.6/drivers/ata/sata_promise.h 1970-01-01 01:00:00.000000000 +0100
-+++ libata-dev/drivers/ata/sata_promise.h 2006-09-29 08:39:46.000000000 +0200
+--- /dev/null
++++ linux-2.6.18/drivers/ata/sata_promise.h
@@ -0,0 +1,157 @@
+/*
+ * sata_promise.h - Promise SATA common definitions and inline funcs
@@ -38765,9 +38782,8 @@
+
+
+#endif /* __SATA_PROMISE_H__ */
-diff -purN linux-2.6/drivers/ata/sata_qstor.c libata-dev/drivers/ata/sata_qstor.c
---- linux-2.6/drivers/ata/sata_qstor.c 1970-01-01 01:00:00.000000000 +0100
-+++ libata-dev/drivers/ata/sata_qstor.c 2006-10-02 11:23:41.143579927 +0200
+--- /dev/null
++++ linux-2.6.18/drivers/ata/sata_qstor.c
@@ -0,0 +1,729 @@
+/*
+ * sata_qstor.c - Pacific Digital Corporation QStor SATA
@@ -39498,9 +39514,8 @@
+
+module_init(qs_ata_init);
+module_exit(qs_ata_exit);
-diff -purN linux-2.6/drivers/ata/sata_sil24.c libata-dev/drivers/ata/sata_sil24.c
---- linux-2.6/drivers/ata/sata_sil24.c 1970-01-01 01:00:00.000000000 +0100
-+++ libata-dev/drivers/ata/sata_sil24.c 2006-10-02 11:23:41.160577609 +0200
+--- /dev/null
++++ linux-2.6.18/drivers/ata/sata_sil24.c
@@ -0,0 +1,1228 @@
+/*
+ * sata_sil24.c - Driver for Silicon Image 3124/3132 SATA-2 controllers
@@ -40730,9 +40745,8 @@
+
+module_init(sil24_init);
+module_exit(sil24_exit);
-diff -purN linux-2.6/drivers/ata/sata_sil.c libata-dev/drivers/ata/sata_sil.c
---- linux-2.6/drivers/ata/sata_sil.c 1970-01-01 01:00:00.000000000 +0100
-+++ libata-dev/drivers/ata/sata_sil.c 2006-10-02 11:23:41.150578972 +0200
+--- /dev/null
++++ linux-2.6.18/drivers/ata/sata_sil.c
@@ -0,0 +1,729 @@
+/*
+ * sata_sil.c - Silicon Image SATA
@@ -41463,9 +41477,8 @@
+
+module_init(sil_init);
+module_exit(sil_exit);
-diff -purN linux-2.6/drivers/ata/sata_sis.c libata-dev/drivers/ata/sata_sis.c
---- linux-2.6/drivers/ata/sata_sis.c 1970-01-01 01:00:00.000000000 +0100
-+++ libata-dev/drivers/ata/sata_sis.c 2006-10-02 11:23:41.167576654 +0200
+--- /dev/null
++++ linux-2.6.18/drivers/ata/sata_sis.c
@@ -0,0 +1,347 @@
+/*
+ * sata_sis.c - Silicon Integrated Systems SATA
@@ -41814,9 +41827,8 @@
+module_init(sis_init);
+module_exit(sis_exit);
+
-diff -purN linux-2.6/drivers/ata/sata_svw.c libata-dev/drivers/ata/sata_svw.c
---- linux-2.6/drivers/ata/sata_svw.c 1970-01-01 01:00:00.000000000 +0100
-+++ libata-dev/drivers/ata/sata_svw.c 2006-10-02 11:23:41.174575699 +0200
+--- /dev/null
++++ linux-2.6.18/drivers/ata/sata_svw.c
@@ -0,0 +1,505 @@
+/*
+ * sata_svw.c - ServerWorks / Apple K2 SATA
@@ -42323,9 +42335,8 @@
+
+module_init(k2_sata_init);
+module_exit(k2_sata_exit);
-diff -purN linux-2.6/drivers/ata/sata_sx4.c libata-dev/drivers/ata/sata_sx4.c
---- linux-2.6/drivers/ata/sata_sx4.c 1970-01-01 01:00:00.000000000 +0100
-+++ libata-dev/drivers/ata/sata_sx4.c 2006-10-02 11:23:41.183574472 +0200
+--- /dev/null
++++ linux-2.6.18/drivers/ata/sata_sx4.c
@@ -0,0 +1,1501 @@
+/*
+ * sata_sx4.c - Promise SATA
@@ -43828,9 +43839,8 @@
+
+module_init(pdc_sata_init);
+module_exit(pdc_sata_exit);
-diff -purN linux-2.6/drivers/ata/sata_uli.c libata-dev/drivers/ata/sata_uli.c
---- linux-2.6/drivers/ata/sata_uli.c 1970-01-01 01:00:00.000000000 +0100
-+++ libata-dev/drivers/ata/sata_uli.c 2006-10-02 11:23:41.190573517 +0200
+--- /dev/null
++++ linux-2.6.18/drivers/ata/sata_uli.c
@@ -0,0 +1,300 @@
+/*
+ * sata_uli.c - ULi Electronics SATA
@@ -44132,9 +44142,8 @@
+
+module_init(uli_init);
+module_exit(uli_exit);
-diff -purN linux-2.6/drivers/ata/sata_via.c libata-dev/drivers/ata/sata_via.c
---- linux-2.6/drivers/ata/sata_via.c 1970-01-01 01:00:00.000000000 +0100
-+++ libata-dev/drivers/ata/sata_via.c 2006-10-02 11:23:41.197572563 +0200
+--- /dev/null
++++ linux-2.6.18/drivers/ata/sata_via.c
@@ -0,0 +1,503 @@
+/*
+ * sata_via.c - VIA Serial ATA controllers
@@ -44457,7 +44466,7 @@
+{
+ struct ata_probe_ent *probe_ent;
+ struct ata_port_info *ppi[2];
-+
++
+ ppi[0] = ppi[1] = &vt6420_port_info;
+ probe_ent = ata_pci_init_native_mode(pdev, ppi, ATA_PORT_PRIMARY | ATA_PORT_SECONDARY);
+ if (!probe_ent)
@@ -44639,9 +44648,8 @@
+module_init(svia_init);
+module_exit(svia_exit);
+
-diff -purN linux-2.6/drivers/ata/sata_vsc.c libata-dev/drivers/ata/sata_vsc.c
---- linux-2.6/drivers/ata/sata_vsc.c 1970-01-01 01:00:00.000000000 +0100
-+++ libata-dev/drivers/ata/sata_vsc.c 2006-10-02 11:23:41.204571608 +0200
+--- /dev/null
++++ linux-2.6.18/drivers/ata/sata_vsc.c
@@ -0,0 +1,478 @@
+/*
+ * sata_vsc.c - Vitesse VSC7174 4 port DPA SATA
@@ -45121,9 +45129,9 @@
+
+module_init(vsc_sata_init);
+module_exit(vsc_sata_exit);
---- linux-2.6/drivers/Makefile 2006-10-02 12:04:28.629453797 +0200
-+++ libata-dev/drivers/Makefile 2006-09-29 08:39:44.000000000 +0200
-@@ -35,6 +35,7 @@ obj-$(CONFIG_PPC_PMAC) += macintosh/
+--- linux-2.6.18.orig/drivers/Makefile
++++ linux-2.6.18/drivers/Makefile
+@@ -34,6 +34,7 @@ obj-$(CONFIG_PPC_PMAC) += macintosh/
obj-$(CONFIG_IDE) += ide/
obj-$(CONFIG_FC4) += fc4/
obj-$(CONFIG_SCSI) += scsi/
@@ -45131,8 +45139,8 @@
obj-$(CONFIG_FUSION) += message/
obj-$(CONFIG_IEEE1394) += ieee1394/
obj-y += cdrom/
---- linux-2.6/drivers/Kconfig 2006-10-02 12:04:28.624454479 +0200
-+++ libata-dev/drivers/Kconfig 2006-09-29 08:39:44.000000000 +0200
+--- linux-2.6.18.orig/drivers/Kconfig
++++ linux-2.6.18/drivers/Kconfig
@@ -18,6 +18,8 @@ source "drivers/ide/Kconfig"
source "drivers/scsi/Kconfig"
@@ -45142,8 +45150,8 @@
source "drivers/cdrom/Kconfig"
source "drivers/md/Kconfig"
---- linux-2.6/include/linux/libata.h 2006-10-02 12:04:49.000000000 +0200
-+++ libata-dev/include/linux/libata.h 2006-10-02 13:19:04.983633243 +0200
+--- linux-2.6.18.orig/include/linux/libata.h
++++ linux-2.6.18/include/linux/libata.h
@@ -37,6 +37,16 @@
#include
@@ -45228,7 +45236,7 @@
* most devices.
*/
ATA_SPINUP_WAIT = 8000,
-+
++
+ /* Horkage types. May be set by libata or controller on drives
+ (some horkage may be drive/controller pair dependant */
+
@@ -45440,8 +45448,8 @@
extern struct ata_probe_ent *
ata_pci_init_native_mode(struct pci_dev *pdev, struct ata_port_info **port, int portmask);
extern int pci_test_config_bits(struct pci_dev *pdev, const struct pci_bits *bits);
---- linux-2.6/include/asm-generic/libata-portmap.h 1970-01-01 01:00:00.000000000 +0100
-+++ libata-dev/include/asm-generic/libata-portmap.h 2006-09-29 08:40:28.000000000 +0200
+--- /dev/null
++++ linux-2.6.18/include/asm-generic/libata-portmap.h
@@ -0,0 +1,12 @@
+#ifndef __ASM_GENERIC_LIBATA_PORTMAP_H
+#define __ASM_GENERIC_LIBATA_PORTMAP_H
@@ -45455,8 +45463,8 @@
+#define ATA_SECONDARY_IRQ 15
+
+#endif
---- linux-2.6/include/linux/ata.h 2006-10-02 12:04:48.000000000 +0200
-+++ libata-dev/include/linux/ata.h 2006-09-29 08:40:40.000000000 +0200
+--- linux-2.6.18.orig/include/linux/ata.h
++++ linux-2.6.18/include/linux/ata.h
@@ -40,6 +40,8 @@ enum {
ATA_MAX_DEVICES = 2, /* per bus/port */
ATA_MAX_PRD = 256, /* we could make these 256/256 */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.drivers/libata-remove-from-scsi new/patches.drivers/libata-remove-from-scsi
--- old/patches.drivers/libata-remove-from-scsi 2006-10-02 15:16:26.000000000 +0200
+++ new/patches.drivers/libata-remove-from-scsi 2006-10-16 17:56:31.000000000 +0200
@@ -1,6 +1,31 @@
-diff -purN linux-2.6/drivers/scsi/ahci.c libata-dev/drivers/scsi/ahci.c
---- linux-2.6/drivers/scsi/ahci.c 2006-10-02 12:04:39.299998593 +0200
-+++ libata-dev/drivers/scsi/ahci.c 1970-01-01 01:00:00.000000000 +0100
+---
+ drivers/scsi/ahci.c | 1473 ----------
+ drivers/scsi/ata_piix.c | 1040 -------
+ drivers/scsi/libata-bmdma.c | 1149 --------
+ drivers/scsi/libata-core.c | 6020 --------------------------------------------
+ drivers/scsi/libata-eh.c | 2246 ----------------
+ drivers/scsi/libata-scsi.c | 3173 -----------------------
+ drivers/scsi/libata.h | 117
+ drivers/scsi/pdc_adma.c | 740 -----
+ drivers/scsi/sata_mv.c | 2468 ------------------
+ drivers/scsi/sata_nv.c | 595 ----
+ drivers/scsi/sata_promise.c | 844 ------
+ drivers/scsi/sata_promise.h | 157 -
+ drivers/scsi/sata_qstor.c | 730 -----
+ drivers/scsi/sata_sil.c | 727 -----
+ drivers/scsi/sata_sil24.c | 1222 --------
+ drivers/scsi/sata_sis.c | 347 --
+ drivers/scsi/sata_svw.c | 508 ---
+ drivers/scsi/sata_sx4.c | 1502 ----------
+ drivers/scsi/sata_uli.c | 300 --
+ drivers/scsi/sata_via.c | 502 ---
+ drivers/scsi/sata_vsc.c | 482 ---
+ drivers/scsi/Kconfig | 138 -
+ drivers/scsi/Makefile | 16
+ 23 files changed, 26496 deletions(-)
+
+--- linux-2.6.18.orig/drivers/scsi/ahci.c
++++ /dev/null
@@ -1,1473 +0,0 @@
-/*
- * ahci.c - AHCI SATA support
@@ -1475,9 +1500,8 @@
-
-module_init(ahci_init);
-module_exit(ahci_exit);
-diff -purN linux-2.6/drivers/scsi/ata_piix.c libata-dev/drivers/scsi/ata_piix.c
---- linux-2.6/drivers/scsi/ata_piix.c 2006-10-02 12:04:39.454977458 +0200
-+++ libata-dev/drivers/scsi/ata_piix.c 1970-01-01 01:00:00.000000000 +0100
+--- linux-2.6.18.orig/drivers/scsi/ata_piix.c
++++ /dev/null
@@ -1,1040 +0,0 @@
-/*
- * ata_piix.c - Intel PATA/SATA controllers
@@ -2519,10 +2543,9 @@
-module_init(piix_init);
-module_exit(piix_exit);
-
-diff -purN linux-2.6/drivers/scsi/Kconfig libata-dev/drivers/scsi/Kconfig
---- linux-2.6/drivers/scsi/Kconfig 2006-10-02 12:04:39.078028865 +0200
-+++ libata-dev/drivers/scsi/Kconfig 2006-10-02 11:23:47.137762349 +0200
-@@ -471,67 +477,6 @@ config SCSI_IN2000
+--- linux-2.6.18.orig/drivers/scsi/Kconfig
++++ linux-2.6.18/drivers/scsi/Kconfig
+@@ -471,67 +471,6 @@ config SCSI_IN2000
source "drivers/scsi/megaraid/Kconfig.megaraid"
@@ -2590,7 +2613,7 @@
config SCSI_HPTIOP
tristate "HighPoint RocketRAID 3xxx Controller support"
depends on SCSI && PCI
-@@ -542,83 +487,6 @@ config SCSI_HPTIOP
+@@ -542,83 +481,6 @@ config SCSI_HPTIOP
To compile this driver as a module, choose M here; the module
will be called hptiop. If unsure, say N.
@@ -2674,9 +2697,8 @@
config SCSI_BUSLOGIC
tristate "BusLogic SCSI support"
depends on (PCI || ISA || MCA) && SCSI && ISA_DMA_API
-diff -purN linux-2.6/drivers/scsi/libata-bmdma.c libata-dev/drivers/scsi/libata-bmdma.c
---- linux-2.6/drivers/scsi/libata-bmdma.c 2006-10-02 12:04:39.629953595 +0200
-+++ libata-dev/drivers/scsi/libata-bmdma.c 1970-01-01 01:00:00.000000000 +0100
+--- linux-2.6.18.orig/drivers/scsi/libata-bmdma.c
++++ /dev/null
@@ -1,1149 +0,0 @@
-/*
- * libata-bmdma.c - helper library for PCI IDE BMDMA
@@ -3827,9 +3849,8 @@
-
-#endif /* CONFIG_PCI */
-
-diff -purN linux-2.6/drivers/scsi/libata-core.c libata-dev/drivers/scsi/libata-core.c
---- linux-2.6/drivers/scsi/libata-core.c 2006-10-02 12:04:39.647951141 +0200
-+++ libata-dev/drivers/scsi/libata-core.c 1970-01-01 01:00:00.000000000 +0100
+--- linux-2.6.18.orig/drivers/scsi/libata-core.c
++++ /dev/null
@@ -1,6020 +0,0 @@
-/*
- * libata-core.c - helper library for ATA
@@ -9851,9 +9872,8 @@
-EXPORT_SYMBOL_GPL(ata_eh_qc_complete);
-EXPORT_SYMBOL_GPL(ata_eh_qc_retry);
-EXPORT_SYMBOL_GPL(ata_do_eh);
-diff -purN linux-2.6/drivers/scsi/libata-eh.c libata-dev/drivers/scsi/libata-eh.c
---- linux-2.6/drivers/scsi/libata-eh.c 2006-10-02 12:04:39.656949914 +0200
-+++ libata-dev/drivers/scsi/libata-eh.c 1970-01-01 01:00:00.000000000 +0100
+--- linux-2.6.18.orig/drivers/scsi/libata-eh.c
++++ /dev/null
@@ -1,2246 +0,0 @@
-/*
- * libata-eh.c - libata error handling
@@ -12101,9 +12121,8 @@
- }
- spin_unlock_irqrestore(ap->lock, flags);
-}
-diff -purN linux-2.6/drivers/scsi/libata.h libata-dev/drivers/scsi/libata.h
---- linux-2.6/drivers/scsi/libata.h 2006-10-02 12:04:39.672947732 +0200
-+++ libata-dev/drivers/scsi/libata.h 1970-01-01 01:00:00.000000000 +0100
+--- linux-2.6.18.orig/drivers/scsi/libata.h
++++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * libata.h - helper library for ATA
@@ -12222,9 +12241,8 @@
-extern void ata_qc_schedule_eh(struct ata_queued_cmd *qc);
-
-#endif /* __LIBATA_H__ */
-diff -purN linux-2.6/drivers/scsi/libata-scsi.c libata-dev/drivers/scsi/libata-scsi.c
---- linux-2.6/drivers/scsi/libata-scsi.c 2006-10-02 12:04:39.668948277 +0200
-+++ libata-dev/drivers/scsi/libata-scsi.c 1970-01-01 01:00:00.000000000 +0100
+--- linux-2.6.18.orig/drivers/scsi/libata-scsi.c
++++ /dev/null
@@ -1,3173 +0,0 @@
-/*
- * libata-scsi.c - helper library for ATA
@@ -15399,10 +15417,9 @@
- scsi_rescan_device(&(dev->sdev->sdev_gendev));
- }
-}
-diff -purN linux-2.6/drivers/scsi/Makefile libata-dev/drivers/scsi/Makefile
---- linux-2.6/drivers/scsi/Makefile 2006-10-02 12:04:39.084028046 +0200
-+++ libata-dev/drivers/scsi/Makefile 2006-09-29 08:40:08.000000000 +0200
-@@ -122,22 +125,7 @@ obj-$(CONFIG_SCSI_LASI700) += 53c700.o l
+--- linux-2.6.18.orig/drivers/scsi/Makefile
++++ linux-2.6.18/drivers/scsi/Makefile
+@@ -122,21 +122,6 @@ obj-$(CONFIG_SCSI_LASI700) += 53c700.o l
obj-$(CONFIG_SCSI_NSP32) += nsp32.o
obj-$(CONFIG_SCSI_IPR) += ipr.o
obj-$(CONFIG_SCSI_IBMVSCSI) += ibmvscsi/
@@ -15424,8 +15441,7 @@
obj-$(CONFIG_SCSI_HPTIOP) += hptiop.o
obj-$(CONFIG_ARM) += arm/
-
-@@ -166,7 +156,6 @@ ncr53c8xx-flags-$(CONFIG_SCSI_ZALON) \
+@@ -166,7 +151,6 @@ ncr53c8xx-flags-$(CONFIG_SCSI_ZALON) \
CFLAGS_ncr53c8xx.o := $(ncr53c8xx-flags-y) $(ncr53c8xx-flags-m)
zalon7xx-objs := zalon.o ncr53c8xx.o
NCR_Q720_mod-objs := NCR_Q720.o ncr53c8xx.o
@@ -15433,9 +15449,8 @@
oktagon_esp_mod-objs := oktagon_esp.o oktagon_io.o
# Files generated that shall be removed upon make clean
-diff -purN linux-2.6/drivers/scsi/pdc_adma.c libata-dev/drivers/scsi/pdc_adma.c
---- linux-2.6/drivers/scsi/pdc_adma.c 2006-10-02 12:04:39.908915552 +0200
-+++ libata-dev/drivers/scsi/pdc_adma.c 1970-01-01 01:00:00.000000000 +0100
+--- linux-2.6.18.orig/drivers/scsi/pdc_adma.c
++++ /dev/null
@@ -1,740 +0,0 @@
-/*
- * pdc_adma.c - Pacific Digital Corporation ADMA
@@ -16177,10 +16192,9 @@
-
-module_init(adma_ata_init);
-module_exit(adma_ata_exit);
-diff -purN linux-2.6/drivers/scsi/sata_mv.c libata-dev/drivers/scsi/sata_mv.c
---- linux-2.6/drivers/scsi/sata_mv.c 2006-10-02 12:04:39.944910643 +0200
-+++ libata-dev/drivers/scsi/sata_mv.c 1970-01-01 01:00:00.000000000 +0100
-@@ -1,2467 +0,0 @@
+--- linux-2.6.18.orig/drivers/scsi/sata_mv.c
++++ /dev/null
+@@ -1,2468 +0,0 @@
-/*
- * sata_mv.c - Marvell SATA support
- *
@@ -16646,6 +16660,7 @@
-
- .qc_prep = mv_qc_prep_iie,
- .qc_issue = mv_qc_issue,
+- .data_xfer = ata_mmio_data_xfer,
-
- .eng_timeout = mv_eng_timeout,
-
@@ -18648,9 +18663,8 @@
-
-module_init(mv_init);
-module_exit(mv_exit);
-diff -purN linux-2.6/drivers/scsi/sata_nv.c libata-dev/drivers/scsi/sata_nv.c
---- linux-2.6/drivers/scsi/sata_nv.c 2006-10-02 12:04:39.950909825 +0200
-+++ libata-dev/drivers/scsi/sata_nv.c 1970-01-01 01:00:00.000000000 +0100
+--- linux-2.6.18.orig/drivers/scsi/sata_nv.c
++++ /dev/null
@@ -1,595 +0,0 @@
-/*
- * sata_nv.c - NVIDIA nForce SATA
@@ -19247,9 +19261,8 @@
-
-module_init(nv_init);
-module_exit(nv_exit);
-diff -purN linux-2.6/drivers/scsi/sata_promise.c libata-dev/drivers/scsi/sata_promise.c
---- linux-2.6/drivers/scsi/sata_promise.c 2006-10-02 12:04:39.956909006 +0200
-+++ libata-dev/drivers/scsi/sata_promise.c 1970-01-01 01:00:00.000000000 +0100
+--- linux-2.6.18.orig/drivers/scsi/sata_promise.c
++++ /dev/null
@@ -1,844 +0,0 @@
-/*
- * sata_promise.c - Promise SATA
@@ -20095,9 +20108,8 @@
-
-module_init(pdc_ata_init);
-module_exit(pdc_ata_exit);
-diff -purN linux-2.6/drivers/scsi/sata_promise.h libata-dev/drivers/scsi/sata_promise.h
---- linux-2.6/drivers/scsi/sata_promise.h 2006-10-02 12:04:39.960908461 +0200
-+++ libata-dev/drivers/scsi/sata_promise.h 1970-01-01 01:00:00.000000000 +0100
+--- linux-2.6.18.orig/drivers/scsi/sata_promise.h
++++ /dev/null
@@ -1,157 +0,0 @@
-/*
- * sata_promise.h - Promise SATA common definitions and inline funcs
@@ -20256,9 +20268,8 @@
-
-
-#endif /* __SATA_PROMISE_H__ */
-diff -purN linux-2.6/drivers/scsi/sata_qstor.c libata-dev/drivers/scsi/sata_qstor.c
---- linux-2.6/drivers/scsi/sata_qstor.c 2006-10-02 12:04:39.966907643 +0200
-+++ libata-dev/drivers/scsi/sata_qstor.c 1970-01-01 01:00:00.000000000 +0100
+--- linux-2.6.18.orig/drivers/scsi/sata_qstor.c
++++ /dev/null
@@ -1,730 +0,0 @@
-/*
- * sata_qstor.c - Pacific Digital Corporation QStor SATA
@@ -20990,9 +21001,8 @@
-
-module_init(qs_ata_init);
-module_exit(qs_ata_exit);
-diff -purN linux-2.6/drivers/scsi/sata_sil24.c libata-dev/drivers/scsi/sata_sil24.c
---- linux-2.6/drivers/scsi/sata_sil24.c 2006-10-02 12:04:39.979905870 +0200
-+++ libata-dev/drivers/scsi/sata_sil24.c 1970-01-01 01:00:00.000000000 +0100
+--- linux-2.6.18.orig/drivers/scsi/sata_sil24.c
++++ /dev/null
@@ -1,1222 +0,0 @@
-/*
- * sata_sil24.c - Driver for Silicon Image 3124/3132 SATA-2 controllers
@@ -22216,9 +22226,8 @@
-
-module_init(sil24_init);
-module_exit(sil24_exit);
-diff -purN linux-2.6/drivers/scsi/sata_sil.c libata-dev/drivers/scsi/sata_sil.c
---- linux-2.6/drivers/scsi/sata_sil.c 2006-10-02 12:04:39.972906825 +0200
-+++ libata-dev/drivers/scsi/sata_sil.c 1970-01-01 01:00:00.000000000 +0100
+--- linux-2.6.18.orig/drivers/scsi/sata_sil.c
++++ /dev/null
@@ -1,727 +0,0 @@
-/*
- * sata_sil.c - Silicon Image SATA
@@ -22947,9 +22956,8 @@
-
-module_init(sil_init);
-module_exit(sil_exit);
-diff -purN linux-2.6/drivers/scsi/sata_sis.c libata-dev/drivers/scsi/sata_sis.c
---- linux-2.6/drivers/scsi/sata_sis.c 2006-10-02 12:04:39.984905188 +0200
-+++ libata-dev/drivers/scsi/sata_sis.c 1970-01-01 01:00:00.000000000 +0100
+--- linux-2.6.18.orig/drivers/scsi/sata_sis.c
++++ /dev/null
@@ -1,347 +0,0 @@
-/*
- * sata_sis.c - Silicon Integrated Systems SATA
@@ -23298,9 +23306,8 @@
-module_init(sis_init);
-module_exit(sis_exit);
-
-diff -purN linux-2.6/drivers/scsi/sata_svw.c libata-dev/drivers/scsi/sata_svw.c
---- linux-2.6/drivers/scsi/sata_svw.c 2006-10-02 12:04:39.989904507 +0200
-+++ libata-dev/drivers/scsi/sata_svw.c 1970-01-01 01:00:00.000000000 +0100
+--- linux-2.6.18.orig/drivers/scsi/sata_svw.c
++++ /dev/null
@@ -1,508 +0,0 @@
-/*
- * sata_svw.c - ServerWorks / Apple K2 SATA
@@ -23810,9 +23817,8 @@
-
-module_init(k2_sata_init);
-module_exit(k2_sata_exit);
-diff -purN linux-2.6/drivers/scsi/sata_sx4.c libata-dev/drivers/scsi/sata_sx4.c
---- linux-2.6/drivers/scsi/sata_sx4.c 2006-10-02 12:04:39.997903416 +0200
-+++ libata-dev/drivers/scsi/sata_sx4.c 1970-01-01 01:00:00.000000000 +0100
+--- linux-2.6.18.orig/drivers/scsi/sata_sx4.c
++++ /dev/null
@@ -1,1502 +0,0 @@
-/*
- * sata_sx4.c - Promise SATA
@@ -25316,9 +25322,8 @@
-
-module_init(pdc_sata_init);
-module_exit(pdc_sata_exit);
-diff -purN linux-2.6/drivers/scsi/sata_uli.c libata-dev/drivers/scsi/sata_uli.c
---- linux-2.6/drivers/scsi/sata_uli.c 2006-10-02 12:04:40.002902734 +0200
-+++ libata-dev/drivers/scsi/sata_uli.c 1970-01-01 01:00:00.000000000 +0100
+--- linux-2.6.18.orig/drivers/scsi/sata_uli.c
++++ /dev/null
@@ -1,300 +0,0 @@
-/*
- * sata_uli.c - ULi Electronics SATA
@@ -25620,9 +25625,8 @@
-
-module_init(uli_init);
-module_exit(uli_exit);
-diff -purN linux-2.6/drivers/scsi/sata_via.c libata-dev/drivers/scsi/sata_via.c
---- linux-2.6/drivers/scsi/sata_via.c 2006-10-02 12:04:40.007902052 +0200
-+++ libata-dev/drivers/scsi/sata_via.c 1970-01-01 01:00:00.000000000 +0100
+--- linux-2.6.18.orig/drivers/scsi/sata_via.c
++++ /dev/null
@@ -1,502 +0,0 @@
-/*
- * sata_via.c - VIA Serial ATA controllers
@@ -26126,9 +26130,8 @@
-module_init(svia_init);
-module_exit(svia_exit);
-
-diff -purN linux-2.6/drivers/scsi/sata_vsc.c libata-dev/drivers/scsi/sata_vsc.c
---- linux-2.6/drivers/scsi/sata_vsc.c 2006-10-02 12:04:40.012901370 +0200
-+++ libata-dev/drivers/scsi/sata_vsc.c 1970-01-01 01:00:00.000000000 +0100
+--- linux-2.6.18.orig/drivers/scsi/sata_vsc.c
++++ /dev/null
@@ -1,482 +0,0 @@
-/*
- * sata_vsc.c - Vitesse VSC7174 4 port DPA SATA
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.drivers/mpt-rport-stall new/patches.drivers/mpt-rport-stall
--- old/patches.drivers/mpt-rport-stall 2006-10-09 09:31:29.000000000 +0200
+++ new/patches.drivers/mpt-rport-stall 2006-10-16 17:56:31.000000000 +0200
@@ -20,9 +20,13 @@
Signed-off-by: Michael Reed
Signed-off-by: Hannes Reinecke
---- sl10u/drivers/message/fusion/mptfc.c 2006-05-23 22:56:25.000000000 -0500
-+++ sl10/drivers/message/fusion/mptfc.c 2006-09-28 13:41:05.560626925 -0500
-@@ -100,6 +100,10 @@ static int mptfc_qcmd(struct scsi_cmnd *
+---
+ drivers/message/fusion/mptfc.c | 89 +++++++++++++++++++++++++++++++++++++++--
+ 1 files changed, 85 insertions(+), 4 deletions(-)
+
+--- linux-2.6.18.orig/drivers/message/fusion/mptfc.c
++++ linux-2.6.18/drivers/message/fusion/mptfc.c
+@@ -96,6 +96,10 @@ static int mptfc_qcmd(struct scsi_cmnd *
static void mptfc_target_destroy(struct scsi_target *starget);
static void mptfc_set_rport_loss_tmo(struct fc_rport *rport, uint32_t timeout);
static void __devexit mptfc_remove(struct pci_dev *pdev);
@@ -33,7 +37,7 @@
static struct scsi_host_template mptfc_driver_template = {
.module = THIS_MODULE,
-@@ -114,10 +118,10 @@ static struct scsi_host_template mptfc_d
+@@ -110,10 +114,10 @@ static struct scsi_host_template mptfc_d
.target_destroy = mptfc_target_destroy,
.slave_destroy = mptscsih_slave_destroy,
.change_queue_depth = mptscsih_change_queue_depth,
@@ -48,7 +52,7 @@
.bios_param = mptscsih_bios_param,
.can_queue = MPT_FC_CAN_QUEUE,
.this_id = -1,
-@@ -170,6 +174,77 @@ static struct fc_function_template mptfc
+@@ -165,6 +169,77 @@ static struct fc_function_template mptfc
};
@@ -126,7 +130,7 @@
static void
mptfc_set_rport_loss_tmo(struct fc_rport *rport, uint32_t timeout)
{
-@@ -564,6 +639,12 @@ mptfc_qcmd(struct scsi_cmnd *SCpnt, void
+@@ -556,6 +631,12 @@ mptfc_qcmd(struct scsi_cmnd *SCpnt, void
return 0;
}
++++++ patches.fixes.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/grow_buffers-infinite-loop-fix.diff new/patches.fixes/grow_buffers-infinite-loop-fix.diff
--- old/patches.fixes/grow_buffers-infinite-loop-fix.diff 1970-01-01 01:00:00.000000000 +0100
+++ new/patches.fixes/grow_buffers-infinite-loop-fix.diff 2006-10-16 17:56:31.000000000 +0200
@@ -0,0 +1,71 @@
+From: Andrew Morton
+Date: Wed, 11 Oct 2006 08:21:46 +0000 (-0700)
+References: 205384
+Patch-Mainline: 2.6.19
+Subject: [PATCH] grow_buffers() infinite loop fix
+X-Git-Url: http://starscream/cgi-bin/gitweb.cgi?p=linux-2.6/.git;a=commitdiff;h=e565793...
+
+[PATCH] grow_buffers() infinite loop fix
+
+If grow_buffers() is for some reason passed a block number which wants to lie
+outside the maximum-addressable pagecache range (PAGE_SIZE * 4G bytes) then it
+will accidentally truncate `index' and will then instnatiate a page at the
+wrong pagecache offset. This causes __getblk_slow() to go into an infinite
+loop.
+
+This can happen with corrupted disks, or with software errors elsewhere.
+
+Detect that, and handle it.
+
+Signed-off-by: Andrew Morton
+Signed-off-by: Linus Torvalds
+Acked-by: Jeff Mahoney
+---
+
+---
+ fs/buffer.c | 21 +++++++++++++++++++--
+ 1 files changed, 19 insertions(+), 2 deletions(-)
+
+--- linux-2.6.18.orig/fs/buffer.c
++++ linux-2.6.18/fs/buffer.c
+@@ -1180,8 +1180,21 @@ grow_buffers(struct block_device *bdev,
+ } while ((size << sizebits) < PAGE_SIZE);
+
+ index = block >> sizebits;
+- block = index << sizebits;
+
++ /*
++ * Check for a block which wants to lie outside our maximum possible
++ * pagecache index. (this comparison is done using sector_t types).
++ */
++ if (unlikely(index != block >> sizebits)) {
++ char b[BDEVNAME_SIZE];
++
++ printk(KERN_ERR "%s: requested out-of-range block %llu for "
++ "device %s\n",
++ __FUNCTION__, (unsigned long long)block,
++ bdevname(bdev, b));
++ return -EIO;
++ }
++ block = index << sizebits;
+ /* Create a page with the proper size buffers.. */
+ page = grow_dev_page(bdev, block, index, size);
+ if (!page)
+@@ -1208,12 +1221,16 @@ __getblk_slow(struct block_device *bdev,
+
+ for (;;) {
+ struct buffer_head * bh;
++ int ret;
+
+ bh = __find_get_block(bdev, block, size);
+ if (bh)
+ return bh;
+
+- if (!grow_buffers(bdev, block, size))
++ ret = grow_buffers(bdev, block, size);
++ if (ret < 0)
++ return NULL;
++ if (ret == 0)
+ free_more_memory();
+ }
+ }
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/invalidate_complete_page2.patch new/patches.fixes/invalidate_complete_page2.patch
--- old/patches.fixes/invalidate_complete_page2.patch 2006-10-09 13:38:47.000000000 +0200
+++ new/patches.fixes/invalidate_complete_page2.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,123 +0,0 @@
-Subject: Re: direct IO regression in 2.6.18
-From: Andrew Morton
-Patch-mainline: 2.6.19
-
-On Tue, 3 Oct 2006 13:51:49 -0400 (EDT)
-Chip Coldwell wrote:
-
-> Hi,
->
-> The following commit caused a regression in direct IO:
->
-> commit 016eb4a0ed06a3677d67a584da901f0e9a63c666
-> Author: Andrew Morton
-> Date: Fri Sep 8 09:48:38 2006 -0700
->
-> [PATCH] invalidate_complete_page() race fix
->
-> ...
->
-> The issue is that invalidate_complete_page is in two different code
-> paths, the normal one (prune_icache calls invalidate_inode_pages calls
-> invalidate_mapping_pages calls invalidate_complete_page) and also via
-> direct IO (generic_file_direct_write calls generic_file_direct_IO
-> calls invalidate_inode_pages2_range calls invalidate_complete_page).
-> In the latter case, the page is (usually) not even in the page cache
-> and the refcount can legitimately != 2.
-
-
-The below was merged earlier this week and is tagged for 2.6.18.x.
-You just falsified my changelog ;)
-
-
-
-From: Andrew Morton
-
-The recent fix to invalidate_inode_pages() (git commit 016eb4a) managed to
-unfix invalidate_inode_pages2().
-
-The problem is that various bits of code in the kernel can take transient refs
-on pages: the page scanner will do this when inspecting a batch of pages, and
-the lru_cache_add() batching pagevecs also hold a ref.
-
-Net result is transient failures in invalidate_inode_pages2(). This affects
-NFS directory invalidation (observed) and presumably also block-backed
-direct-io (not yet reported).
-
-Fix it by reverting invalidate_inode_pages2() back to the old version which
-ignores the page refcounts.
-
-We may come up with something more clever later, but for now we need a 2.6.18
-fix for NFS.
-
-Cc: Chuck Lever
-Cc: Nick Piggin
-Cc: Peter Zijlstra
-Cc:
-Signed-off-by: Andrew Morton
----
-
- mm/truncate.c | 34 ++++++++++++++++++++++++++++++++--
- 1 file changed, 32 insertions(+), 2 deletions(-)
-
-diff -puN mm/truncate.c~invalidate_inode_pages2-ignore-page-refcounts mm/truncate.c
---- a/mm/truncate.c~invalidate_inode_pages2-ignore-page-refcounts
-+++ a/mm/truncate.c
-@@ -287,9 +287,39 @@ unsigned long invalidate_inode_pages(str
- {
- return invalidate_mapping_pages(mapping, 0, ~0UL);
- }
--
- EXPORT_SYMBOL(invalidate_inode_pages);
-
-+/*
-+ * This is like invalidate_complete_page(), except it ignores the page's
-+ * refcount. We do this because invalidate_inode_pages2() needs stronger
-+ * invalidation guarantees, and cannot afford to leave pages behind because
-+ * shrink_list() has a temp ref on them, or because they're transiently sitting
-+ * in the lru_cache_add() pagevecs.
-+ */
-+static int
-+invalidate_complete_page2(struct address_space *mapping, struct page *page)
-+{
-+ if (page->mapping != mapping)
-+ return 0;
-+
-+ if (PagePrivate(page) && !try_to_release_page(page, 0))
-+ return 0;
-+
-+ write_lock_irq(&mapping->tree_lock);
-+ if (PageDirty(page))
-+ goto failed;
-+
-+ BUG_ON(PagePrivate(page));
-+ __remove_from_page_cache(page);
-+ write_unlock_irq(&mapping->tree_lock);
-+ ClearPageUptodate(page);
-+ page_cache_release(page); /* pagecache ref */
-+ return 1;
-+failed:
-+ write_unlock_irq(&mapping->tree_lock);
-+ return 0;
-+}
-+
- /**
- * invalidate_inode_pages2_range - remove range of pages from an address_space
- * @mapping: the address_space
-@@ -356,7 +386,7 @@ int invalidate_inode_pages2_range(struct
- }
- }
- was_dirty = test_clear_page_dirty(page);
-- if (!invalidate_complete_page(mapping, page)) {
-+ if (!invalidate_complete_page2(mapping, page)) {
- if (was_dirty)
- set_page_dirty(page);
- ret = -EIO;
-_
-
--
-To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
-the body of a message to majordomo@vger.kernel.org
-More majordomo info at http://vger.kernel.org/majordomo-info.html
-Please read the FAQ at http://www.tux.org/lkml/
-
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/invalidate_page_non_destructive new/patches.fixes/invalidate_page_non_destructive
--- old/patches.fixes/invalidate_page_non_destructive 2006-10-09 21:16:01.000000000 +0200
+++ new/patches.fixes/invalidate_page_non_destructive 2006-10-16 17:56:31.000000000 +0200
@@ -21,7 +21,7 @@
--- linux-2.6.18.orig/mm/truncate.c
+++ linux-2.6.18/mm/truncate.c
-@@ -280,9 +280,14 @@ EXPORT_SYMBOL(invalidate_inode_pages);
+@@ -310,9 +310,14 @@ failed:
* @end: the page offset 'to' which to invalidate (inclusive)
*
* Any pages which are found to be mapped into pagetables are unmapped prior to
@@ -38,7 +38,7 @@
*/
int invalidate_inode_pages2_range(struct address_space *mapping,
pgoff_t start, pgoff_t end)
-@@ -296,13 +301,12 @@ int invalidate_inode_pages2_range(struct
+@@ -326,13 +331,12 @@ int invalidate_inode_pages2_range(struct
pagevec_init(&pvec, 0);
next = start;
@@ -54,7 +54,7 @@
lock_page(page);
if (page->mapping != mapping) {
-@@ -338,12 +342,9 @@ int invalidate_inode_pages2_range(struct
+@@ -368,12 +372,9 @@ int invalidate_inode_pages2_range(struct
PAGE_CACHE_SIZE, 0);
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/ppc-ide-interrupt.patch new/patches.fixes/ppc-ide-interrupt.patch
--- old/patches.fixes/ppc-ide-interrupt.patch 2006-10-01 19:49:29.000000000 +0200
+++ new/patches.fixes/ppc-ide-interrupt.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,33 +0,0 @@
-Subject: Re: IDE not found on Performa due to interrupt breakage
-From: Benjamin Herrenschmidt
-Patch-mainline: 2.6.19
-
-On Thu, 2006-09-21 at 13:50 +0200, Olaf Hering wrote:
-> The IDE controller is not usable on a Performa 6400 with 2.6.18:
->
-> <6>hda: Enabling MultiWord DMA 2
-> <4>ide0: Disabled unable to get IRQ 13.
-> <6>ide0: failed to initialize IDE interface
-
- .../...
-
-Looks like a workaround for bogus OF bitrotted... What about this patch:
-
-Signed-off-by: Olaf Hering
----
- drivers/ide/ppc/pmac.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: linux-2.6.18-rc6/drivers/ide/ppc/pmac.c
-===================================================================
---- linux-2.6.18-rc6.orig/drivers/ide/ppc/pmac.c
-+++ linux-2.6.18-rc6/drivers/ide/ppc/pmac.c
-@@ -1326,7 +1326,7 @@ pmac_ide_macio_attach(struct macio_dev *
- if (macio_irq_count(mdev) == 0) {
- printk(KERN_WARNING "ide%d: no intrs for device %s, using 13\n",
- i, mdev->ofdev.node->full_name);
-- irq = 13;
-+ irq = irq_create_mapping(NULL, 13);
- } else
- irq = macio_irq(mdev, 0);
-
++++++ patches.kernel.org.tar.bz2 ++++++
++++ 8108 lines of diff (skipped)
++++++ patches.rpmify.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.rpmify/rpm-kernel-config new/patches.rpmify/rpm-kernel-config
--- old/patches.rpmify/rpm-kernel-config 2006-09-20 21:22:27.000000000 +0200
+++ new/patches.rpmify/rpm-kernel-config 2006-10-16 17:56:31.000000000 +0200
@@ -12,7 +12,7 @@
--- linux-2.6.18.orig/init/Kconfig
+++ linux-2.6.18/init/Kconfig
-@@ -90,6 +90,10 @@ config LOCALVERSION_AUTO
+@@ -91,6 +91,10 @@ config LOCALVERSION_AUTO
Note: This requires Perl, and a git repository, but not necessarily
the git or cogito tools to be installed.
++++++ patches.suse.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/bootsplash new/patches.suse/bootsplash
--- old/patches.suse/bootsplash 2006-09-20 21:22:27.000000000 +0200
+++ new/patches.suse/bootsplash 2006-10-16 17:56:31.000000000 +0200
@@ -68,7 +68,7 @@
break;
--- linux-2.6.18.orig/drivers/char/vt.c
+++ linux-2.6.18/drivers/char/vt.c
-@@ -3754,6 +3754,31 @@ void vcs_scr_writew(struct vc_data *vc,
+@@ -3752,6 +3752,31 @@ void vcs_scr_writew(struct vc_data *vc,
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/driver-class_fb-device.patch new/patches.suse/driver-class_fb-device.patch
--- old/patches.suse/driver-class_fb-device.patch 2006-10-07 19:41:53.000000000 +0200
+++ new/patches.suse/driver-class_fb-device.patch 2006-10-16 17:56:31.000000000 +0200
@@ -19,7 +19,7 @@
--- linux-2.6.18.orig/drivers/video/fbmem.c
+++ linux-2.6.18/drivers/video/fbmem.c
-@@ -1295,14 +1295,14 @@ register_framebuffer(struct fb_info *fb_
+@@ -1296,14 +1296,14 @@ register_framebuffer(struct fb_info *fb_
break;
fb_info->node = i;
@@ -40,7 +40,7 @@
if (fb_info->pixmap.addr == NULL) {
fb_info->pixmap.addr = kmalloc(FBPIXMAPSIZE, GFP_KERNEL);
-@@ -1355,8 +1355,8 @@ unregister_framebuffer(struct fb_info *f
+@@ -1356,8 +1356,8 @@ unregister_framebuffer(struct fb_info *f
fb_destroy_modelist(&fb_info->modelist);
registered_fb[i]=NULL;
num_registered_fb--;
@@ -338,7 +338,7 @@
u8 tmp_curve[FB_BACKLIGHT_LEVELS];
unsigned int i;
-@@ -424,9 +445,10 @@ static ssize_t store_bl_curve(struct cla
+@@ -430,9 +451,10 @@ static ssize_t store_bl_curve(struct cla
return count;
}
@@ -351,7 +351,7 @@
ssize_t len = 0;
unsigned int i;
-@@ -451,7 +473,7 @@ static ssize_t show_bl_curve(struct clas
+@@ -463,7 +485,7 @@ static ssize_t show_bl_curve(struct clas
/* When cmap is added back in it should be a binary attribute
* not a text one. Consideration should also be given to converting
* fbdev to use configfs instead of sysfs */
@@ -360,7 +360,7 @@
__ATTR(bits_per_pixel, S_IRUGO|S_IWUSR, show_bpp, store_bpp),
__ATTR(blank, S_IRUGO|S_IWUSR, show_blank, store_blank),
__ATTR(console, S_IRUGO|S_IWUSR, show_console, store_console),
-@@ -469,24 +491,22 @@ static struct class_device_attribute cla
+@@ -481,24 +503,22 @@ static struct class_device_attribute cla
#endif
};
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/ext3-register-filesystem-lifo new/patches.suse/ext3-register-filesystem-lifo
--- old/patches.suse/ext3-register-filesystem-lifo 2005-02-02 21:01:02.000000000 +0100
+++ new/patches.suse/ext3-register-filesystem-lifo 1970-01-01 01:00:00.000000000 +0100
@@ -1,73 +0,0 @@
-From: Andrea Arcangeli
-Subject: Add register_filesystem_lifo function for ext2/ext3
-
-This patch adds register_filesystem_lifo(), which allows to
-register a filesystem at the head of the list of filesystems.
-Used to add ext3 before ext2 even when ext3 is registered later.
-
-Signed-off-by: Andreas Gruenbacher
-
-Index: linux-2.6.8/fs/ext3/super.c
-===================================================================
---- linux-2.6.8.orig/fs/ext3/super.c
-+++ linux-2.6.8/fs/ext3/super.c
-@@ -2361,7 +2361,7 @@ static int __init init_ext3_fs(void)
- err = init_inodecache();
- if (err)
- goto out1;
-- err = register_filesystem(&ext3_fs_type);
-+ err = register_filesystem_lifo(&ext3_fs_type);
- if (err)
- goto out;
- return 0;
-Index: linux-2.6.8/fs/filesystems.c
-===================================================================
---- linux-2.6.8.orig/fs/filesystems.c
-+++ linux-2.6.8/fs/filesystems.c
-@@ -62,7 +62,7 @@ static struct file_system_type **find_fi
- * unregistered.
- */
-
--int register_filesystem(struct file_system_type * fs)
-+int __register_filesystem(struct file_system_type * fs, int lifo)
- {
- int res = 0;
- struct file_system_type ** p;
-@@ -76,13 +76,19 @@ int register_filesystem(struct file_syst
- p = find_filesystem(fs->name);
- if (*p)
- res = -EBUSY;
-- else
-- *p = fs;
-+ else {
-+ if (!lifo)
-+ *p = fs;
-+ else {
-+ fs->next = file_systems;
-+ file_systems = fs;
-+ }
-+ }
- write_unlock(&file_systems_lock);
- return res;
- }
-
--EXPORT_SYMBOL(register_filesystem);
-+EXPORT_SYMBOL(__register_filesystem);
-
- /**
- * unregister_filesystem - unregister a file system
-Index: linux-2.6.8/include/linux/fs.h
-===================================================================
---- linux-2.6.8.orig/include/linux/fs.h
-+++ linux-2.6.8/include/linux/fs.h
-@@ -1215,7 +1215,9 @@ void unnamed_dev_init(void);
- #define fops_put(fops) \
- do { if (fops) module_put((fops)->owner); } while(0)
-
--extern int register_filesystem(struct file_system_type *);
-+extern int __register_filesystem(struct file_system_type *, int);
-+#define register_filesystem(fs) __register_filesystem(fs, 0)
-+#define register_filesystem_lifo(fs) __register_filesystem(fs, 1)
- extern int unregister_filesystem(struct file_system_type *);
- extern struct vfsmount *kern_mount(struct file_system_type *);
- extern int may_umount_tree(struct vfsmount *);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/generic-acl.diff new/patches.suse/generic-acl.diff
--- old/patches.suse/generic-acl.diff 2006-10-01 19:49:29.000000000 +0200
+++ new/patches.suse/generic-acl.diff 2006-10-16 17:56:31.000000000 +0200
@@ -16,7 +16,7 @@
--- linux-2.6.18.orig/fs/Kconfig
+++ linux-2.6.18/fs/Kconfig
-@@ -1921,6 +1921,10 @@ config 9P_FS
+@@ -1933,6 +1933,10 @@ config 9P_FS
If unsure, say N.
@@ -35,8 +35,8 @@
obj-$(CONFIG_NFS_COMMON) += nfs_common/
+obj-$(CONFIG_GENERIC_ACL) += generic_acl.o
- obj-$(CONFIG_QUOTA) += dquot.o
- obj-$(CONFIG_QFMT_V1) += quota_v1.o
+ obj-$(CONFIG_FS_NFS4ACL) += nfs4acl.o
+ nfs4acl-y := nfs4acl_base.o nfs4acl_xattr.o \
--- /dev/null
+++ linux-2.6.18/include/linux/generic_acl.h
@@ -0,0 +1,30 @@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/kdb-common new/patches.suse/kdb-common
--- old/patches.suse/kdb-common 2006-09-20 21:22:27.000000000 +0200
+++ new/patches.suse/kdb-common 2006-10-16 17:56:31.000000000 +0200
@@ -16202,7 +16202,7 @@
+#endif /* CONFIG_KDB */
--- linux-2.6.18.orig/kernel/module.c
+++ linux-2.6.18/kernel/module.c
-@@ -2055,24 +2055,37 @@ const char *module_address_lookup(unsign
+@@ -2061,24 +2061,37 @@ const char *module_address_lookup(unsign
return NULL;
}
@@ -16268,7 +16268,7 @@
*/
--- linux-2.6.18.orig/kernel/sched.c
+++ linux-2.6.18/kernel/sched.c
-@@ -6839,7 +6839,7 @@ void normalize_rt_tasks(void)
+@@ -6877,7 +6877,7 @@ void normalize_rt_tasks(void)
#endif /* CONFIG_MAGIC_SYSRQ */
@@ -16277,7 +16277,7 @@
/*
* These functions are only useful for the IA64 MCA handling.
*
-@@ -6882,3 +6882,80 @@ void set_curr_task(int cpu, struct task_
+@@ -6920,3 +6920,80 @@ void set_curr_task(int cpu, struct task_
}
#endif
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/nfs4acl-ext3.diff new/patches.suse/nfs4acl-ext3.diff
--- old/patches.suse/nfs4acl-ext3.diff 2006-09-28 18:56:46.000000000 +0200
+++ new/patches.suse/nfs4acl-ext3.diff 2006-10-16 17:56:31.000000000 +0200
@@ -9,8 +9,30 @@
Signed-off-by: Andreas Gruenbacher
-Index: linux-2.6.18/include/linux/nfs4acl.h
-===================================================================
+---
+ fs/Kconfig | 12
+ fs/Makefile | 4
+ fs/ext3/Makefile | 3
+ fs/ext3/acl.c | 8
+ fs/ext3/acl.h | 4
+ fs/ext3/file.c | 1
+ fs/ext3/ialloc.c | 6
+ fs/ext3/inode.c | 9
+ fs/ext3/namei.c | 11
+ fs/ext3/namei.h | 1
+ fs/ext3/nfs4acl.c | 280 +++++++++++++++
+ fs/ext3/nfs4acl.h | 26 +
+ fs/ext3/super.c | 54 ++-
+ fs/ext3/xattr.c | 9
+ fs/ext3/xattr.h | 5
+ fs/nfs4acl_base.c | 523 +++++++++++++++++++++++++++++
+ fs/nfs4acl_compat.c | 743 ++++++++++++++++++++++++++++++++++++++++++
+ fs/nfs4acl_xattr.c | 154 ++++++++
+ include/linux/ext3_fs.h | 2
+ include/linux/nfs4acl.h | 181 ++++++++++
+ include/linux/nfs4acl_xattr.h | 32 +
+ 21 files changed, 2043 insertions(+), 25 deletions(-)
+
--- /dev/null
+++ linux-2.6.18/include/linux/nfs4acl.h
@@ -0,0 +1,181 @@
@@ -195,8 +217,6 @@
+extern int nfs4acl_apply_masks(struct nfs4acl **acl, int);
+
+#endif /* __NFS4ACL_H */
-Index: linux-2.6.18/include/linux/nfs4acl_xattr.h
-===================================================================
--- /dev/null
+++ linux-2.6.18/include/linux/nfs4acl_xattr.h
@@ -0,0 +1,32 @@
@@ -232,8 +252,6 @@
+extern void nfs4acl_to_xattr(const struct nfs4acl *, void *);
+
+#endif /* __NFS4ACL_XATTR_H */
-Index: linux-2.6.18/fs/nfs4acl_xattr.c
-===================================================================
--- /dev/null
+++ linux-2.6.18/fs/nfs4acl_xattr.c
@@ -0,0 +1,154 @@
@@ -391,8 +409,6 @@
+ }
+}
+EXPORT_SYMBOL_GPL(nfs4acl_to_xattr);
-Index: linux-2.6.18/fs/Kconfig
-===================================================================
--- linux-2.6.18.orig/fs/Kconfig
+++ linux-2.6.18/fs/Kconfig
@@ -126,6 +126,14 @@ config EXT3_FS_POSIX_ACL
@@ -421,8 +437,6 @@
source "fs/xfs/Kconfig"
config OCFS2_FS
-Index: linux-2.6.18/fs/Makefile
-===================================================================
--- linux-2.6.18.orig/fs/Makefile
+++ linux-2.6.18/fs/Makefile
@@ -36,6 +36,10 @@ obj-$(CONFIG_FS_MBCACHE) += mbcache.o
@@ -436,8 +450,6 @@
obj-$(CONFIG_QUOTA) += dquot.o
obj-$(CONFIG_QFMT_V1) += quota_v1.o
obj-$(CONFIG_QFMT_V2) += quota_v2.o
-Index: linux-2.6.18/fs/ext3/file.c
-===================================================================
--- linux-2.6.18.orig/fs/ext3/file.c
+++ linux-2.6.18/fs/ext3/file.c
@@ -23,6 +23,7 @@
@@ -448,8 +460,6 @@
#include "xattr.h"
#include "acl.h"
-Index: linux-2.6.18/fs/ext3/inode.c
-===================================================================
--- linux-2.6.18.orig/fs/ext3/inode.c
+++ linux-2.6.18/fs/ext3/inode.c
@@ -38,6 +38,7 @@
@@ -475,8 +485,6 @@
err_out:
ext3_std_error(inode->i_sb, error);
-Index: linux-2.6.18/fs/ext3/namei.c
-===================================================================
--- linux-2.6.18.orig/fs/ext3/namei.c
+++ linux-2.6.18/fs/ext3/namei.c
@@ -40,6 +40,7 @@
@@ -504,8 +512,6 @@
/*
* directories can handle most operations...
*/
-Index: linux-2.6.18/fs/ext3/super.c
-===================================================================
--- linux-2.6.18.orig/fs/ext3/super.c
+++ linux-2.6.18/fs/ext3/super.c
@@ -670,7 +670,7 @@ enum {
@@ -573,7 +579,7 @@
case Opt_reservation:
set_opt(sbi->s_mount_opt, RESERVATION);
break;
-@@ -1476,8 +1497,11 @@ static int ext3_fill_super (struct super
+@@ -1478,8 +1499,11 @@ static int ext3_fill_super (struct super
NULL, 0))
goto failed_mount;
@@ -587,7 +593,7 @@
if (le32_to_cpu(es->s_rev_level) == EXT3_GOOD_OLD_REV &&
(EXT3_HAS_COMPAT_FEATURE(sb, ~0U) ||
-@@ -2292,8 +2316,12 @@ static int ext3_remount (struct super_bl
+@@ -2294,8 +2318,12 @@ static int ext3_remount (struct super_bl
if (sbi->s_mount_opt & EXT3_MOUNT_ABORT)
ext3_abort(sb, __FUNCTION__, "Abort forced by user");
@@ -602,8 +608,6 @@
es = sbi->s_es;
-Index: linux-2.6.18/fs/ext3/xattr.c
-===================================================================
--- linux-2.6.18.orig/fs/ext3/xattr.c
+++ linux-2.6.18/fs/ext3/xattr.c
@@ -112,6 +112,9 @@ static struct xattr_handler *ext3_xattr_
@@ -629,8 +633,6 @@
NULL
};
-Index: linux-2.6.18/include/linux/ext3_fs.h
-===================================================================
--- linux-2.6.18.orig/include/linux/ext3_fs.h
+++ linux-2.6.18/include/linux/ext3_fs.h
@@ -371,6 +371,8 @@ struct ext3_inode {
@@ -642,8 +644,6 @@
/* Compatibility, for having both ext2_fs.h and ext3_fs.h included at once */
#ifndef _LINUX_EXT2_FS_H
-Index: linux-2.6.18/fs/ext3/xattr.h
-===================================================================
--- linux-2.6.18.orig/fs/ext3/xattr.h
+++ linux-2.6.18/fs/ext3/xattr.h
@@ -21,6 +21,7 @@
@@ -665,8 +665,6 @@
extern ssize_t ext3_listxattr(struct dentry *, char *, size_t);
-Index: linux-2.6.18/fs/ext3/Makefile
-===================================================================
--- linux-2.6.18.orig/fs/ext3/Makefile
+++ linux-2.6.18/fs/ext3/Makefile
@@ -2,6 +2,8 @@
@@ -683,8 +681,6 @@
ext3-$(CONFIG_EXT3_FS_POSIX_ACL) += acl.o
ext3-$(CONFIG_EXT3_FS_SECURITY) += xattr_security.o
+ext3-$(CONFIG_EXT3_FS_NFS4ACL) += nfs4acl.o
-Index: linux-2.6.18/fs/ext3/ialloc.c
-===================================================================
--- linux-2.6.18.orig/fs/ext3/ialloc.c
+++ linux-2.6.18/fs/ext3/ialloc.c
@@ -28,6 +28,7 @@
@@ -707,8 +703,6 @@
if (err)
goto fail_free_drop;
-Index: linux-2.6.18/fs/ext3/nfs4acl.c
-===================================================================
--- /dev/null
+++ linux-2.6.18/fs/ext3/nfs4acl.c
@@ -0,0 +1,280 @@
@@ -992,8 +986,6 @@
+ .set = ext3_xattr_set_nfs4acl,
+};
+#endif
-Index: linux-2.6.18/fs/ext3/nfs4acl.h
-===================================================================
--- /dev/null
+++ linux-2.6.18/fs/ext3/nfs4acl.h
@@ -0,0 +1,26 @@
@@ -1023,8 +1015,6 @@
+#endif /* CONFIG_FS_EXT3_NFS4ACL */
+
+#endif /* __FS_EXT3_NFS4ACL_H */
-Index: linux-2.6.18/fs/ext3/acl.c
-===================================================================
--- linux-2.6.18.orig/fs/ext3/acl.c
+++ linux-2.6.18/fs/ext3/acl.c
@@ -282,7 +282,7 @@ ext3_set_acl(handle_t *handle, struct in
@@ -1049,8 +1039,6 @@
/*
* Initialize the ACLs of a new inode. Called from ext3_new_inode.
*
-Index: linux-2.6.18/fs/ext3/acl.h
-===================================================================
--- linux-2.6.18.orig/fs/ext3/acl.h
+++ linux-2.6.18/fs/ext3/acl.h
@@ -58,13 +58,13 @@ static inline int ext3_acl_count(size_t
@@ -1069,8 +1057,6 @@
static inline int
ext3_acl_chmod(struct inode *inode)
-Index: linux-2.6.18/fs/ext3/namei.h
-===================================================================
--- linux-2.6.18.orig/fs/ext3/namei.h
+++ linux-2.6.18/fs/ext3/namei.h
@@ -5,4 +5,5 @@
@@ -1079,8 +1065,6 @@
+extern int ext3_permission (struct inode *, int, struct nameidata *);
extern struct dentry *ext3_get_parent(struct dentry *child);
-Index: linux-2.6.18/fs/nfs4acl_base.c
-===================================================================
--- /dev/null
+++ linux-2.6.18/fs/nfs4acl_base.c
@@ -0,0 +1,523 @@
@@ -1607,8 +1591,6 @@
+ return acl;
+}
+EXPORT_SYMBOL_GPL(nfs4acl_inherit);
-Index: linux-2.6.18/fs/nfs4acl_compat.c
-===================================================================
--- /dev/null
+++ linux-2.6.18/fs/nfs4acl_compat.c
@@ -0,0 +1,743 @@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/register_sysctl_path new/patches.suse/register_sysctl_path
--- old/patches.suse/register_sysctl_path 2006-08-06 10:07:04.000000000 +0200
+++ new/patches.suse/register_sysctl_path 2006-10-16 17:56:31.000000000 +0200
@@ -16,11 +16,9 @@
kernel/sysctl.c | 79 +++++++++++++++++++++++++++++++++++++++++++++++--
2 files changed, 87 insertions(+), 2 deletions(-)
-Index: build/include/linux/sysctl.h
-===================================================================
---- build.orig/include/linux/sysctl.h
-+++ build/include/linux/sysctl.h
-@@ -1015,8 +1015,18 @@ struct ctl_table_header
+--- linux-2.6.18.orig/include/linux/sysctl.h
++++ linux-2.6.18/include/linux/sysctl.h
+@@ -1016,8 +1016,18 @@ struct ctl_table_header
struct completion *unregistering;
};
@@ -39,10 +37,8 @@
void unregister_sysctl_table(struct ctl_table_header * table);
#else /* __KERNEL__ */
-Index: build/kernel/sysctl.c
-===================================================================
---- build.orig/kernel/sysctl.c
-+++ build/kernel/sysctl.c
+--- linux-2.6.18.orig/kernel/sysctl.c
++++ linux-2.6.18/kernel/sysctl.c
@@ -140,6 +140,7 @@ static int parse_table(int __user *, int
ctl_table *, void **);
static int proc_doutsstring(ctl_table *table, int write, struct file *filp,
@@ -51,7 +47,7 @@
static ctl_table root_table[];
static struct ctl_table_header root_table_header =
-@@ -1400,6 +1401,74 @@ struct ctl_table_header *register_sysctl
+@@ -1411,6 +1412,74 @@ struct ctl_table_header *register_sysctl
if (!tmp)
return NULL;
tmp->ctl_table = table;
@@ -126,7 +122,7 @@
INIT_LIST_HEAD(&tmp->ctl_entry);
tmp->used = 0;
tmp->unregistering = NULL;
-@@ -1410,9 +1479,8 @@ struct ctl_table_header *register_sysctl
+@@ -1421,9 +1490,8 @@ struct ctl_table_header *register_sysctl
list_add_tail(&tmp->ctl_entry, &root_table_header.ctl_entry);
spin_unlock(&sysctl_lock);
#ifdef CONFIG_PROC_FS
@@ -137,7 +133,7 @@
}
/**
-@@ -2540,6 +2608,12 @@ struct ctl_table_header * register_sysct
+@@ -2551,6 +2619,12 @@ struct ctl_table_header * register_sysct
return NULL;
}
@@ -150,7 +146,7 @@
void unregister_sysctl_table(struct ctl_table_header * table)
{
}
-@@ -2559,6 +2633,7 @@ EXPORT_SYMBOL(proc_dostring);
+@@ -2570,6 +2644,7 @@ EXPORT_SYMBOL(proc_dostring);
EXPORT_SYMBOL(proc_doulongvec_minmax);
EXPORT_SYMBOL(proc_doulongvec_ms_jiffies_minmax);
EXPORT_SYMBOL(register_sysctl_table);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/setuid-dumpable-wrongdir new/patches.suse/setuid-dumpable-wrongdir
--- old/patches.suse/setuid-dumpable-wrongdir 2006-09-20 20:25:51.000000000 +0200
+++ new/patches.suse/setuid-dumpable-wrongdir 2006-10-16 17:56:31.000000000 +0200
@@ -36,7 +36,7 @@
#if defined(CONFIG_S390) && defined(CONFIG_SMP)
{
.ctl_name = KERN_SPIN_RETRY,
-@@ -1084,14 +1092,6 @@ static ctl_table fs_table[] = {
+@@ -1095,14 +1103,6 @@ static ctl_table fs_table[] = {
},
#endif
#endif
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/supported-flag new/patches.suse/supported-flag
--- old/patches.suse/supported-flag 2006-09-20 20:25:51.000000000 +0200
+++ new/patches.suse/supported-flag 2006-10-16 17:56:31.000000000 +0200
@@ -104,7 +104,7 @@
/* Protects module list */
static DEFINE_SPINLOCK(modlist_lock);
-@@ -1459,7 +1473,7 @@ static struct module *load_module(void _
+@@ -1465,7 +1479,7 @@ static struct module *load_module(void _
{
Elf_Ehdr *hdr;
Elf_Shdr *sechdrs;
@@ -113,7 +113,7 @@
unsigned int i;
unsigned int symindex = 0;
unsigned int strindex = 0;
-@@ -1607,6 +1621,28 @@ static struct module *load_module(void _
+@@ -1613,6 +1627,28 @@ static struct module *load_module(void _
goto free_hdr;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/suse-ppc-pmac_zilog-i8250-coexistance.patch new/patches.suse/suse-ppc-pmac_zilog-i8250-coexistance.patch
--- old/patches.suse/suse-ppc-pmac_zilog-i8250-coexistance.patch 2006-09-29 15:05:16.000000000 +0200
+++ new/patches.suse/suse-ppc-pmac_zilog-i8250-coexistance.patch 2006-10-16 17:56:31.000000000 +0200
@@ -17,8 +17,6 @@
include/asm-ppc/io.h | 5 +++++
5 files changed, 38 insertions(+)
-Index: linux-2.6.18/arch/powerpc/platforms/powermac/pci.c
-===================================================================
--- linux-2.6.18.orig/arch/powerpc/platforms/powermac/pci.c
+++ linux-2.6.18/arch/powerpc/platforms/powermac/pci.c
@@ -982,10 +982,23 @@ static int __init add_bridge(struct devi
@@ -45,8 +43,6 @@
for_each_pci_dev(dev) {
/* Read interrupt from the device-tree */
pci_read_irq_line(dev);
-Index: linux-2.6.18/drivers/serial/8250.c
-===================================================================
--- linux-2.6.18.orig/drivers/serial/8250.c
+++ linux-2.6.18/drivers/serial/8250.c
@@ -46,6 +46,10 @@
@@ -79,11 +75,9 @@
if (nr_uarts > UART_NR)
nr_uarts = UART_NR;
-Index: linux-2.6.18/include/asm-powerpc/io.h
-===================================================================
--- linux-2.6.18.orig/include/asm-powerpc/io.h
+++ linux-2.6.18/include/asm-powerpc/io.h
-@@ -452,6 +452,10 @@ out:
+@@ -451,6 +451,10 @@ out:
#define dma_cache_wback(_start,_size) do { } while (0)
#define dma_cache_wback_inv(_start,_size) do { } while (0)
@@ -94,8 +88,6 @@
/*
* Convert a physical pointer to a virtual kernel pointer for /dev/mem
-Index: linux-2.6.18/include/asm-ppc/io.h
-===================================================================
--- linux-2.6.18.orig/include/asm-ppc/io.h
+++ linux-2.6.18/include/asm-ppc/io.h
@@ -565,6 +565,11 @@ extern void pci_iounmap(struct pci_dev *
@@ -110,8 +102,6 @@
/*
* Convert a physical pointer to a virtual kernel pointer for /dev/mem
* access
-Index: linux-2.6.18/drivers/serial/8250_pci.c
-===================================================================
--- linux-2.6.18.orig/drivers/serial/8250_pci.c
+++ linux-2.6.18/drivers/serial/8250_pci.c
@@ -33,6 +33,10 @@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/sysctl-add-affinity_load_balancing new/patches.suse/sysctl-add-affinity_load_balancing
--- old/patches.suse/sysctl-add-affinity_load_balancing 2006-09-20 21:22:27.000000000 +0200
+++ new/patches.suse/sysctl-add-affinity_load_balancing 2006-10-16 17:56:31.000000000 +0200
@@ -34,7 +34,7 @@
static ctl_table kern_table[] = {
{
.ctl_name = KERN_OSTYPE,
-@@ -975,6 +977,16 @@ static ctl_table vm_table[] = {
+@@ -986,6 +988,16 @@ static ctl_table vm_table[] = {
.extra1 = &zero,
},
#endif
@@ -53,7 +53,7 @@
--- linux-2.6.18.orig/kernel/sched.c
+++ linux-2.6.18/kernel/sched.c
-@@ -1247,6 +1247,28 @@ find_idlest_cpu(struct sched_group *grou
+@@ -1257,6 +1257,28 @@ find_idlest_cpu(struct sched_group *grou
return idlest;
}
@@ -82,7 +82,7 @@
/*
* sched_balance_self: balance the current task (running on cpu) in domains
* that have the 'flag' flag set. In practice, this is SD_BALANCE_FORK and
-@@ -1258,11 +1280,17 @@ find_idlest_cpu(struct sched_group *grou
+@@ -1268,11 +1290,17 @@ find_idlest_cpu(struct sched_group *grou
*
* preempt must be disabled.
*/
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/tmpfs-acl.diff new/patches.suse/tmpfs-acl.diff
--- old/patches.suse/tmpfs-acl.diff 2006-10-01 19:49:29.000000000 +0200
+++ new/patches.suse/tmpfs-acl.diff 2006-10-16 17:56:31.000000000 +0200
@@ -17,7 +17,7 @@
--- linux-2.6.18.orig/fs/Kconfig
+++ linux-2.6.18/fs/Kconfig
-@@ -862,6 +862,19 @@ config TMPFS
+@@ -874,6 +874,19 @@ config TMPFS
See file:Documentation/filesystems/tmpfs.txt for details.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/uswsusp-add-pmops-prepareenterfinish-support-aka-platform-mode.patch new/patches.suse/uswsusp-add-pmops-prepareenterfinish-support-aka-platform-mode.patch
--- old/patches.suse/uswsusp-add-pmops-prepareenterfinish-support-aka-platform-mode.patch 2006-10-01 20:40:35.000000000 +0200
+++ new/patches.suse/uswsusp-add-pmops-prepareenterfinish-support-aka-platform-mode.patch 2006-10-16 17:56:31.000000000 +0200
@@ -24,10 +24,9 @@
kernel/power/user.c | 28 ++++++++++++++++++++++++++++
2 files changed, 34 insertions(+), 1 deletion(-)
-diff -puN kernel/power/power.h~uswsusp-add-pmops-prepareenterfinish-support-aka-platform-mode kernel/power/power.h
---- a/kernel/power/power.h~uswsusp-add-pmops-prepareenterfinish-support-aka-platform-mode
-+++ a/kernel/power/power.h
-@@ -117,7 +117,12 @@ extern void snapshot_free_unused_memory(
+--- linux-2.6.18.orig/kernel/power/power.h
++++ linux-2.6.18/kernel/power/power.h
+@@ -78,7 +78,12 @@ int snapshot_image_loaded(struct snapsho
#define SNAPSHOT_FREE_SWAP_PAGES _IO(SNAPSHOT_IOC_MAGIC, 9)
#define SNAPSHOT_SET_SWAP_FILE _IOW(SNAPSHOT_IOC_MAGIC, 10, unsigned int)
#define SNAPSHOT_S2RAM _IO(SNAPSHOT_IOC_MAGIC, 11)
@@ -41,9 +40,8 @@
/**
* The bitmap is used for tracing allocated swap pages
-diff -puN kernel/power/user.c~uswsusp-add-pmops-prepareenterfinish-support-aka-platform-mode kernel/power/user.c
---- a/kernel/power/user.c~uswsusp-add-pmops-prepareenterfinish-support-aka-platform-mode
-+++ a/kernel/power/user.c
+--- linux-2.6.18.orig/kernel/power/user.c
++++ linux-2.6.18/kernel/power/user.c
@@ -11,6 +11,7 @@
#include
@@ -52,7 +50,7 @@
#include
#include
#include
-@@ -307,6 +308,33 @@ OutS3:
+@@ -302,6 +303,33 @@ OutS3:
up(&pm_sem);
break;
@@ -86,4 +84,3 @@
default:
error = -ENOTTY;
-_
++++++ patches.uml.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.uml/uml-kconfig new/patches.uml/uml-kconfig
--- old/patches.uml/uml-kconfig 2006-09-29 15:05:16.000000000 +0200
+++ new/patches.uml/uml-kconfig 2006-10-16 17:56:31.000000000 +0200
@@ -155,7 +155,7 @@
select FB_CFB_IMAGEBLIT
--- linux-2.6.18.orig/arch/um/Kconfig
+++ linux-2.6.18/arch/um/Kconfig
-@@ -277,6 +277,12 @@ source "drivers/net/Kconfig"
+@@ -282,6 +282,12 @@ source "drivers/net/Kconfig"
source "drivers/connector/Kconfig"
@@ -208,7 +208,7 @@
extern struct tty_driver *console_driver;
driver = console_driver;
index = fg_console;
-@@ -3924,6 +3926,8 @@ static int __init tty_init(void)
+@@ -3925,6 +3927,8 @@ static int __init tty_init(void)
#endif
#ifdef CONFIG_VT
@@ -217,8 +217,8 @@
cdev_init(&vc0_cdev, &console_fops);
if (cdev_add(&vc0_cdev, MKDEV(TTY_MAJOR, 0), 1) ||
register_chrdev_region(MKDEV(TTY_MAJOR, 0), 1, "/dev/vc/0") < 0)
-@@ -3931,6 +3935,7 @@ static int __init tty_init(void)
- class_device_create(tty_class, NULL, MKDEV(TTY_MAJOR, 0), NULL, "tty0");
+@@ -3932,6 +3936,7 @@ static int __init tty_init(void)
+ device_create(tty_class, NULL, MKDEV(TTY_MAJOR, 0), "tty0");
vty_init();
+ out_vt:
@@ -248,7 +248,7 @@
Saying Y here will allow you to use Linux in text mode through a
--- linux-2.6.18.orig/drivers/video/fbmem.c
+++ linux-2.6.18/drivers/video/fbmem.c
-@@ -1203,12 +1203,16 @@ fb_mmap(struct file *file, struct vm_are
+@@ -1204,12 +1204,16 @@ fb_mmap(struct file *file, struct vm_are
vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot);
else
vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.uml/uml-x11-fb new/patches.uml/uml-x11-fb
--- old/patches.uml/uml-x11-fb 2006-08-18 16:32:59.000000000 +0200
+++ new/patches.uml/uml-x11-fb 2006-10-16 17:56:31.000000000 +0200
@@ -5,11 +5,20 @@
Framebuffer driver for UML
Signed-off-by: Gerd Knorr
-Index: vanilla-2.6.18-rc4/arch/um/Kconfig
-===================================================================
---- vanilla-2.6.18-rc4.orig/arch/um/Kconfig 2006-08-17 10:43:08.000000000 +0200
-+++ vanilla-2.6.18-rc4/arch/um/Kconfig 2006-08-17 10:45:27.000000000 +0200
-@@ -106,6 +106,12 @@ config NET
+---
+ arch/um/Kconfig | 6
+ arch/um/Makefile | 12
+ arch/um/drivers/Makefile | 2
+ arch/um/drivers/x11_kern.c | 552 +++++++++++++++++++++++++++++++++++++++++++++
+ arch/um/drivers/x11_user.c | 515 +++++++++++++++++++++++++++++++++++++++++
+ arch/um/include/x11_kern.h | 9
+ arch/um/include/x11_user.h | 15 +
+ include/asm-um/irq.h | 3
+ 8 files changed, 1112 insertions(+), 2 deletions(-)
+
+--- linux-2.6.18.orig/arch/um/Kconfig
++++ linux-2.6.18/arch/um/Kconfig
+@@ -111,6 +111,12 @@ config NET
recommended to read the NET-HOWTO, available from
http://www.tldp.org/docs.html#howto.
@@ -22,10 +31,8 @@
source "fs/Kconfig.binfmt"
-Index: vanilla-2.6.18-rc4/arch/um/drivers/Makefile
-===================================================================
---- vanilla-2.6.18-rc4.orig/arch/um/drivers/Makefile 2006-06-18 03:49:35.000000000 +0200
-+++ vanilla-2.6.18-rc4/arch/um/drivers/Makefile 2006-08-17 10:45:27.000000000 +0200
+--- linux-2.6.18.orig/arch/um/drivers/Makefile
++++ linux-2.6.18/arch/um/drivers/Makefile
@@ -16,6 +16,7 @@ hostaudio-objs := hostaudio_kern.o
ubd-objs := ubd_kern.o ubd_user.o
port-objs := port_kern.o port_user.o
@@ -42,10 +49,8 @@
obj-$(CONFIG_XTERM_CHAN) += xterm.o xterm_kern.o
obj-$(CONFIG_UML_WATCHDOG) += harddog.o
obj-$(CONFIG_BLK_DEV_COW_COMMON) += cow_user.o
-Index: vanilla-2.6.18-rc4/arch/um/drivers/x11_kern.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ vanilla-2.6.18-rc4/arch/um/drivers/x11_kern.c 2006-08-17 10:45:27.000000000 +0200
+--- /dev/null
++++ linux-2.6.18/arch/um/drivers/x11_kern.c
@@ -0,0 +1,552 @@
+#include
+#include
@@ -599,10 +604,8 @@
+ * c-basic-offset: 8
+ * End:
+ */
-Index: vanilla-2.6.18-rc4/arch/um/drivers/x11_user.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ vanilla-2.6.18-rc4/arch/um/drivers/x11_user.c 2006-08-17 11:09:50.000000000 +0200
+--- /dev/null
++++ linux-2.6.18/arch/um/drivers/x11_user.c
@@ -0,0 +1,515 @@
+#include
+#include
@@ -1119,10 +1122,8 @@
+ * c-basic-offset: 8
+ * End:
+ */
-Index: vanilla-2.6.18-rc4/arch/um/include/x11_kern.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ vanilla-2.6.18-rc4/arch/um/include/x11_kern.h 2006-08-17 10:45:27.000000000 +0200
+--- /dev/null
++++ linux-2.6.18/arch/um/include/x11_kern.h
@@ -0,0 +1,9 @@
+/* x11_kern */
+
@@ -1133,10 +1134,8 @@
+void x11_mouse_input(struct x11_kerndata *kd, int key, int down,
+ int x, int y);
+void x11_cad(struct x11_kerndata *kd);
-Index: vanilla-2.6.18-rc4/arch/um/include/x11_user.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ vanilla-2.6.18-rc4/arch/um/include/x11_user.h 2006-08-17 10:45:27.000000000 +0200
+--- /dev/null
++++ linux-2.6.18/arch/um/include/x11_user.h
@@ -0,0 +1,15 @@
+/* x11_user */
+
@@ -1153,10 +1152,8 @@
+struct fb_var_screeninfo* x11_get_var(struct x11_window *win);
+void* x11_get_fbmem(struct x11_window *win);
+
-Index: vanilla-2.6.18-rc4/include/asm-um/irq.h
-===================================================================
---- vanilla-2.6.18-rc4.orig/include/asm-um/irq.h 2006-06-18 03:49:35.000000000 +0200
-+++ vanilla-2.6.18-rc4/include/asm-um/irq.h 2006-08-17 10:45:27.000000000 +0200
+--- linux-2.6.18.orig/include/asm-um/irq.h
++++ linux-2.6.18/include/asm-um/irq.h
@@ -15,8 +15,9 @@
#define SIGIO_WRITE_IRQ 11
#define TELNETD_IRQ 12
@@ -1168,10 +1165,8 @@
#define NR_IRQS (LAST_IRQ + 1)
#endif
-Index: vanilla-2.6.18-rc4/arch/um/Makefile
-===================================================================
---- vanilla-2.6.18-rc4.orig/arch/um/Makefile 2006-06-18 03:49:35.000000000 +0200
-+++ vanilla-2.6.18-rc4/arch/um/Makefile 2006-08-17 10:45:27.000000000 +0200
+--- linux-2.6.18.orig/arch/um/Makefile
++++ linux-2.6.18/arch/um/Makefile
@@ -139,12 +139,22 @@ CPPFLAGS_vmlinux.lds = -U$(SUBARCH) \
#The wrappers will select whether using "malloc" or the kernel allocator.
LINK_WRAPS = -Wl,--wrap,malloc -Wl,--wrap,free -Wl,--wrap,calloc
++++++ patches.xen.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.xen/xen-x86-dcr-fallback new/patches.xen/xen-x86-dcr-fallback
--- old/patches.xen/xen-x86-dcr-fallback 2006-09-01 12:18:29.000000000 +0200
+++ new/patches.xen/xen-x86-dcr-fallback 2006-10-16 17:56:31.000000000 +0200
@@ -6,10 +6,14 @@
This avoids losing precious special memory in places where any memory can be
used.
-Index: head-2006-08-28/arch/i386/mm/hypervisor.c
-===================================================================
---- head-2006-08-28.orig/arch/i386/mm/hypervisor.c 2006-08-16 10:22:14.000000000 +0200
-+++ head-2006-08-28/arch/i386/mm/hypervisor.c 2006-08-28 10:52:46.000000000 +0200
+---
+ arch/i386/mm/hypervisor.c | 62 ++++++++++++++++++++++++++++++++++++++++++
+ drivers/xen/balloon/balloon.c | 23 ++++++++++++---
+ include/xen/balloon.h | 6 ++++
+ 3 files changed, 87 insertions(+), 4 deletions(-)
+
+--- linux-2.6.18.orig/arch/i386/mm/hypervisor.c
++++ linux-2.6.18/arch/i386/mm/hypervisor.c
@@ -42,6 +42,7 @@
#include
#include
@@ -86,11 +90,9 @@
}
#ifdef __i386__
-Index: head-2006-08-28/drivers/xen/balloon/balloon.c
-===================================================================
---- head-2006-08-28.orig/drivers/xen/balloon/balloon.c 2006-08-28 10:51:38.000000000 +0200
-+++ head-2006-08-28/drivers/xen/balloon/balloon.c 2006-08-28 10:54:20.000000000 +0200
-@@ -637,22 +637,37 @@ struct page *balloon_alloc_empty_page_ra
+--- linux-2.6.18.orig/drivers/xen/balloon/balloon.c
++++ linux-2.6.18/drivers/xen/balloon/balloon.c
+@@ -638,22 +638,37 @@ struct page *balloon_alloc_empty_page_ra
return NULL;
}
@@ -132,10 +134,8 @@
void balloon_release_driver_page(struct page *page)
{
unsigned long flags;
-Index: head-2006-08-28/include/xen/balloon.h
-===================================================================
---- head-2006-08-28.orig/include/xen/balloon.h 2006-08-28 10:03:40.000000000 +0200
-+++ head-2006-08-28/include/xen/balloon.h 2006-08-28 10:55:13.000000000 +0200
+--- linux-2.6.18.orig/include/xen/balloon.h
++++ linux-2.6.18/include/xen/balloon.h
@@ -52,6 +52,12 @@ void
balloon_dealloc_empty_page_range(
struct page *page, unsigned long nr_pages);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.xen/xen-x86-no-ioapic-base new/patches.xen/xen-x86-no-ioapic-base
--- old/patches.xen/xen-x86-no-ioapic-base 2006-09-01 12:18:29.000000000 +0200
+++ new/patches.xen/xen-x86-no-ioapic-base 2006-10-16 17:56:31.000000000 +0200
@@ -3,10 +3,17 @@
Patch-mainline: obsolete
References: 191115
-Index: head-2006-08-28/arch/i386/kernel/io_apic-xen.c
-===================================================================
---- head-2006-08-28.orig/arch/i386/kernel/io_apic-xen.c 2006-08-28 10:55:17.000000000 +0200
-+++ head-2006-08-28/arch/i386/kernel/io_apic-xen.c 2006-08-28 10:57:30.000000000 +0200
+---
+ arch/i386/kernel/io_apic-xen.c | 29 ----------------------------
+ arch/x86_64/kernel/io_apic-xen.c | 29 ----------------------------
+ include/asm-i386/io_apic.h | 30 +++++++++++++++++++++++++++++
+ include/asm-i386/mach-xen/asm/fixmap.h | 4 ++-
+ include/asm-x86_64/io_apic.h | 32 +++++++++++++++++++++++++++++++
+ include/asm-x86_64/mach-xen/asm/fixmap.h | 4 ++-
+ 6 files changed, 68 insertions(+), 60 deletions(-)
+
+--- linux-2.6.18.orig/arch/i386/kernel/io_apic-xen.c
++++ linux-2.6.18/arch/i386/kernel/io_apic-xen.c
@@ -45,9 +45,6 @@
#ifdef CONFIG_XEN
@@ -50,10 +57,8 @@
#endif /* CONFIG_XEN */
int (*ioapic_renumber_irq)(int ioapic, int irq);
-Index: head-2006-08-28/arch/x86_64/kernel/io_apic-xen.c
-===================================================================
---- head-2006-08-28.orig/arch/x86_64/kernel/io_apic-xen.c 2006-08-28 10:55:17.000000000 +0200
-+++ head-2006-08-28/arch/x86_64/kernel/io_apic-xen.c 2006-08-28 10:57:30.000000000 +0200
+--- linux-2.6.18.orig/arch/x86_64/kernel/io_apic-xen.c
++++ linux-2.6.18/arch/x86_64/kernel/io_apic-xen.c
@@ -92,9 +92,6 @@ int vector_irq[NR_VECTORS] __read_mostly
#ifdef CONFIG_XEN
@@ -97,10 +102,8 @@
#define clear_IO_APIC() ((void)0)
#else
-Index: head-2006-08-28/include/asm-i386/io_apic.h
-===================================================================
---- head-2006-08-28.orig/include/asm-i386/io_apic.h 2006-08-28 10:43:40.000000000 +0200
-+++ head-2006-08-28/include/asm-i386/io_apic.h 2006-08-28 10:57:30.000000000 +0200
+--- linux-2.6.18.orig/include/asm-i386/io_apic.h
++++ linux-2.6.18/include/asm-i386/io_apic.h
@@ -52,9 +52,14 @@ static inline void end_edge_ioapic_irq (
#define end_edge_ioapic end_edge_ioapic_irq
#endif
@@ -169,10 +172,8 @@
/* 1 if "noapic" boot option passed */
extern int skip_ioapic_setup;
-Index: head-2006-08-28/include/asm-i386/mach-xen/asm/fixmap.h
-===================================================================
---- head-2006-08-28.orig/include/asm-i386/mach-xen/asm/fixmap.h 2006-08-28 10:55:17.000000000 +0200
-+++ head-2006-08-28/include/asm-i386/mach-xen/asm/fixmap.h 2006-08-28 10:57:30.000000000 +0200
+--- linux-2.6.18.orig/include/asm-i386/mach-xen/asm/fixmap.h
++++ linux-2.6.18/include/asm-i386/mach-xen/asm/fixmap.h
@@ -53,13 +53,15 @@ extern unsigned long __FIXADDR_TOP;
enum fixed_addresses {
FIX_HOLE,
@@ -190,10 +191,8 @@
#ifdef CONFIG_X86_VISWS_APIC
FIX_CO_CPU, /* Cobalt timer */
FIX_CO_APIC, /* Cobalt APIC Redirection Table */
-Index: head-2006-08-28/include/asm-x86_64/io_apic.h
-===================================================================
---- head-2006-08-28.orig/include/asm-x86_64/io_apic.h 2006-08-28 10:43:48.000000000 +0200
-+++ head-2006-08-28/include/asm-x86_64/io_apic.h 2006-08-28 10:57:30.000000000 +0200
+--- linux-2.6.18.orig/include/asm-x86_64/io_apic.h
++++ linux-2.6.18/include/asm-x86_64/io_apic.h
@@ -54,9 +54,14 @@ static inline void end_edge_ioapic_irq (
#define APIC_MISMATCH_DEBUG
@@ -260,10 +259,8 @@
/* 1 if "noapic" boot option passed */
extern int skip_ioapic_setup;
-Index: head-2006-08-28/include/asm-x86_64/mach-xen/asm/fixmap.h
-===================================================================
---- head-2006-08-28.orig/include/asm-x86_64/mach-xen/asm/fixmap.h 2006-08-28 10:55:17.000000000 +0200
-+++ head-2006-08-28/include/asm-x86_64/mach-xen/asm/fixmap.h 2006-08-28 10:57:30.000000000 +0200
+--- linux-2.6.18.orig/include/asm-x86_64/mach-xen/asm/fixmap.h
++++ linux-2.6.18/include/asm-x86_64/mach-xen/asm/fixmap.h
@@ -39,13 +39,15 @@ enum fixed_addresses {
VSYSCALL_FIRST_PAGE = VSYSCALL_LAST_PAGE + ((VSYSCALL_END-VSYSCALL_START) >> PAGE_SHIFT) - 1,
VSYSCALL_HPET,
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.xen/xen3-auto-common.diff new/patches.xen/xen3-auto-common.diff
--- old/patches.xen/xen3-auto-common.diff 2006-09-22 08:42:40.000000000 +0200
+++ new/patches.xen/xen3-auto-common.diff 2006-10-16 17:56:31.000000000 +0200
@@ -3,10 +3,32 @@
Patch-mainline: obsolete
Acked-by: jbeulich@novell.com
-Index: head-2006-09-21/drivers/char/mem.c
-===================================================================
---- head-2006-09-21.orig/drivers/char/mem.c 2006-09-21 09:56:23.000000000 +0200
-+++ head-2006-09-21/drivers/char/mem.c 2006-09-21 09:58:24.000000000 +0200
+---
+ drivers/char/mem.c | 6
+ drivers/char/tpm/Makefile | 2
+ drivers/char/tpm/tpm.c | 55 +++
+ drivers/char/tpm/tpm.h | 39 ++
+ drivers/char/tpm/tpm_vtpm.c | 547 +++++++++++++++++++++++++++++++
+ drivers/char/tpm/tpm_vtpm.h | 68 +++
+ drivers/char/tpm/tpm_xen.c | 756 ++++++++++++++++++++++++++++++++++++++++++++
+ include/linux/gfp.h | 6
+ include/linux/highmem.h | 6
+ include/linux/interrupt.h | 6
+ include/linux/mm.h | 10
+ include/linux/skbuff.h | 11
+ kernel/fork.c | 3
+ kernel/irq/spurious.c | 3
+ lib/Makefile | 3
+ mm/highmem.c | 11
+ mm/memory.c | 118 ++++++
+ mm/mmap.c | 4
+ mm/page_alloc.c | 6
+ net/core/dev.c | 63 +++
+ net/core/skbuff.c | 42 +-
+ 21 files changed, 1749 insertions(+), 16 deletions(-)
+
+--- linux-2.6.18.orig/drivers/char/mem.c
++++ linux-2.6.18/drivers/char/mem.c
@@ -101,6 +101,7 @@ static inline int valid_mmap_phys_addr_r
}
#endif
@@ -41,20 +63,16 @@
static const struct file_operations kmem_fops = {
.llseek = memory_lseek,
-Index: head-2006-09-21/drivers/char/tpm/Makefile
-===================================================================
---- head-2006-09-21.orig/drivers/char/tpm/Makefile 2006-09-21 09:56:23.000000000 +0200
-+++ head-2006-09-21/drivers/char/tpm/Makefile 2006-09-21 09:58:24.000000000 +0200
+--- linux-2.6.18.orig/drivers/char/tpm/Makefile
++++ linux-2.6.18/drivers/char/tpm/Makefile
@@ -9,3 +9,5 @@ obj-$(CONFIG_TCG_TIS) += tpm_tis.o
obj-$(CONFIG_TCG_NSC) += tpm_nsc.o
obj-$(CONFIG_TCG_ATMEL) += tpm_atmel.o
obj-$(CONFIG_TCG_INFINEON) += tpm_infineon.o
+obj-$(CONFIG_TCG_XEN) += tpm_xenu.o
+tpm_xenu-y = tpm_xen.o tpm_vtpm.o
-Index: head-2006-09-21/drivers/char/tpm/tpm.c
-===================================================================
---- head-2006-09-21.orig/drivers/char/tpm/tpm.c 2006-09-21 09:56:23.000000000 +0200
-+++ head-2006-09-21/drivers/char/tpm/tpm.c 2006-09-21 09:58:24.000000000 +0200
+--- linux-2.6.18.orig/drivers/char/tpm/tpm.c
++++ linux-2.6.18/drivers/char/tpm/tpm.c
@@ -30,7 +30,9 @@
enum tpm_const {
@@ -175,10 +193,8 @@
return ret_size;
}
EXPORT_SYMBOL_GPL(tpm_read);
-Index: head-2006-09-21/drivers/char/tpm/tpm.h
-===================================================================
---- head-2006-09-21.orig/drivers/char/tpm/tpm.h 2006-09-21 09:56:23.000000000 +0200
-+++ head-2006-09-21/drivers/char/tpm/tpm.h 2006-09-21 09:58:24.000000000 +0200
+--- linux-2.6.18.orig/drivers/char/tpm/tpm.h
++++ linux-2.6.18/drivers/char/tpm/tpm.h
@@ -26,6 +26,13 @@
#include
#include
@@ -253,10 +269,8 @@
extern void tpm_get_timeouts(struct tpm_chip *);
extern void tpm_gen_interrupt(struct tpm_chip *);
extern void tpm_continue_selftest(struct tpm_chip *);
-Index: head-2006-09-21/drivers/char/tpm/tpm_vtpm.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2006-09-21/drivers/char/tpm/tpm_vtpm.c 2006-09-21 09:58:24.000000000 +0200
+--- /dev/null
++++ linux-2.6.18/drivers/char/tpm/tpm_vtpm.c
@@ -0,0 +1,547 @@
+/*
+ * Copyright (C) 2006 IBM Corporation
@@ -805,10 +819,8 @@
+ tpm_remove_hardware(dev);
+ kfree(vtpms);
+}
-Index: head-2006-09-21/drivers/char/tpm/tpm_vtpm.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2006-09-21/drivers/char/tpm/tpm_vtpm.h 2006-09-21 09:58:24.000000000 +0200
+--- /dev/null
++++ linux-2.6.18/drivers/char/tpm/tpm_vtpm.h
@@ -0,0 +1,68 @@
+#ifndef TPM_VTPM_H
+#define TPM_VTPM_H
@@ -878,10 +890,8 @@
+}
+
+#endif
-Index: head-2006-09-21/drivers/char/tpm/tpm_xen.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2006-09-21/drivers/char/tpm/tpm_xen.c 2006-09-21 09:58:24.000000000 +0200
+--- /dev/null
++++ linux-2.6.18/drivers/char/tpm/tpm_xen.c
@@ -0,0 +1,756 @@
+/*
+ * Copyright (c) 2005, IBM Corporation
@@ -1639,10 +1649,8 @@
+module_init(tpmif_init);
+
+MODULE_LICENSE("Dual BSD/GPL");
-Index: head-2006-09-21/include/linux/gfp.h
-===================================================================
---- head-2006-09-21.orig/include/linux/gfp.h 2006-09-21 09:56:24.000000000 +0200
-+++ head-2006-09-21/include/linux/gfp.h 2006-09-21 09:58:24.000000000 +0200
+--- linux-2.6.18.orig/include/linux/gfp.h
++++ linux-2.6.18/include/linux/gfp.h
@@ -99,7 +99,11 @@ static inline int gfp_zone(gfp_t gfp)
*/
@@ -1656,10 +1664,8 @@
#endif
extern struct page *
-Index: head-2006-09-21/include/linux/highmem.h
-===================================================================
---- head-2006-09-21.orig/include/linux/highmem.h 2006-09-21 09:56:24.000000000 +0200
-+++ head-2006-09-21/include/linux/highmem.h 2006-09-21 09:58:24.000000000 +0200
+--- linux-2.6.18.orig/include/linux/highmem.h
++++ linux-2.6.18/include/linux/highmem.h
@@ -24,10 +24,16 @@ static inline void flush_kernel_dcache_p
/* declarations for linux/mm/highmem.c */
@@ -1677,10 +1683,8 @@
static inline void *kmap(struct page *page)
{
-Index: head-2006-09-21/include/linux/interrupt.h
-===================================================================
---- head-2006-09-21.orig/include/linux/interrupt.h 2006-09-21 09:56:24.000000000 +0200
-+++ head-2006-09-21/include/linux/interrupt.h 2006-09-21 09:58:24.000000000 +0200
+--- linux-2.6.18.orig/include/linux/interrupt.h
++++ linux-2.6.18/include/linux/interrupt.h
@@ -166,6 +166,12 @@ static inline int disable_irq_wake(unsig
#endif /* CONFIG_GENERIC_HARDIRQS */
@@ -1694,10 +1698,8 @@
#ifndef __ARCH_SET_SOFTIRQ_PENDING
#define set_softirq_pending(x) (local_softirq_pending() = (x))
#define or_softirq_pending(x) (local_softirq_pending() |= (x))
-Index: head-2006-09-21/include/linux/mm.h
-===================================================================
---- head-2006-09-21.orig/include/linux/mm.h 2006-09-21 09:56:24.000000000 +0200
-+++ head-2006-09-21/include/linux/mm.h 2006-09-21 09:58:24.000000000 +0200
+--- linux-2.6.18.orig/include/linux/mm.h
++++ linux-2.6.18/include/linux/mm.h
@@ -164,6 +164,9 @@ extern unsigned int kobjsize(const void
#define VM_NONLINEAR 0x00800000 /* Is non-linear (remap_file_pages) */
#define VM_MAPPED_COPY 0x01000000 /* T if mapped copy of data (nommu mmap) */
@@ -1722,10 +1724,8 @@
#ifdef CONFIG_PROC_FS
void vm_stat_account(struct mm_struct *, unsigned long, struct file *, long);
#else
-Index: head-2006-09-21/include/linux/skbuff.h
-===================================================================
---- head-2006-09-21.orig/include/linux/skbuff.h 2006-09-21 09:56:24.000000000 +0200
-+++ head-2006-09-21/include/linux/skbuff.h 2006-09-21 09:58:24.000000000 +0200
+--- linux-2.6.18.orig/include/linux/skbuff.h
++++ linux-2.6.18/include/linux/skbuff.h
@@ -203,6 +203,8 @@ enum {
* @local_df: allow local fragmentation
* @cloned: Head may be cloned (check refcnt to be sure)
@@ -1759,10 +1759,8 @@
extern void kfree_skbmem(struct sk_buff *skb);
extern struct sk_buff *skb_clone(struct sk_buff *skb,
gfp_t priority);
-Index: head-2006-09-21/kernel/fork.c
-===================================================================
---- head-2006-09-21.orig/kernel/fork.c 2006-09-21 09:56:24.000000000 +0200
-+++ head-2006-09-21/kernel/fork.c 2006-09-21 09:58:24.000000000 +0200
+--- linux-2.6.18.orig/kernel/fork.c
++++ linux-2.6.18/kernel/fork.c
@@ -276,6 +276,9 @@ static inline int dup_mmap(struct mm_str
if (retval)
goto out;
@@ -1773,10 +1771,8 @@
retval = 0;
out:
up_write(&mm->mmap_sem);
-Index: head-2006-09-21/kernel/irq/spurious.c
-===================================================================
---- head-2006-09-21.orig/kernel/irq/spurious.c 2006-09-21 09:56:24.000000000 +0200
-+++ head-2006-09-21/kernel/irq/spurious.c 2006-09-21 09:58:24.000000000 +0200
+--- linux-2.6.18.orig/kernel/irq/spurious.c
++++ linux-2.6.18/kernel/irq/spurious.c
@@ -139,7 +139,8 @@ void note_interrupt(unsigned int irq, st
irqreturn_t action_ret, struct pt_regs *regs)
{
@@ -1787,10 +1783,8 @@
if (unlikely(action_ret != IRQ_NONE))
report_bad_irq(irq, desc, action_ret);
}
-Index: head-2006-09-21/lib/Makefile
-===================================================================
---- head-2006-09-21.orig/lib/Makefile 2006-09-21 09:56:24.000000000 +0200
-+++ head-2006-09-21/lib/Makefile 2006-09-21 09:58:24.000000000 +0200
+--- linux-2.6.18.orig/lib/Makefile
++++ linux-2.6.18/lib/Makefile
@@ -52,6 +52,9 @@ obj-$(CONFIG_SMP) += percpu_counter.o
obj-$(CONFIG_AUDIT_GENERIC) += audit.o
@@ -1801,10 +1795,8 @@
hostprogs-y := gen_crc32table
clean-files := crc32table.h
-Index: head-2006-09-21/mm/highmem.c
-===================================================================
---- head-2006-09-21.orig/mm/highmem.c 2006-09-21 09:56:24.000000000 +0200
-+++ head-2006-09-21/mm/highmem.c 2006-09-21 09:58:24.000000000 +0200
+--- linux-2.6.18.orig/mm/highmem.c
++++ linux-2.6.18/mm/highmem.c
@@ -142,6 +142,17 @@ start:
return vaddr;
}
@@ -1823,10 +1815,8 @@
void fastcall *kmap_high(struct page *page)
{
unsigned long vaddr;
-Index: head-2006-09-21/mm/memory.c
-===================================================================
---- head-2006-09-21.orig/mm/memory.c 2006-09-21 09:56:24.000000000 +0200
-+++ head-2006-09-21/mm/memory.c 2006-09-21 09:58:24.000000000 +0200
+--- linux-2.6.18.orig/mm/memory.c
++++ linux-2.6.18/mm/memory.c
@@ -390,7 +390,7 @@ struct page *vm_normal_page(struct vm_ar
if (unlikely(vma->vm_flags & VM_PFNMAP)) {
@@ -1966,10 +1956,8 @@
/*
* handle_pte_fault chooses page fault handler according to an entry
* which was read non-atomically. Before making any commitment, on
-Index: head-2006-09-21/mm/mmap.c
-===================================================================
---- head-2006-09-21.orig/mm/mmap.c 2006-09-21 09:56:24.000000000 +0200
-+++ head-2006-09-21/mm/mmap.c 2006-09-21 09:58:24.000000000 +0200
+--- linux-2.6.18.orig/mm/mmap.c
++++ linux-2.6.18/mm/mmap.c
@@ -1963,6 +1963,10 @@ void exit_mmap(struct mm_struct *mm)
unsigned long nr_accounted = 0;
unsigned long end;
@@ -1981,10 +1969,8 @@
lru_add_drain();
flush_cache_mm(mm);
tlb = tlb_gather_mmu(mm, 1);
-Index: head-2006-09-21/mm/page_alloc.c
-===================================================================
---- head-2006-09-21.orig/mm/page_alloc.c 2006-09-21 09:56:24.000000000 +0200
-+++ head-2006-09-21/mm/page_alloc.c 2006-09-21 09:58:24.000000000 +0200
+--- linux-2.6.18.orig/mm/page_alloc.c
++++ linux-2.6.18/mm/page_alloc.c
@@ -443,7 +443,8 @@ static void __free_pages_ok(struct page
int i;
int reserved = 0;
@@ -2005,10 +1991,8 @@
if (PageAnon(page))
page->mapping = NULL;
-Index: head-2006-09-21/net/core/dev.c
-===================================================================
---- head-2006-09-21.orig/net/core/dev.c 2006-09-21 09:56:24.000000000 +0200
-+++ head-2006-09-21/net/core/dev.c 2006-09-21 09:58:24.000000000 +0200
+--- linux-2.6.18.orig/net/core/dev.c
++++ linux-2.6.18/net/core/dev.c
@@ -118,6 +118,12 @@
#include
#include
@@ -2079,7 +2063,7 @@
/* GSO will handle the following emulations directly. */
if (netif_needs_gso(dev, skb))
goto gso;
-@@ -1800,6 +1849,19 @@ int netif_receive_skb(struct sk_buff *sk
+@@ -1802,6 +1851,19 @@ int netif_receive_skb(struct sk_buff *sk
}
#endif
@@ -2099,7 +2083,7 @@
list_for_each_entry_rcu(ptype, &ptype_all, list) {
if (!ptype->dev || ptype->dev == skb->dev) {
if (pt_prev)
-@@ -3586,6 +3648,7 @@ EXPORT_SYMBOL(unregister_netdevice_notif
+@@ -3588,6 +3650,7 @@ EXPORT_SYMBOL(unregister_netdevice_notif
EXPORT_SYMBOL(net_enable_timestamp);
EXPORT_SYMBOL(net_disable_timestamp);
EXPORT_SYMBOL(dev_get_flags);
@@ -2107,10 +2091,8 @@
#if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE)
EXPORT_SYMBOL(br_handle_frame_hook);
-Index: head-2006-09-21/net/core/skbuff.c
-===================================================================
---- head-2006-09-21.orig/net/core/skbuff.c 2006-09-21 09:56:24.000000000 +0200
-+++ head-2006-09-21/net/core/skbuff.c 2006-09-21 09:58:24.000000000 +0200
+--- linux-2.6.18.orig/net/core/skbuff.c
++++ linux-2.6.18/net/core/skbuff.c
@@ -139,6 +139,7 @@ EXPORT_SYMBOL(skb_truesize_bug);
* Buffers may only be allocated from interrupts using a @gfp_mask of
* %GFP_ATOMIC.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.xen/xen3-auto-xen-kconfig.diff new/patches.xen/xen3-auto-xen-kconfig.diff
--- old/patches.xen/xen3-auto-xen-kconfig.diff 2006-09-22 08:42:41.000000000 +0200
+++ new/patches.xen/xen3-auto-xen-kconfig.diff 2006-10-16 17:56:31.000000000 +0200
@@ -3,10 +3,25 @@
Patch-mainline: obsolete
Acked-by: jbeulich@novell.com
-Index: head-2006-09-21/arch/i386/Kconfig
-===================================================================
---- head-2006-09-21.orig/arch/i386/Kconfig 2006-09-21 09:56:24.000000000 +0200
-+++ head-2006-09-21/arch/i386/Kconfig 2006-09-21 09:58:14.000000000 +0200
+---
+ arch/i386/Kconfig | 88 +++++++++++---
+ arch/i386/Kconfig.cpu | 2
+ arch/i386/Kconfig.debug | 1
+ arch/x86_64/Kconfig | 64 +++++++++-
+ drivers/acpi/Kconfig | 3
+ drivers/char/tpm/Kconfig | 10 +
+ drivers/firmware/Kconfig | 2
+ drivers/pci/Kconfig | 1
+ drivers/serial/Kconfig | 2
+ drivers/video/console/Kconfig | 2
+ drivers/xen/Kconfig | 260 ++++++++++++++++++++++++++++++++++++++++++
+ fs/Kconfig | 1
+ kernel/Kconfig.preempt | 1
+ mm/Kconfig | 3
+ 14 files changed, 411 insertions(+), 29 deletions(-)
+
+--- linux-2.6.18.orig/arch/i386/Kconfig
++++ linux-2.6.18/arch/i386/Kconfig
@@ -103,6 +103,15 @@ config X86_PC
help
Choose this option if your computer is a standard PC or compatible.
@@ -281,10 +296,8 @@
config KTIME_SCALAR
bool
default y
-Index: head-2006-09-21/arch/i386/Kconfig.cpu
-===================================================================
---- head-2006-09-21.orig/arch/i386/Kconfig.cpu 2006-09-21 09:56:24.000000000 +0200
-+++ head-2006-09-21/arch/i386/Kconfig.cpu 2006-09-21 09:58:14.000000000 +0200
+--- linux-2.6.18.orig/arch/i386/Kconfig.cpu
++++ linux-2.6.18/arch/i386/Kconfig.cpu
@@ -251,7 +251,7 @@ config X86_PPRO_FENCE
config X86_F00F_BUG
@@ -294,10 +307,8 @@
default y
config X86_WP_WORKS_OK
-Index: head-2006-09-21/arch/i386/Kconfig.debug
-===================================================================
---- head-2006-09-21.orig/arch/i386/Kconfig.debug 2006-09-21 09:56:24.000000000 +0200
-+++ head-2006-09-21/arch/i386/Kconfig.debug 2006-09-21 09:58:14.000000000 +0200
+--- linux-2.6.18.orig/arch/i386/Kconfig.debug
++++ linux-2.6.18/arch/i386/Kconfig.debug
@@ -79,6 +79,7 @@ config X86_MPPARSE
config DOUBLEFAULT
default y
@@ -306,10 +317,8 @@
help
This option allows trapping of rare doublefault exceptions that
would otherwise cause a system to silently reboot. Disabling this
-Index: head-2006-09-21/arch/x86_64/Kconfig
-===================================================================
---- head-2006-09-21.orig/arch/x86_64/Kconfig 2006-09-21 09:56:24.000000000 +0200
-+++ head-2006-09-21/arch/x86_64/Kconfig 2006-09-21 09:58:14.000000000 +0200
+--- linux-2.6.18.orig/arch/x86_64/Kconfig
++++ linux-2.6.18/arch/x86_64/Kconfig
@@ -135,6 +135,22 @@ config GENERIC_CPU
endchoice
@@ -501,10 +510,8 @@
+source "drivers/xen/Kconfig"
+
source "lib/Kconfig"
-Index: head-2006-09-21/drivers/acpi/Kconfig
-===================================================================
---- head-2006-09-21.orig/drivers/acpi/Kconfig 2006-09-21 09:56:24.000000000 +0200
-+++ head-2006-09-21/drivers/acpi/Kconfig 2006-09-21 09:58:14.000000000 +0200
+--- linux-2.6.18.orig/drivers/acpi/Kconfig
++++ linux-2.6.18/drivers/acpi/Kconfig
@@ -45,7 +45,7 @@ if ACPI
config ACPI_SLEEP
@@ -522,10 +529,8 @@
default y
help
The Power Management Timer is available on all ACPI-capable,
-Index: head-2006-09-21/drivers/char/tpm/Kconfig
-===================================================================
---- head-2006-09-21.orig/drivers/char/tpm/Kconfig 2006-09-21 09:56:24.000000000 +0200
-+++ head-2006-09-21/drivers/char/tpm/Kconfig 2006-09-21 09:58:14.000000000 +0200
+--- linux-2.6.18.orig/drivers/char/tpm/Kconfig
++++ linux-2.6.18/drivers/char/tpm/Kconfig
@@ -58,5 +58,13 @@ config TCG_INFINEON
Further information on this driver and the supported hardware
can be found at http://www.prosec.rub.de/tpm
@@ -541,10 +546,8 @@
+ will be called tpm_xenu.
+endmenu
-Index: head-2006-09-21/drivers/firmware/Kconfig
-===================================================================
---- head-2006-09-21.orig/drivers/firmware/Kconfig 2006-09-21 09:56:24.000000000 +0200
-+++ head-2006-09-21/drivers/firmware/Kconfig 2006-09-21 09:58:14.000000000 +0200
+--- linux-2.6.18.orig/drivers/firmware/Kconfig
++++ linux-2.6.18/drivers/firmware/Kconfig
@@ -7,7 +7,7 @@ menu "Firmware Drivers"
config EDD
@@ -554,10 +557,8 @@
help
Say Y or M here if you want to enable BIOS Enhanced Disk Drive
Services real mode BIOS calls to determine which disk
-Index: head-2006-09-21/drivers/pci/Kconfig
-===================================================================
---- head-2006-09-21.orig/drivers/pci/Kconfig 2006-09-21 09:56:24.000000000 +0200
-+++ head-2006-09-21/drivers/pci/Kconfig 2006-09-21 09:58:14.000000000 +0200
+--- linux-2.6.18.orig/drivers/pci/Kconfig
++++ linux-2.6.18/drivers/pci/Kconfig
@@ -5,6 +5,7 @@ config PCI_MSI
bool "Message Signaled Interrupts (MSI and MSI-X)"
depends on PCI
@@ -566,10 +567,8 @@
help
This allows device drivers to enable MSI (Message Signaled
Interrupts). Message Signaled Interrupts enable a device to
-Index: head-2006-09-21/drivers/serial/Kconfig
-===================================================================
---- head-2006-09-21.orig/drivers/serial/Kconfig 2006-09-21 09:56:24.000000000 +0200
-+++ head-2006-09-21/drivers/serial/Kconfig 2006-09-21 09:58:14.000000000 +0200
+--- linux-2.6.18.orig/drivers/serial/Kconfig
++++ linux-2.6.18/drivers/serial/Kconfig
@@ -11,7 +11,7 @@ menu "Serial drivers"
config SERIAL_8250
tristate "8250/16550 and compatible serial support"
@@ -579,10 +578,8 @@
select SERIAL_CORE
---help---
This selects whether you want to include the driver for the standard
-Index: head-2006-09-21/drivers/video/console/Kconfig
-===================================================================
---- head-2006-09-21.orig/drivers/video/console/Kconfig 2006-09-21 09:56:24.000000000 +0200
-+++ head-2006-09-21/drivers/video/console/Kconfig 2006-09-21 09:58:14.000000000 +0200
+--- linux-2.6.18.orig/drivers/video/console/Kconfig
++++ linux-2.6.18/drivers/video/console/Kconfig
@@ -52,7 +52,7 @@ config VGACON_SOFT_SCROLLBACK_SIZE
config VIDEO_SELECT
@@ -592,10 +589,8 @@
---help---
This enables support for text mode selection on kernel startup. If
you want to take advantage of some high-resolution text mode your
-Index: head-2006-09-21/drivers/xen/Kconfig
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2006-09-21/drivers/xen/Kconfig 2006-09-21 09:58:14.000000000 +0200
+--- /dev/null
++++ linux-2.6.18/drivers/xen/Kconfig
@@ -0,0 +1,260 @@
+#
+# This Kconfig describe xen options
@@ -658,11 +653,11 @@
+ depends on XEN_BACKEND
+ default XEN_PRIVILEGED_GUEST
+ help
-+ The block tap driver is an alternative to the block back driver
++ The block tap driver is an alternative to the block back driver
+ and allows VM block requests to be redirected to userspace through
-+ a device interface. The tap allows user-space development of
++ a device interface. The tap allows user-space development of
+ high-performance block backends, where disk images may be implemented
-+ as files, in memory, or on other hosts across the network. This
++ as files, in memory, or on other hosts across the network. This
+ driver can safely coexist with the existing blockback driver.
+
+config XEN_NETDEV_BACKEND
@@ -857,11 +852,9 @@
+ depends on SMP
+
+endif
-Index: head-2006-09-21/fs/Kconfig
-===================================================================
---- head-2006-09-21.orig/fs/Kconfig 2006-09-21 09:56:24.000000000 +0200
-+++ head-2006-09-21/fs/Kconfig 2006-09-21 09:58:14.000000000 +0200
-@@ -878,6 +878,7 @@ config TMPFS_POSIX_ACL
+--- linux-2.6.18.orig/fs/Kconfig
++++ linux-2.6.18/fs/Kconfig
+@@ -890,6 +890,7 @@ config TMPFS_POSIX_ACL
config HUGETLBFS
bool "HugeTLB file system support"
depends X86 || IA64 || PPC64 || SPARC64 || SUPERH || BROKEN
@@ -869,10 +862,8 @@
help
hugetlbfs is a filesystem backing for HugeTLB pages, based on
ramfs. For architectures that support it, say Y here and read
-Index: head-2006-09-21/kernel/Kconfig.preempt
-===================================================================
---- head-2006-09-21.orig/kernel/Kconfig.preempt 2006-09-21 09:56:24.000000000 +0200
-+++ head-2006-09-21/kernel/Kconfig.preempt 2006-09-21 09:58:14.000000000 +0200
+--- linux-2.6.18.orig/kernel/Kconfig.preempt
++++ linux-2.6.18/kernel/Kconfig.preempt
@@ -35,6 +35,7 @@ config PREEMPT_VOLUNTARY
config PREEMPT
@@ -881,10 +872,8 @@
help
This option reduces the latency of the kernel by making
all kernel code (that is not executing in a critical section)
-Index: head-2006-09-21/mm/Kconfig
-===================================================================
---- head-2006-09-21.orig/mm/Kconfig 2006-09-21 09:56:24.000000000 +0200
-+++ head-2006-09-21/mm/Kconfig 2006-09-21 09:58:14.000000000 +0200
+--- linux-2.6.18.orig/mm/Kconfig
++++ linux-2.6.18/mm/Kconfig
@@ -127,11 +127,14 @@ comment "Memory hotplug is currently inc
# Default to 4 for wider testing, though 8 might be more appropriate.
# ARM's adjust_pte (unused if VIPT) depends on mm-wide page_table_lock.
++++++ series.conf ++++++
--- kernel-source/series.conf 2006-10-11 14:47:08.000000000 +0200
+++ kernel-source/series.conf 2006-10-16 17:56:31.000000000 +0200
@@ -20,8 +20,7 @@
# latest standard kernel patches
# DO NOT MODIFY THEM!
# Send separate patches upstream if you find a problem...
-
- patches.fixes/ppc-ide-interrupt.patch
+ patches.kernel.org/patch-2.6.18.1
########################################################
#
@@ -49,9 +48,6 @@
#
# patches for certain architectures
#
- # NOTE: arch specific patches should be applied at the
- # end normally!!!!!
- #
# ia64
patches.arch/stack-limit
@@ -69,6 +65,7 @@
# numa mempolicy
# suse ppc
+ patches.arch/ppc-via-pmu-acpower.patch
patches.suse/suse-ppc-legacy-io.patch
patches.suse/ppc-aic7xxx-get_signalling-disable.patch
patches.suse/suse-ppc-pmac_zilog-i8250-coexistance.patch
@@ -78,6 +75,7 @@
patches.suse/suse-ppc32-mol-mm-context
# suse ppc64
+ patches.arch/ppc-os-term-panic_timeout.patch
patches.drivers/ppc64-adb
patches.suse/suse-ppc64-branding
patches.arch/ppc64-xmon-autobacktrace.patch
@@ -178,7 +176,6 @@
########################################################
# ext3
########################################################
-+agruen patches.suse/ext3-register-filesystem-lifo
patches.suse/ext3-barrier-default
# NFSv4 ACL support (agruen -- experimental)
@@ -421,15 +418,6 @@
+andrea patches.fixes/account-reserved-pages
-### patches added in SLES9 SP1
-### IN NO PARTICULAR ORDER
-###
-### NOTE:
-### If you remove a patch from the list below because it
-### is not needed anymore for 2.6.10, please add a Patch-mainline
-### header to the patch to avoid duplicate work during SLES10
-### development. --okir
-###
patches.suse/osync-error
patches.suse/connector-read-mostly
@@ -442,7 +430,6 @@
patches.arch/disable-apic-error
patches.fixes/dm_check_device_area.diff
patches.drivers/ixgb-eeh.patch
- patches.fixes/invalidate_complete_page2.patch
patches.fixes/invalidate_page_non_destructive
patches.fixes/nf_bridge-header-size
@@ -457,6 +444,7 @@
patches.suse/sysctl-add-affinity_load_balancing
patches.fixes/loop-barriers
+ patches.fixes/grow_buffers-infinite-loop-fix.diff
# 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@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org