Hello community,
here is the log from the commit of package kernel-source for openSUSE:Factory
checked in at Tue Sep 7 15:31:15 CEST 2010.
--------
--- kernel-source/kernel-debug.changes 2010-06-29 07:00:27.000000000 +0200
+++ kernel-source/kernel-debug.changes 2010-09-04 07:01:04.000000000 +0200
@@ -1,0 +2,521 @@
+Fri Sep 3 18:57:13 CEST 2010 - jeffm@suse.de
+
+- Always build in AGP on x86/x86_64 so KMS works on LiveCDs (bnc#609607).
+- commit d9bfa1e
+
+-------------------------------------------------------------------
+Fri Sep 3 16:38:10 CEST 2010 - jeffm@suse.com
+
+- irda: Correctly clean up self->ias_obj on irda_bind() failure
+ (CVE-2010-2954 bnc#636112).
+- commit f04e61f
+
+-------------------------------------------------------------------
+Wed Sep 1 12:04:59 CEST 2010 - jbeulich@novell.com
+
+- Update Xen patches to 2.6.36-rc3 and c/s 1029.
+- fix unwind annotations.
+- config.conf: Re-enable Xen.
+- Update x86 config files.
+- commit 6836619
+
+-------------------------------------------------------------------
+Wed Sep 1 11:40:45 CEST 2010 - jbeulich@novell.com
+
+- fix unwind annotations.
+- commit 5aa6daf
+
+-------------------------------------------------------------------
+Wed Sep 1 00:53:49 CEST 2010 - jeffm@suse.com
+
+- net sched: fix kernel leak in act_police (CVE-2010-2942
+ bnc#632309).
+- commit 66e1d72
+
+-------------------------------------------------------------------
+Tue Aug 31 14:02:33 CEST 2010 - jdelvare@suse.de
+
+- fix jiffies overflow problems in bonding (bnc#613273).
+- commit 28bd2e8
+
+-------------------------------------------------------------------
+Mon Aug 30 17:24:07 CEST 2010 - jeffm@suse.de
+
+- Refresh vanilla configs.
+- commit 26a681e
+
+-------------------------------------------------------------------
+Mon Aug 30 17:03:30 CEST 2010 - jeffm@suse.de
+
+- Update to Linux: 2.6.36-rc3.
+ - Eliminated 7 patches.
+- commit d298d2d
+
+-------------------------------------------------------------------
+Sat Aug 28 13:09:20 CEST 2010 - jslaby@suse.cz
+
+- Delete
+ patches.suse/rlim-0020-core-optimize-setrlimit-for-current-task.patch.
+- Delete
+ patches.suse/rlim-0021-FS-proc-switch-limits-reading-to-fops.patch.
+- Delete
+ patches.suse/rlim-0022-FS-proc-make-limits-writable.patch.
+ This was just a workaround crap. In 2.6.36 we have a nice syscall
+ instead. Sorry for commiting this to the merge-36 branch first. I
+ didn't notice it was already merged here.
+- commit 5449fcb
+
+-------------------------------------------------------------------
+Fri Aug 27 16:26:16 CEST 2010 - jeffm@suse.com
+
+- Disabled ACPI table override patches again. fsnotify was introduced into
+ the truncate path and causes crashes.
+- commit e18fc2c
+
+-------------------------------------------------------------------
+Thu Aug 26 16:55:14 CEST 2010 - jeffm@suse.de
+
+- Refresh patches.suse/supported-flag-enterprise: Fixed recovery on load failure.
+- commit 8a06643
+
+-------------------------------------------------------------------
+Thu Aug 26 16:54:46 CEST 2010 - jeffm@suse.de
+
+- Refresh patches.suse/stack-unwind: Fixed recovery on load failure.
+- commit 7f15b29
+
+-------------------------------------------------------------------
+Tue Aug 24 20:06:39 CEST 2010 - jeffm@suse.com
+
+- patches.arch/s390-message-catalog.diff: dev_info -> _dev_info
+- commit ba20988
+
+-------------------------------------------------------------------
+Tue Aug 24 18:31:36 CEST 2010 - jeffm@suse.de
+
+- patches.suse/stack-unwind: Fix build on !SMP
+- commit abd5493
+
+-------------------------------------------------------------------
+Tue Aug 24 18:07:05 CEST 2010 - jeffm@suse.de
+
+- s390: Fix prototype for execve.
+- commit b448268
+
+-------------------------------------------------------------------
+Tue Aug 24 17:47:48 CEST 2010 - jeffm@suse.de
+
+- spectra: depend on X86_MRST.
+- commit 1e3fb89
+
+-------------------------------------------------------------------
+Tue Aug 24 17:16:11 CEST 2010 - jeffm@suse.de
+
+- Delete patches.arch/ppc-vmcoreinfo.diff.
+- commit ea39e14
+
+-------------------------------------------------------------------
+Tue Aug 24 17:11:08 CEST 2010 - jeffm@suse.de
+
+- caif: Use asm/unaligned.h.
+- commit 92c07c2
+
+-------------------------------------------------------------------
+Tue Aug 24 17:07:45 CEST 2010 - jeffm@suse.de
+
+- Refresh patches.suse/SoN-20-netvm-tcp-deadlock.patch: Added missing
+ fixup for sk_rmem_schedule in caif.
+- commit a9ff761
+
+-------------------------------------------------------------------
+Tue Aug 24 16:47:58 CEST 2010 - mmarek@suse.cz
+
+- makefile: not need to regenerate kernel.release file when
+ make kernelrelease.
+- commit 81237a8
+
+-------------------------------------------------------------------
+Tue Aug 24 16:18:58 CEST 2010 - jeffm@suse.com
+
+- rpm/kernel-source.spec.in, scripts/tar-up.sh: Renamed config-options.changes
+ to config-options.changes.txt in the exported package to avoid triggering
+ a build service rule error.
+- commit ff4889e
+
+-------------------------------------------------------------------
+Tue Aug 24 16:16:55 CEST 2010 - jeffm@suse.com
+
+- Revert "- Renamed doc/config-options.changes to doc/config-options.changes.txt to"
+ This reverts commit 124ac26de4839f8181a5badedb231eedf5770a3e.
+- commit 2932c62
+
+-------------------------------------------------------------------
+Tue Aug 24 15:43:02 CEST 2010 - jeffm@suse.com
+
+- Renamed doc/config-options.changes to doc/config-options.changes.txt to
+ avoid triggering a build service rule error.
+- commit 124ac26
+
+-------------------------------------------------------------------
+Mon Aug 23 21:06:58 CEST 2010 - jeffm@suse.de
+
+- supported.conf: Add iscsi_boot_sysfs
+- commit 80e2ea9
+
+-------------------------------------------------------------------
+Mon Aug 23 20:25:52 CEST 2010 - jeffm@suse.de
+
+- rpm/kernel-binary.spec.in: Fixed typo with last fix.
+- commit 22210d9
+
+-------------------------------------------------------------------
+Mon Aug 23 20:14:03 CEST 2010 - jeffm@suse.de
+
+- rpm/kernel-binary.spec.in: Disable CONFIG_DEBUG_INFO. It's enabled
+ dynamically in the spec file and now has follow-on options.
+- commit d270759
+
+-------------------------------------------------------------------
+Mon Aug 23 19:57:40 CEST 2010 - jeffm@suse.de
+
+- patches.rpmify/spectra-drop-locked_ioctl-support: add
+ to grab the BKL
+- commit 1df02ec
+
+-------------------------------------------------------------------
+Mon Aug 23 17:57:06 CEST 2010 - jeffm@suse.de
+
+- Update config files: Disabled DEBUG_INFO_REDUCED.
+- commit 393680a
+
+-------------------------------------------------------------------
+Mon Aug 23 16:59:08 CEST 2010 - jeffm@suse.de
+
+- Updated to 2.6.36-rc2.
+ - Eliminated 2 patches.
+- commit 52d47a0
+
++++ 458 more lines (skipped)
++++ between kernel-source/kernel-debug.changes
++++ and kernel-source/kernel-debug.changes
kernel-default.changes: same change
kernel-desktop.changes: same change
kernel-docs.changes: same change
kernel-ec2.changes: same change
kernel-net.changes: same change
kernel-pae.changes: same change
kernel-ppc64.changes: same change
kernel-ps3.changes: same change
kernel-s390.changes: same change
kernel-source.changes: same change
kernel-syms.changes: same change
kernel-trace.changes: same change
kernel-vanilla.changes: same change
kernel-vmi.changes: same change
kernel-xen.changes: same change
calling whatdependson for head-i586
Old:
----
linux-2.6.34.tar.bz2
New:
----
config-options.changes.txt
linux-2.6.35.tar.bz2
log.sh
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kernel-debug.spec ++++++
--- /var/tmp/diff_new_pack.CXp4uP/_old 2010-09-07 15:27:46.000000000 +0200
+++ /var/tmp/diff_new_pack.CXp4uP/_new 2010-09-07 15:27:46.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-debug (Version 2.6.34)
+# spec file for package kernel-debug (Version 2.6.36)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -17,8 +17,8 @@
# norootforbuild
-%define srcversion 2.6.34
-%define patchversion 2.6.34
+%define srcversion 2.6.35
+%define patchversion 2.6.36-rc3
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
@@ -35,7 +35,7 @@
%define rpm_install_dir %buildroot%obj_install_dir
%define kernel_build_dir %my_builddir/linux-obj
-%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,check-supported-list,group-source-files.pl,built-in-where,symsets.pl,find-provides,split-modules,modversions,extract-modaliases,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,configtool.pl})
+%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,check-supported-list,group-source-files.pl,built-in-where,symsets.pl,find-provides,split-modules,modversions,extract-modaliases,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,configtool.pl,log.sh})
%global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
%define cpu_arch_flavor %cpu_arch/%build_flavor
@@ -55,8 +55,8 @@
Name: kernel-debug
Summary: A Debug Version of the Kernel
-Version: 2.6.34
-Release: 12
+Version: 2.6.36
+Release: 1
%if %using_buildservice
%else
%endif
@@ -153,6 +153,7 @@
Source35: group-source-files.pl
Source37: README.SUSE
Source38: README.KSYMS
+Source39: config-options.changes.txt
Source40: source-timestamp
Source41: built-in-where
Source42: symsets.pl
@@ -176,6 +177,7 @@
Source64: package-descriptions
Source65: kernel-spec-macros
Source66: configtool.pl
+Source67: log.sh
Source100: config.tar.bz2
Source101: config.addon.tar.bz2
Source102: patches.arch.tar.bz2
@@ -306,7 +308,8 @@
--set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \
--enable CONFIG_SUSE_KERNEL \
%if 0%{?__debug_package:1}
- --enable CONFIG_DEBUG_INFO
+ --enable CONFIG_DEBUG_INFO \
+ --disable CONFIG_DEBUG_INFO_REDUCED
%else
--disable CONFIG_DEBUG_INFO
%endif
kernel-default.spec: same change
kernel-desktop.spec: same change
++++++ kernel-docs.spec ++++++
--- /var/tmp/diff_new_pack.CXp4uP/_old 2010-09-07 15:27:46.000000000 +0200
+++ /var/tmp/diff_new_pack.CXp4uP/_new 2010-09-07 15:27:46.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-docs (Version 2.6.34)
+# spec file for package kernel-docs (Version 2.6.36)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -17,20 +17,20 @@
# norootforbuild
-%define patchversion 2.6.34
+%define patchversion 2.6.36-rc3
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
Name: kernel-docs
BuildRequires: docbook-toys docbook-utils ghostscript_any libjpeg-devel texlive transfig xmlto xorg-x11-devel
-BuildRequires: kernel-source%variant = 2.6.34
+BuildRequires: kernel-source%variant = 2.6.36
Url: http://www.kernel.org/
License: GPLv2+
Group: Documentation/Man
AutoReqProv: on
-Version: 2.6.34
-Release: 12
+Version: 2.6.36
+Release: 1
%if %using_buildservice
%else
%endif
++++++ kernel-ec2.spec ++++++
--- /var/tmp/diff_new_pack.CXp4uP/_old 2010-09-07 15:27:46.000000000 +0200
+++ /var/tmp/diff_new_pack.CXp4uP/_new 2010-09-07 15:27:46.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-ec2 (Version 2.6.34)
+# spec file for package kernel-ec2 (Version 2.6.36)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -17,8 +17,8 @@
# norootforbuild
-%define srcversion 2.6.34
-%define patchversion 2.6.34
+%define srcversion 2.6.35
+%define patchversion 2.6.36-rc3
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
@@ -35,7 +35,7 @@
%define rpm_install_dir %buildroot%obj_install_dir
%define kernel_build_dir %my_builddir/linux-obj
-%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,check-supported-list,group-source-files.pl,built-in-where,symsets.pl,find-provides,split-modules,modversions,extract-modaliases,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,configtool.pl})
+%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,check-supported-list,group-source-files.pl,built-in-where,symsets.pl,find-provides,split-modules,modversions,extract-modaliases,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,configtool.pl,log.sh})
%global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
%define cpu_arch_flavor %cpu_arch/%build_flavor
@@ -55,8 +55,8 @@
Name: kernel-ec2
Summary: The Amazon EC2 Xen Kernel
-Version: 2.6.34
-Release: 12
+Version: 2.6.36
+Release: 1
%if %using_buildservice
%else
%endif
@@ -149,6 +149,7 @@
Source35: group-source-files.pl
Source37: README.SUSE
Source38: README.KSYMS
+Source39: config-options.changes.txt
Source40: source-timestamp
Source41: built-in-where
Source42: symsets.pl
@@ -172,6 +173,7 @@
Source64: package-descriptions
Source65: kernel-spec-macros
Source66: configtool.pl
+Source67: log.sh
Source100: config.tar.bz2
Source101: config.addon.tar.bz2
Source102: patches.arch.tar.bz2
@@ -304,7 +306,8 @@
--set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \
--enable CONFIG_SUSE_KERNEL \
%if 0%{?__debug_package:1}
- --enable CONFIG_DEBUG_INFO
+ --enable CONFIG_DEBUG_INFO \
+ --disable CONFIG_DEBUG_INFO_REDUCED
%else
--disable CONFIG_DEBUG_INFO
%endif
++++++ kernel-net.spec ++++++
--- /var/tmp/diff_new_pack.CXp4uP/_old 2010-09-07 15:27:46.000000000 +0200
+++ /var/tmp/diff_new_pack.CXp4uP/_new 2010-09-07 15:27:46.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-net (Version 2.6.34)
+# spec file for package kernel-net (Version 2.6.36)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -17,8 +17,8 @@
# norootforbuild
-%define srcversion 2.6.34
-%define patchversion 2.6.34
+%define srcversion 2.6.35
+%define patchversion 2.6.36-rc3
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
@@ -35,7 +35,7 @@
%define rpm_install_dir %buildroot%obj_install_dir
%define kernel_build_dir %my_builddir/linux-obj
-%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,check-supported-list,group-source-files.pl,built-in-where,symsets.pl,find-provides,split-modules,modversions,extract-modaliases,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,configtool.pl})
+%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,check-supported-list,group-source-files.pl,built-in-where,symsets.pl,find-provides,split-modules,modversions,extract-modaliases,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,configtool.pl,log.sh})
%global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
%define cpu_arch_flavor %cpu_arch/%build_flavor
@@ -55,8 +55,8 @@
Name: kernel-net
Summary: Minimal kernel with disk and net support
-Version: 2.6.34
-Release: 10
+Version: 2.6.36
+Release: 1
%if %using_buildservice
%else
%endif
@@ -149,6 +149,7 @@
Source35: group-source-files.pl
Source37: README.SUSE
Source38: README.KSYMS
+Source39: config-options.changes.txt
Source40: source-timestamp
Source41: built-in-where
Source42: symsets.pl
@@ -172,6 +173,7 @@
Source64: package-descriptions
Source65: kernel-spec-macros
Source66: configtool.pl
+Source67: log.sh
Source100: config.tar.bz2
Source101: config.addon.tar.bz2
Source102: patches.arch.tar.bz2
@@ -303,7 +305,8 @@
--set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \
--enable CONFIG_SUSE_KERNEL \
%if 0%{?__debug_package:1}
- --enable CONFIG_DEBUG_INFO
+ --enable CONFIG_DEBUG_INFO \
+ --disable CONFIG_DEBUG_INFO_REDUCED
%else
--disable CONFIG_DEBUG_INFO
%endif
++++++ kernel-pae.spec ++++++
--- /var/tmp/diff_new_pack.CXp4uP/_old 2010-09-07 15:27:46.000000000 +0200
+++ /var/tmp/diff_new_pack.CXp4uP/_new 2010-09-07 15:27:46.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-pae (Version 2.6.34)
+# spec file for package kernel-pae (Version 2.6.36)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -17,8 +17,8 @@
# norootforbuild
-%define srcversion 2.6.34
-%define patchversion 2.6.34
+%define srcversion 2.6.35
+%define patchversion 2.6.36-rc3
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
@@ -35,7 +35,7 @@
%define rpm_install_dir %buildroot%obj_install_dir
%define kernel_build_dir %my_builddir/linux-obj
-%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,check-supported-list,group-source-files.pl,built-in-where,symsets.pl,find-provides,split-modules,modversions,extract-modaliases,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,configtool.pl})
+%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,check-supported-list,group-source-files.pl,built-in-where,symsets.pl,find-provides,split-modules,modversions,extract-modaliases,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,configtool.pl,log.sh})
%global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
%define cpu_arch_flavor %cpu_arch/%build_flavor
@@ -55,8 +55,8 @@
Name: kernel-pae
Summary: Kernel with PAE Support
-Version: 2.6.34
-Release: 12
+Version: 2.6.36
+Release: 1
%if %using_buildservice
%else
%endif
@@ -153,6 +153,7 @@
Source35: group-source-files.pl
Source37: README.SUSE
Source38: README.KSYMS
+Source39: config-options.changes.txt
Source40: source-timestamp
Source41: built-in-where
Source42: symsets.pl
@@ -176,6 +177,7 @@
Source64: package-descriptions
Source65: kernel-spec-macros
Source66: configtool.pl
+Source67: log.sh
Source100: config.tar.bz2
Source101: config.addon.tar.bz2
Source102: patches.arch.tar.bz2
@@ -312,7 +314,8 @@
--set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \
--enable CONFIG_SUSE_KERNEL \
%if 0%{?__debug_package:1}
- --enable CONFIG_DEBUG_INFO
+ --enable CONFIG_DEBUG_INFO \
+ --disable CONFIG_DEBUG_INFO_REDUCED
%else
--disable CONFIG_DEBUG_INFO
%endif
kernel-ppc64.spec: same change
kernel-ps3.spec: same change
kernel-s390.spec: same change
++++++ kernel-source.spec ++++++
--- /var/tmp/diff_new_pack.CXp4uP/_old 2010-09-07 15:27:46.000000000 +0200
+++ /var/tmp/diff_new_pack.CXp4uP/_new 2010-09-07 15:27:46.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-source (Version 2.6.34)
+# spec file for package kernel-source (Version 2.6.36)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -18,8 +18,8 @@
# norootforbuild
# icecream 0
-%define srcversion 2.6.34
-%define patchversion 2.6.34
+%define srcversion 2.6.35
+%define patchversion 2.6.36-rc3
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
@@ -30,8 +30,8 @@
Name: kernel-source
Summary: The Linux Kernel Sources
-Version: 2.6.34
-Release: 12
+Version: 2.6.36
+Release: 1
%if %using_buildservice
%else
%endif
@@ -64,6 +64,7 @@
Source35: group-source-files.pl
Source37: README.SUSE
Source38: README.KSYMS
+Source39: config-options.changes.txt
Source40: source-timestamp
Source41: built-in-where
Source42: symsets.pl
@@ -87,6 +88,7 @@
Source64: package-descriptions
Source65: kernel-spec-macros
Source66: configtool.pl
+Source67: log.sh
Source100: config.tar.bz2
Source101: config.addon.tar.bz2
Source102: patches.arch.tar.bz2
@@ -108,7 +110,7 @@
# Source is only complete with devel files.
Requires: kernel-devel = %version-%release
-%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,check-supported-list,group-source-files.pl,built-in-where,symsets.pl,find-provides,split-modules,modversions,extract-modaliases,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,configtool.pl})
+%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,check-supported-list,group-source-files.pl,built-in-where,symsets.pl,find-provides,split-modules,modversions,extract-modaliases,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,configtool.pl,log.sh})
%define symbols %(set -- $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*)
%define variant_symbols %(case %name in (*-rt) echo "RT" ;; esac)
@@ -197,7 +199,7 @@
# Install the documentation and example Kernel Module Package.
DOC=$RPM_BUILD_ROOT/usr/share/doc/packages/%name
mkdir -p $DOC
-cp %_sourcedir/README.SUSE $DOC
+cp %_sourcedir/README.SUSE %_sourcedir/config-options.changes.txt $DOC
ln -s /usr/share/doc/packages/%name/README.SUSE %buildroot/%src_install_dir/
install -m 755 -d $RPM_BUILD_ROOT/etc/rpm
++++++ kernel-syms.spec ++++++
--- /var/tmp/diff_new_pack.CXp4uP/_old 2010-09-07 15:27:46.000000000 +0200
+++ /var/tmp/diff_new_pack.CXp4uP/_new 2010-09-07 15:27:46.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-syms (Version 2.6.34)
+# spec file for package kernel-syms (Version 2.6.36)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -23,8 +23,8 @@
Name: kernel-syms
Summary: Kernel Symbol Versions (modversions)
-Version: 2.6.34
-Release: 12
+Version: 2.6.36
+Release: 1
%if %using_buildservice
%else
%define kernel_source_release %(LC_ALL=C rpm -q kernel-devel%variant-%version --qf "%{RELEASE}" | grep -v 'not installed' || echo 0)
++++++ kernel-trace.spec ++++++
--- /var/tmp/diff_new_pack.CXp4uP/_old 2010-09-07 15:27:46.000000000 +0200
+++ /var/tmp/diff_new_pack.CXp4uP/_new 2010-09-07 15:27:46.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-trace (Version 2.6.34)
+# spec file for package kernel-trace (Version 2.6.36)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -17,8 +17,8 @@
# norootforbuild
-%define srcversion 2.6.34
-%define patchversion 2.6.34
+%define srcversion 2.6.35
+%define patchversion 2.6.36-rc3
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
@@ -35,7 +35,7 @@
%define rpm_install_dir %buildroot%obj_install_dir
%define kernel_build_dir %my_builddir/linux-obj
-%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,check-supported-list,group-source-files.pl,built-in-where,symsets.pl,find-provides,split-modules,modversions,extract-modaliases,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,configtool.pl})
+%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,check-supported-list,group-source-files.pl,built-in-where,symsets.pl,find-provides,split-modules,modversions,extract-modaliases,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,configtool.pl,log.sh})
%global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
%define cpu_arch_flavor %cpu_arch/%build_flavor
@@ -54,9 +54,9 @@
%endif
Name: kernel-trace
-Summary: The Realtime Linux Kernel
-Version: 2.6.34
-Release: 12
+Summary: The Standard Kernel with Tracing Features
+Version: 2.6.36
+Release: 1
%if %using_buildservice
%else
%endif
@@ -161,6 +161,7 @@
Source35: group-source-files.pl
Source37: README.SUSE
Source38: README.KSYMS
+Source39: config-options.changes.txt
Source40: source-timestamp
Source41: built-in-where
Source42: symsets.pl
@@ -184,6 +185,7 @@
Source64: package-descriptions
Source65: kernel-spec-macros
Source66: configtool.pl
+Source67: log.sh
Source100: config.tar.bz2
Source101: config.addon.tar.bz2
Source102: patches.arch.tar.bz2
@@ -255,7 +257,7 @@
%define supported_modules_check 0
%description
-This kernel is compiled for realtime applications.
+This kernel has different tracing features enabled (e.g. utrace, ftrace).
%source_timestamp
@@ -313,7 +315,8 @@
--set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \
--enable CONFIG_SUSE_KERNEL \
%if 0%{?__debug_package:1}
- --enable CONFIG_DEBUG_INFO
+ --enable CONFIG_DEBUG_INFO \
+ --disable CONFIG_DEBUG_INFO_REDUCED
%else
--disable CONFIG_DEBUG_INFO
%endif
@@ -782,7 +785,7 @@
%defattr(-, root, root)
%package base
-Summary: The Realtime Linux Kernel - base modules
+Summary: The Standard Kernel with Tracing Features - base modules
License: GPLv2
Group: System/Kernel
Url: http://www.kernel.org/
@@ -798,7 +801,7 @@
%endif
%description base
-This kernel is compiled for realtime applications.
+This kernel has different tracing features enabled (e.g. utrace, ftrace).
This package contains only the base modules, required in all installs.
@@ -819,7 +822,7 @@
%endif
%package extra
-Summary: The Realtime Linux Kernel - Unsupported kernel modules
+Summary: The Standard Kernel with Tracing Features - Unsupported kernel modules
License: GPLv2
Group: System/Kernel
Url: http://www.kernel.org/
@@ -838,7 +841,7 @@
%endif
%description extra
-This kernel is compiled for realtime applications.
+This kernel has different tracing features enabled (e.g. utrace, ftrace).
This package contains additional modules not supported by Novell.
++++++ kernel-vanilla.spec ++++++
--- /var/tmp/diff_new_pack.CXp4uP/_old 2010-09-07 15:27:46.000000000 +0200
+++ /var/tmp/diff_new_pack.CXp4uP/_new 2010-09-07 15:27:46.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-vanilla (Version 2.6.34)
+# spec file for package kernel-vanilla (Version 2.6.36)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -17,8 +17,8 @@
# norootforbuild
-%define srcversion 2.6.34
-%define patchversion 2.6.34
+%define srcversion 2.6.35
+%define patchversion 2.6.36-rc3
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
@@ -35,7 +35,7 @@
%define rpm_install_dir %buildroot%obj_install_dir
%define kernel_build_dir %my_builddir/linux-obj
-%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,check-supported-list,group-source-files.pl,built-in-where,symsets.pl,find-provides,split-modules,modversions,extract-modaliases,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,configtool.pl})
+%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,check-supported-list,group-source-files.pl,built-in-where,symsets.pl,find-provides,split-modules,modversions,extract-modaliases,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,configtool.pl,log.sh})
%global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
%define cpu_arch_flavor %cpu_arch/%build_flavor
@@ -55,8 +55,8 @@
Name: kernel-vanilla
Summary: The Standard Kernel - without any SUSE patches
-Version: 2.6.34
-Release: 12
+Version: 2.6.36
+Release: 1
%if %using_buildservice
%else
%endif
@@ -157,6 +157,7 @@
Source35: group-source-files.pl
Source37: README.SUSE
Source38: README.KSYMS
+Source39: config-options.changes.txt
Source40: source-timestamp
Source41: built-in-where
Source42: symsets.pl
@@ -180,6 +181,7 @@
Source64: package-descriptions
Source65: kernel-spec-macros
Source66: configtool.pl
+Source67: log.sh
Source100: config.tar.bz2
Source101: config.addon.tar.bz2
Source102: patches.arch.tar.bz2
@@ -309,7 +311,8 @@
--set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \
--enable CONFIG_SUSE_KERNEL \
%if 0%{?__debug_package:1}
- --enable CONFIG_DEBUG_INFO
+ --enable CONFIG_DEBUG_INFO \
+ --disable CONFIG_DEBUG_INFO_REDUCED
%else
--disable CONFIG_DEBUG_INFO
%endif
kernel-vmi.spec: same change
kernel-xen.spec: same change
++++++ README.SUSE ++++++
--- /var/tmp/diff_new_pack.CXp4uP/_old 2010-09-07 15:27:46.000000000 +0200
+++ /var/tmp/diff_new_pack.CXp4uP/_new 2010-09-07 15:27:46.000000000 +0200
@@ -382,6 +382,42 @@
shortcut ``make cloneconfig'' that expands the file /proc/config.gz
into .config, and then runs ``make oldconfig''.
+HOW TO ADD CUSTOM PATCHES
+
+Typically patches are added to the appropriate patches.* directory (e.g.
+patches.fixes) and to series.conf. When the kernel-source package is
+exported from the git repository, the patch will be automatically added
+to the appropriate patch tarball.
+
+If your goal is to create a kernel with only a few additional patches
+and you don't want to be bothered with using the git repository, there
+is an easier way.
+
+The kernel-source SRPM ships with two empty archives that can be be
+filled and automatically expanded when building the kernel. You can use
+these to add your own patches and config options without disturbing the
+rest of the kernel package. This is useful if you are using the openSUSE
+Build Service and link to the main kernel-source project instead of
+creating your own branch. The advantage to this is that your project
+will automatically receive all the changes that go into the main project
+without any further effort.
+
+To add a patch using this mechanism, just add it to the
+patches.addon.tar.bz2 archive and add an entry to the series.conf file.
+The archive will be expanded automatically with the other kernel patches
+when the source tree is constructed.
+
+Some patches may add new Kconfig options. The config.addon.tar.bz2
+archive contains the same hierarchy as config.tar.bz2, but is under
+config.addon. You can add your new config options to files named after
+their config/ counterparts.
+
+For example, the file used to configure the i386 default kernel is named
+config/i386/default. To add config options to that kernel, you would
+create a new file called config.addon/i386/default with the options as
+formatted in a normal Linux kernel .config file. This is important
+because the kernel build is non-interactive and will fail if it
+encounters new config options without entries in the config file.
MODULE LOAD PATHS
++++++ config-options.changes.txt ++++++
++++ 1089 lines (skipped)
++++++ config.sh ++++++
--- /var/tmp/diff_new_pack.CXp4uP/_old 2010-09-07 15:27:46.000000000 +0200
+++ /var/tmp/diff_new_pack.CXp4uP/_new 2010-09-07 15:27:46.000000000 +0200
@@ -1,5 +1,5 @@
# The version of the main tarball to use
-SRCVERSION=2.6.34
+SRCVERSION=2.6.35
# variant of the kernel-source package, either empty or "-rt"
VARIANT=
# buildservice projects to build the kernel against
++++++ config.tar.bz2 ++++++
++++ 46353 lines of diff (skipped)
++++++ kernel-binary.spec.in ++++++
--- /var/tmp/diff_new_pack.CXp4uP/_old 2010-09-07 15:27:47.000000000 +0200
+++ /var/tmp/diff_new_pack.CXp4uP/_new 2010-09-07 15:27:47.000000000 +0200
@@ -231,7 +231,8 @@
--set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \
--enable CONFIG_SUSE_KERNEL \
%if 0%{?__debug_package:1}
- --enable CONFIG_DEBUG_INFO
+ --enable CONFIG_DEBUG_INFO \
+ --disable CONFIG_DEBUG_INFO_REDUCED
%else
--disable CONFIG_DEBUG_INFO
%endif
++++++ kernel-source.spec.in ++++++
--- /var/tmp/diff_new_pack.CXp4uP/_old 2010-09-07 15:27:47.000000000 +0200
+++ /var/tmp/diff_new_pack.CXp4uP/_new 2010-09-07 15:27:47.000000000 +0200
@@ -65,6 +65,7 @@
Source35: group-source-files.pl
Source37: README.SUSE
Source38: README.KSYMS
+Source39: config-options.changes.txt
Source40: source-timestamp
Source41: built-in-where
Source42: symsets.pl
@@ -88,6 +89,7 @@
Source64: package-descriptions
Source65: kernel-spec-macros
Source66: configtool.pl
+Source67: log.sh
Source100: config.tar.bz2
Source101: config.addon.tar.bz2
Source102: patches.arch.tar.bz2
@@ -199,7 +201,7 @@
# Install the documentation and example Kernel Module Package.
DOC=$RPM_BUILD_ROOT/usr/share/doc/packages/%name
mkdir -p $DOC
-cp %_sourcedir/README.SUSE $DOC
+cp %_sourcedir/README.SUSE %_sourcedir/config-options.changes.txt $DOC
ln -s /usr/share/doc/packages/%name/README.SUSE %buildroot/%src_install_dir/
install -m 755 -d $RPM_BUILD_ROOT/etc/rpm
++++++ linux-2.6.34.tar.bz2 -> linux-2.6.35.tar.bz2 ++++++
kernel-source/linux-2.6.34.tar.bz2 kernel-source/linux-2.6.35.tar.bz2 differ: char 11, line 1
++++++ log.sh ++++++
#! /bin/sh
# log.sh - Automate insertion of patches into a kernel rpm tree managed
# with series.conf
#
# Usage example:
#
# osc branch openSUSE:11.3/kernel-source
# osc co home:philipsb:branches:openSUSE:11.3:Update:Test/kernel-source
# mv ~/linux-2.6/driver-fix-for-something.patch .
# echo -e "\tpatches.drivers/driver-fix-for-something.patch" >> series.conf
# ./log.sh
# osc commit
#############################################################################
# Copyright (c) 2004-2006,2008-2010 Novell, Inc.
# All Rights Reserved.
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of version 2 of the GNU General Public License as
# published by the Free Software Foundation.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, contact Novell, Inc.
#
# To contact Novell about this file by physical or electronic mail,
# you may find current contact information at www.novell.com
#############################################################################
# Construct a changes entry and commit log from a patch.
CHANGES=kernel-source.changes
trap 'rm -rf "$tmpdir"' EXIT
tmpdir=$(mktemp -d /tmp/${0##*/}.XXXXXX)
message=$tmpdir/message
log_entry() {
local entry=$1
echo "$entry" \
| fmt --width 65 \
| sed -e '1s/^/- /' -e '2,$s/^/ /' \
>> $message
}
patch_meta() {
local patch=$1
subject=$(formail -c -x Subject < "$patch" \
| sed -e 's, *\[[#/ A-Za-z0-9-]*\],,')
subject=${subject## }
subject=${subject%.}
set -- $(formail -c -x References -x Reference < "$patch")
references="$*"
}
patch_log_entry() {
local patch=$1 subject references old_subj old_ref old_patch="$tmpdir/old"
git show "HEAD:$patch" >"$old_patch" 2>/dev/null
patch_meta "$old_patch"
old_subj="$subject"
old_ref="$references"
patch_meta "$patch"
local msg
if test -z "$subject" -o "$subject" != "$old_subj"; then
msg="$subject${references:+ ($references)}"
elif test "$references" != "$old_ref"; then
if test -n "$references"; then
msg="Update references ($references)"
fi
else
msg="Refresh"
fi
log_entry "$patch: $msg${msg:+.}"
}
find_patches() {
osc diff series.conf \
| sed -n "s/^+\s*\(patches.*\)/\1/p"
}
for file in "$@" $(find_patches); do
dirname=$(dirname $file)
basename=$(basename $file)
archive=$dirname.tar.bz2
if [ ! -f $basename ]; then
echo "ERROR: $basename added to series.conf but doesn't exist in $PWD"
exit 1
fi
if [ ! -d $dirname ]; then
tar xvf $archive
fi
mv $basename $dirname
rm $archive
tar cfj $archive $dirname
files[${#files[@]}]=$file
done
if [ ${#files[@]} -eq 0 ]; then
echo "No modified files" >&2
exit 1
fi
for file in "${files[@]}"; do
if [ "${file:0:1}" = - ]; then
log_entry "${file:1}: Delete."
else
case "$file" in
config/*)
if [ -z "$configs_updated" ]; then
log_entry "Update config files."
configs_updated=1
fi
;;
patches.*)
patch_log_entry "$file"
;;
kabi/*/symvers-* | kabi/*/symtypes-* | kabi/*/symsets-* )
if [ -z "$symvers_updated" ]; then
log_entry "Update reference module symbol versions."
symvers_updated=1
fi
;;
series.conf)
# don't log changes in there
;;
*)
log_entry "$file: "
;;
esac
fi
done
if [ ! -s $message ]; then
echo "- " >> $message
fi
if osc vc $CHANGES $message; then
entry=$(sed -ne '1,2d' -e '/^--*$/!p' -e '/^--*$/q' $CHANGES)
entry=${entry##$'\n'}
entry=${entry%%$'\n'}
fi
for c in *.changes; do
[ $c = $CHANGES ] && continue
cp $CHANGES $c
done
++++++ minmem ++++++
--- /var/tmp/diff_new_pack.CXp4uP/_old 2010-09-07 15:27:47.000000000 +0200
+++ /var/tmp/diff_new_pack.CXp4uP/_new 2010-09-07 15:27:47.000000000 +0200
@@ -1 +1 @@
-2096000
+1048576
++++++ needed_space_in_mb ++++++
--- /var/tmp/diff_new_pack.CXp4uP/_old 2010-09-07 15:27:47.000000000 +0200
+++ /var/tmp/diff_new_pack.CXp4uP/_new 2010-09-07 15:27:47.000000000 +0200
@@ -1 +1 @@
-6000
+6144
++++++ package-descriptions ++++++
--- /var/tmp/diff_new_pack.CXp4uP/_old 2010-09-07 15:27:47.000000000 +0200
+++ /var/tmp/diff_new_pack.CXp4uP/_new 2010-09-07 15:27:47.000000000 +0200
@@ -91,9 +91,9 @@
The standard kernel.
=== kernel-trace ===
-The Realtime Linux Kernel
+The Standard Kernel with Tracing Features
-This kernel is compiled for realtime applications.
+This kernel has different tracing features enabled (e.g. utrace, ftrace).
=== kernel-vanilla ===
The Standard Kernel - without any SUSE patches
++++++ patches.apparmor.tar.bz2 ++++++
++++ 9446 lines of diff (skipped)
++++++ patches.arch.tar.bz2 ++++++
++++ 1918 lines of diff (skipped)
++++++ patches.drivers.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.drivers/bnx2-entropy-source.patch new/patches.drivers/bnx2-entropy-source.patch
--- old/patches.drivers/bnx2-entropy-source.patch 2010-06-24 11:20:53.000000000 +0200
+++ new/patches.drivers/bnx2-entropy-source.patch 2010-08-18 19:44:13.000000000 +0200
@@ -28,7 +28,7 @@
static int disable_msi = 0;
module_param(disable_msi, int, 0);
-@@ -6081,6 +6085,9 @@ bnx2_request_irq(struct bnx2 *bp)
+@@ -6116,6 +6120,9 @@ bnx2_request_irq(struct bnx2 *bp)
else
flags = IRQF_SHARED;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.drivers/driver-core-add-devname-module-aliases-to-allow-module-on-demand-auto-loading.patch new/patches.drivers/driver-core-add-devname-module-aliases-to-allow-module-on-demand-auto-loading.patch
--- old/patches.drivers/driver-core-add-devname-module-aliases-to-allow-module-on-demand-auto-loading.patch 2010-06-24 11:20:53.000000000 +0200
+++ new/patches.drivers/driver-core-add-devname-module-aliases-to-allow-module-on-demand-auto-loading.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,178 +0,0 @@
-From 578454ff7eab61d13a26b568f99a89a2c9edc881 Mon Sep 17 00:00:00 2001
-From: Kay Sievers
-Date: Thu, 20 May 2010 18:07:20 +0200
-Subject: driver core: add devname module aliases to allow module on-demand auto-loading
-Patch-mainline: 2.6.35
-
-From: Kay Sievers
-
-commit 578454ff7eab61d13a26b568f99a89a2c9edc881 upstream.
-
-This adds:
- alias: devname:<name>
-to some common kernel modules, which will allow the on-demand loading
-of the kernel module when the device node is accessed.
-
-Ideally all these modules would be compiled-in, but distros seems too
-much in love with their modularization that we need to cover the common
-cases with this new facility. It will allow us to remove a bunch of pretty
-useless init scripts and modprobes from init scripts.
-
-The static device node aliases will be carried in the module itself. The
-program depmod will extract this information to a file in the module directory:
- $ cat /lib/modules/2.6.34-00650-g537b60d-dirty/modules.devname
- # Device nodes to trigger on-demand module loading.
- microcode cpu/microcode c10:184
- fuse fuse c10:229
- ppp_generic ppp c108:0
- tun net/tun c10:200
- dm_mod mapper/control c10:235
-
-Udev will pick up the depmod created file on startup and create all the
-static device nodes which the kernel modules specify, so that these modules
-get automatically loaded when the device node is accessed:
- $ /sbin/udevd --debug
- ...
- static_dev_create_from_modules: mknod '/dev/cpu/microcode' c10:184
- static_dev_create_from_modules: mknod '/dev/fuse' c10:229
- static_dev_create_from_modules: mknod '/dev/ppp' c108:0
- static_dev_create_from_modules: mknod '/dev/net/tun' c10:200
- static_dev_create_from_modules: mknod '/dev/mapper/control' c10:235
- udev_rules_apply_static_dev_perms: chmod '/dev/net/tun' 0666
- udev_rules_apply_static_dev_perms: chmod '/dev/fuse' 0666
-
-A few device nodes are switched to statically allocated numbers, to allow
-the static nodes to work. This might also useful for systems which still run
-a plain static /dev, which is completely unsafe to use with any dynamic minor
-numbers.
-
-Note:
-The devname aliases must be limited to the *common* and *single*instance*
-device nodes, like the misc devices, and never be used for conceptually limited
-systems like the loop devices, which should rather get fixed properly and get a
-control node for losetup to talk to, instead of creating a random number of
-device nodes in advance, regardless if they are ever used.
-
-This facility is to hide the mess distros are creating with too modualized
-kernels, and just to hide that these modules are not compiled-in, and not to
-paper-over broken concepts. Thanks! :)
-
-Cc: Greg Kroah-Hartman
-Cc: David S. Miller
-Cc: Miklos Szeredi
-Cc: Chris Mason
-Cc: Alasdair G Kergon
-Cc: Tigran Aivazian
-Cc: Ian Kent
-Signed-Off-By: Kay Sievers
-Signed-off-by: Greg Kroah-Hartman
-
---- a/Documentation/devices.txt
-+++ b/Documentation/devices.txt
-@@ -443,6 +443,8 @@ Your cooperation is appreciated.
- 231 = /dev/snapshot System memory snapshot device
- 232 = /dev/kvm Kernel-based virtual machine (hardware virtualization extensions)
- 233 = /dev/kmview View-OS A process with a view
-+ 234 = /dev/btrfs-control Btrfs control device
-+ 235 = /dev/autofs Autofs control device
- 240-254 Reserved for local use
- 255 Reserved for MISC_DYNAMIC_MINOR
-
-diff --git a/arch/x86/kernel/microcode_core.c b/arch/x86/kernel/microcode_core.c
-index 2cd8c54..fa6551d 100644
---- a/arch/x86/kernel/microcode_core.c
-+++ b/arch/x86/kernel/microcode_core.c
-@@ -260,6 +260,7 @@ static void microcode_dev_exit(void)
- }
-
- MODULE_ALIAS_MISCDEV(MICROCODE_MINOR);
-+MODULE_ALIAS("devname:cpu/microcode");
- #else
- #define microcode_dev_init() 0
- #define microcode_dev_exit() do { } while (0)
-diff --git a/drivers/net/ppp_generic.c b/drivers/net/ppp_generic.c
-index 5441688..c5f8eb1 100644
---- a/drivers/net/ppp_generic.c
-+++ b/drivers/net/ppp_generic.c
-@@ -2926,5 +2926,5 @@ EXPORT_SYMBOL(ppp_output_wakeup);
- EXPORT_SYMBOL(ppp_register_compressor);
- EXPORT_SYMBOL(ppp_unregister_compressor);
- MODULE_LICENSE("GPL");
--MODULE_ALIAS_CHARDEV_MAJOR(PPP_MAJOR);
--MODULE_ALIAS("/dev/ppp");
-+MODULE_ALIAS_CHARDEV(PPP_MAJOR, 0);
-+MODULE_ALIAS("devname:ppp");
-diff --git a/drivers/net/tun.c b/drivers/net/tun.c
-index 97b2553..005cad6 100644
---- a/drivers/net/tun.c
-+++ b/drivers/net/tun.c
-@@ -1649,3 +1649,4 @@ MODULE_DESCRIPTION(DRV_DESCRIPTION);
- MODULE_AUTHOR(DRV_COPYRIGHT);
- MODULE_LICENSE("GPL");
- MODULE_ALIAS_MISCDEV(TUN_MINOR);
-+MODULE_ALIAS("devname:net/tun");
-diff --git a/fs/autofs4/dev-ioctl.c b/fs/autofs4/dev-ioctl.c
-index d29b7f6..d832062 100644
---- a/fs/autofs4/dev-ioctl.c
-+++ b/fs/autofs4/dev-ioctl.c
-@@ -736,11 +736,14 @@ static const struct file_operations _dev_ioctl_fops = {
- };
-
- static struct miscdevice _autofs_dev_ioctl_misc = {
-- .minor = MISC_DYNAMIC_MINOR,
-+ .minor = AUTOFS_MINOR,
- .name = AUTOFS_DEVICE_NAME,
- .fops = &_dev_ioctl_fops
- };
-
-+MODULE_ALIAS_MISCDEV(AUTOFS_MINOR);
-+MODULE_ALIAS("devname:autofs");
-+
- /* Register/deregister misc character device */
- int autofs_dev_ioctl_init(void)
- {
-diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
-index 1866dff..2909a03 100644
---- a/fs/btrfs/super.c
-+++ b/fs/btrfs/super.c
-@@ -832,11 +832,14 @@ static const struct file_operations btrfs_ctl_fops = {
- };
-
- static struct miscdevice btrfs_misc = {
-- .minor = MISC_DYNAMIC_MINOR,
-+ .minor = BTRFS_MINOR,
- .name = "btrfs-control",
- .fops = &btrfs_ctl_fops
- };
-
-+MODULE_ALIAS_MISCDEV(BTRFS_MINOR);
-+MODULE_ALIAS("devname:btrfs-control");
-+
- static int btrfs_interface_init(void)
- {
- return misc_register(&btrfs_misc);
-diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c
-index eb7e942..e53df5e 100644
---- a/fs/fuse/dev.c
-+++ b/fs/fuse/dev.c
-@@ -18,6 +18,7 @@
- #include
-
- MODULE_ALIAS_MISCDEV(FUSE_MINOR);
-+MODULE_ALIAS("devname:fuse");
-
- static struct kmem_cache *fuse_req_cachep;
-
-diff --git a/include/linux/miscdevice.h b/include/linux/miscdevice.h
-index 8b5f7cc..b631c46 100644
---- a/include/linux/miscdevice.h
-+++ b/include/linux/miscdevice.h
-@@ -31,6 +31,8 @@
- #define FUSE_MINOR 229
- #define KVM_MINOR 232
- #define VHOST_NET_MINOR 233
-+#define BTRFS_MINOR 234
-+#define AUTOFS_MINOR 235
- #define MISC_DYNAMIC_MINOR 255
-
- struct device;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.drivers/e1000-enhance-frame-fragment-detection.patch new/patches.drivers/e1000-enhance-frame-fragment-detection.patch
--- old/patches.drivers/e1000-enhance-frame-fragment-detection.patch 2010-06-24 11:20:53.000000000 +0200
+++ new/patches.drivers/e1000-enhance-frame-fragment-detection.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,68 +0,0 @@
-From: Brandeburg, Jesse
-Subject: [PATCH] e1000: enhance frame fragment detection
-References: bnc#567376, CVE-2009-4536
-Patch-Mainline: Yes
-
-A security discussion was recently given:
-http://events.ccc.de/congress/2009/Fahrplan//events/3596.en.html And a patch
-that I submitted awhile back was brought up. Apparently some of their testing
-revealed that they were able to force a buffer fragment in e1000 in which the
-trailing fragment was greater than 4 bytes. As a result the fragment check I
-introduced failed to detect the fragement and a partial invalid frame was
-passed up into the network stack. I've written this patch to correct it. I'm
-in the process of testing it now, but it makes good logical sense to me.
-Effectively it maintains a per-adapter state variable which detects a non-EOP
-frame, and discards it and subsequent non-EOP frames leading up to _and_
-_including_ the next positive-EOP frame (as it is by definition the last
-fragment). This should prevent any and all partial frames from entering the
-network stack from e1000.
-
-Signed-off-by: Jesse Brandeburg
-Signed-off-by: Neil Horman
-Signed-off-by: Brandon Philips
-
----
-
- drivers/net/e1000/e1000.h | 2 ++
- drivers/net/e1000/e1000_main.c | 13 +++++++++++--
- 2 files changed, 13 insertions(+), 2 deletions(-)
-
-
---- a/drivers/net/e1000/e1000.h
-+++ b/drivers/net/e1000/e1000.h
-@@ -326,6 +326,8 @@ struct e1000_adapter {
- /* for ioport free */
- int bars;
- int need_ioport;
-+
-+ bool discarding;
- };
-
- enum e1000_state_t {
---- a/drivers/net/e1000/e1000_main.c
-+++ b/drivers/net/e1000/e1000_main.c
-@@ -3834,13 +3834,22 @@ static bool e1000_clean_rx_irq(struct e1
-
- length = le16_to_cpu(rx_desc->length);
- /* !EOP means multiple descriptors were used to store a single
-- * packet, also make sure the frame isn't just CRC only */
-- if (unlikely(!(status & E1000_RXD_STAT_EOP) || (length <= 4))) {
-+ * packet, if thats the case we need to toss it. In fact, we
-+ * to toss every packet with the EOP bit clear and the next
-+ * frame that _does_ have the EOP bit set, as it is by
-+ * definition only a frame fragment
-+ */
-+ if (unlikely(!(status & E1000_RXD_STAT_EOP)))
-+ adapter->discarding = true;
-+
-+ if (adapter->discarding) {
- /* All receives must fit into a single buffer */
- E1000_DBG("%s: Receive packet consumed multiple"
- " buffers\n", netdev->name);
- /* recycle */
- buffer_info->skb = skb;
-+ if (status & E1000_RXD_STAT_EOP)
-+ adapter->discarding = false;
- goto next_desc;
- }
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.drivers/e1000-entropy-source.patch new/patches.drivers/e1000-entropy-source.patch
--- old/patches.drivers/e1000-entropy-source.patch 2010-06-24 11:20:53.000000000 +0200
+++ new/patches.drivers/e1000-entropy-source.patch 2010-08-18 19:44:13.000000000 +0200
@@ -33,9 +33,9 @@
+MODULE_PARM_DESC(entropy, "Allow e1000 to populate the /dev/random entropy pool");
+
/**
- * e1000_init_module - Driver Registration Routine
- *
-@@ -262,6 +266,9 @@ static int e1000_request_irq(struct e100
+ * e1000_get_hw_dev - return device
+ * used by hardware layer to print debugging information
+@@ -272,6 +276,9 @@ static int e1000_request_irq(struct e100
int irq_flags = IRQF_SHARED;
int err;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.drivers/e1000e-enhance-frame-fragment-detection.patch new/patches.drivers/e1000e-enhance-frame-fragment-detection.patch
--- old/patches.drivers/e1000e-enhance-frame-fragment-detection.patch 2010-06-24 11:20:53.000000000 +0200
+++ new/patches.drivers/e1000e-enhance-frame-fragment-detection.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,142 +0,0 @@
-From: Neil Horman
-Subject: [PATCH] e1000e: enhance frame fragment detection
-References: bnc#567376, CVE-2009-4538
-
-A security discussion was recently given:
-http://events.ccc.de/congress/2009/Fahrplan//events/3596.en.html And a patch
-that I submitted awhile back was brought up. Apparently some of their testing
-revealed that they were able to force a buffer fragment in e1000e in which the
-trailing fragment was greater than 4 bytes. As a result the fragment check I
-introduced failed to detect the fragement and a partial invalid frame was
-passed up into the network stack. I've written this patch to correct it. I'm
-in the process of testing it now, but it makes good logical sense to me.
-Effectively it maintains a per-adapter state variable which detects a non-EOP
-frame, and discards it and subsequent non-EOP frames leading up to _and_
-_including_ the next positive-EOP frame (as it is by definition the last
-fragment). This should prevent any and all partial frames from entering the
-network stack from e1000e
-
-Signed-off-by: Neil Horman
-Signed-off-by: Brandon Philips
----
- drivers/net/e1000e/e1000.h | 3 ++-
- drivers/net/e1000e/netdev.c | 13 +++++++++++--
- 2 files changed, 13 insertions(+), 3 deletions(-)
-
-Index: linux-2.6.31-openSUSE-11.2/drivers/net/e1000e/e1000.h
-===================================================================
---- linux-2.6.31-openSUSE-11.2.orig/drivers/net/e1000e/e1000.h
-+++ linux-2.6.31-openSUSE-11.2/drivers/net/e1000e/e1000.h
-@@ -412,7 +412,8 @@ struct e1000_info {
- enum e1000_state_t {
- __E1000_TESTING,
- __E1000_RESETTING,
-- __E1000_DOWN
-+ __E1000_DOWN,
-+ __E1000_DISCARDING
- };
-
- enum latency_range {
-Index: linux-2.6.31-openSUSE-11.2/drivers/net/e1000e/netdev.c
-===================================================================
---- linux-2.6.31-openSUSE-11.2.orig/drivers/net/e1000e/netdev.c
-+++ linux-2.6.31-openSUSE-11.2/drivers/net/e1000e/netdev.c
-@@ -483,12 +483,21 @@ static bool e1000_clean_rx_irq(struct e1
- length = le16_to_cpu(rx_desc->length);
-
- /* !EOP means multiple descriptors were used to store a single
-- * packet, also make sure the frame isn't just CRC only */
-- if (!(status & E1000_RXD_STAT_EOP) || (length <= 4)) {
-+ * packet, if thats the case we need to toss it. In fact, we
-+ * to toss every packet with the EOP bit clear and the next
-+ * frame that _does_ have the EOP bit set, as it is by
-+ * definition only a frame fragment
-+ */
-+ if (unlikely(!(status & E1000_RXD_STAT_EOP)))
-+ set_bit(__E1000_DISCARDING, &adapter->state);
-+
-+ if (test_bit(__E1000_DISCARDING, &adapter->state)) {
- /* All receives must fit into a single buffer */
- e_dbg("Receive packet consumed multiple buffers\n");
- /* recycle */
- buffer_info->skb = skb;
-+ if (status & E1000_RXD_STAT_EOP)
-+ clear_bit(__E1000_DISCARDING, &adapter->state);
- goto next_desc;
- }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.drivers/e1000e-entropy-source.patch new/patches.drivers/e1000e-entropy-source.patch
--- old/patches.drivers/e1000e-entropy-source.patch 2010-06-24 11:20:53.000000000 +0200
+++ new/patches.drivers/e1000e-entropy-source.patch 2010-08-18 19:44:13.000000000 +0200
@@ -17,11 +17,9 @@
drivers/net/e1000e/param.c | 4 ++++
3 files changed, 14 insertions(+), 5 deletions(-)
-Index: linux-2.6.34-master/drivers/net/e1000e/e1000.h
-===================================================================
---- linux-2.6.34-master.orig/drivers/net/e1000e/e1000.h
-+++ linux-2.6.34-master/drivers/net/e1000e/e1000.h
-@@ -466,6 +466,7 @@ extern void e1000e_reset_interrupt_capab
+--- a/drivers/net/e1000e/e1000.h
++++ b/drivers/net/e1000e/e1000.h
+@@ -467,6 +467,7 @@ extern void e1000e_reset_interrupt_capab
extern void e1000e_disable_aspm(struct pci_dev *pdev, u16 state);
extern unsigned int copybreak;
@@ -29,11 +27,9 @@
extern char *e1000e_get_hw_dev_name(struct e1000_hw *hw);
-Index: linux-2.6.34-master/drivers/net/e1000e/netdev.c
-===================================================================
---- linux-2.6.34-master.orig/drivers/net/e1000e/netdev.c
-+++ linux-2.6.34-master/drivers/net/e1000e/netdev.c
-@@ -1496,8 +1496,8 @@ static int e1000_request_msix(struct e10
+--- a/drivers/net/e1000e/netdev.c
++++ b/drivers/net/e1000e/netdev.c
+@@ -1847,8 +1847,8 @@ static int e1000_request_msix(struct e10
else
memcpy(adapter->rx_ring->name, netdev->name, IFNAMSIZ);
err = request_irq(adapter->msix_entries[vector].vector,
@@ -44,7 +40,7 @@
if (err)
goto out;
adapter->rx_ring->itr_register = E1000_EITR_82574(vector);
-@@ -1538,6 +1538,7 @@ static int e1000_request_irq(struct e100
+@@ -1889,6 +1889,7 @@ static int e1000_request_irq(struct e100
{
struct net_device *netdev = adapter->netdev;
int err;
@@ -52,7 +48,7 @@
if (adapter->msix_entries) {
err = e1000_request_msix(adapter);
-@@ -1549,7 +1550,8 @@ static int e1000_request_irq(struct e100
+@@ -1900,7 +1901,8 @@ static int e1000_request_irq(struct e100
e1000e_set_interrupt_capability(adapter);
}
if (adapter->flags & FLAG_MSI_ENABLED) {
@@ -62,7 +58,7 @@
netdev->name, netdev);
if (!err)
return err;
-@@ -1559,8 +1561,10 @@ static int e1000_request_irq(struct e100
+@@ -1910,8 +1912,10 @@ static int e1000_request_irq(struct e100
adapter->int_mode = E1000E_INT_MODE_LEGACY;
}
@@ -75,10 +71,8 @@
if (err)
e_err("Unable to allocate interrupt, Error: %d\n", err);
-Index: linux-2.6.34-master/drivers/net/e1000e/param.c
-===================================================================
---- linux-2.6.34-master.orig/drivers/net/e1000e/param.c
-+++ linux-2.6.34-master/drivers/net/e1000e/param.c
+--- a/drivers/net/e1000e/param.c
++++ b/drivers/net/e1000e/param.c
@@ -31,6 +31,10 @@
#include "e1000.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.drivers/ehea-modinfo.patch new/patches.drivers/ehea-modinfo.patch
--- old/patches.drivers/ehea-modinfo.patch 2010-06-24 11:20:53.000000000 +0200
+++ new/patches.drivers/ehea-modinfo.patch 2010-08-18 19:44:13.000000000 +0200
@@ -13,9 +13,9 @@
--- a/drivers/net/ehea/ehea_main.c
+++ b/drivers/net/ehea/ehea_main.c
-@@ -111,6 +111,19 @@ static int __devinit ehea_probe_adapter(
+@@ -112,6 +112,19 @@ static int __devinit ehea_probe_adapter(
- static int __devexit ehea_remove(struct of_device *dev);
+ static int __devexit ehea_remove(struct platform_device *dev);
+static struct of_device_id ehea_module_device_table[] = {
+ {
@@ -33,11 +33,11 @@
static struct of_device_id ehea_device_table[] = {
{
.name = "lhea",
-@@ -118,7 +131,6 @@ static struct of_device_id ehea_device_t
+@@ -119,7 +132,6 @@ static struct of_device_id ehea_device_t
},
{},
};
-MODULE_DEVICE_TABLE(of, ehea_device_table);
static struct of_platform_driver ehea_driver = {
- .name = "ehea",
+ .driver = {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.drivers/elousb.patch new/patches.drivers/elousb.patch
--- old/patches.drivers/elousb.patch 2010-06-24 11:20:53.000000000 +0200
+++ new/patches.drivers/elousb.patch 2010-08-18 19:44:13.000000000 +0200
@@ -18,7 +18,7 @@
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
-@@ -1567,6 +1567,8 @@ static const struct hid_device_id hid_ig
+@@ -1590,6 +1590,8 @@ static const struct hid_device_id hid_ig
{ HID_USB_DEVICE(USB_VENDOR_ID_DEALEXTREAME, USB_DEVICE_ID_DEALEXTREAME_RADIO_SI4701) },
{ HID_USB_DEVICE(USB_VENDOR_ID_DELORME, USB_DEVICE_ID_DELORME_EARTHMATE) },
{ HID_USB_DEVICE(USB_VENDOR_ID_DELORME, USB_DEVICE_ID_DELORME_EM_LT20) },
@@ -26,11 +26,11 @@
+ { HID_USB_DEVICE(USB_VENDOR_ID_ELO, USB_DEVICE_ID_ELO_4500U) },
{ HID_USB_DEVICE(USB_VENDOR_ID_ESSENTIAL_REALITY, USB_DEVICE_ID_ESSENTIAL_REALITY_P5) },
{ HID_USB_DEVICE(USB_VENDOR_ID_ETT, USB_DEVICE_ID_TC5UH) },
- { HID_USB_DEVICE(USB_VENDOR_ID_GENERAL_TOUCH, 0x0001) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_ETT, USB_DEVICE_ID_TC4UM) },
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
-@@ -171,7 +171,9 @@
- #define USB_VENDOR_ID_DRAGONRISE 0x0079
+@@ -193,7 +193,9 @@
+ #define USB_DEVICE_ID_ELECOM_BM084 0x0061
#define USB_VENDOR_ID_ELO 0x04E7
+#define USB_DEVICE_ID_ELO_4000U 0x0009
@@ -41,7 +41,7 @@
#define USB_DEVICE_ID_ESSENTIAL_REALITY_P5 0x0100
--- a/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
-@@ -193,6 +193,18 @@ config TOUCHSCREEN_ELO
+@@ -202,6 +202,18 @@ config TOUCHSCREEN_ELO
To compile this driver as a module, choose M here: the
module will be called elo.
@@ -62,7 +62,7 @@
select SERIO
--- a/drivers/input/touchscreen/Makefile
+++ b/drivers/input/touchscreen/Makefile
-@@ -17,6 +17,7 @@ obj-$(CONFIG_TOUCHSCREEN_DYNAPRO) += dyn
+@@ -21,6 +21,7 @@ obj-$(CONFIG_TOUCHSCREEN_HAMPSHIRE) += h
obj-$(CONFIG_TOUCHSCREEN_GUNZE) += gunze.o
obj-$(CONFIG_TOUCHSCREEN_EETI) += eeti_ts.o
obj-$(CONFIG_TOUCHSCREEN_ELO) += elo.o
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.drivers/hwmon-it87-fix-in7-on-IT8720F.patch new/patches.drivers/hwmon-it87-fix-in7-on-IT8720F.patch
--- old/patches.drivers/hwmon-it87-fix-in7-on-IT8720F.patch 2010-06-24 11:20:53.000000000 +0200
+++ new/patches.drivers/hwmon-it87-fix-in7-on-IT8720F.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,62 +0,0 @@
-From: Jean Delvare
-Subject: hwmon: (it87) Fix in7 on IT8720F
-Patch-mainline: pending
-References: bnc#612910
-
-The IT8720F has no VIN7 pin, so VCCH should always be routed
-internally to VIN7 with an internal divider. Curiously, there still
-is a configuration bit to control this, which means it can be set
-incorrectly. And even more curiously, many boards out there are
-improperly configured, even though the IT8720F datasheet claims that
-the internal routing of VCCH to VIN7 is the default setting. So we
-force the internal routing in this case.
-
-It turns out that all boards with the wrong setting are from Gigabyte,
-so I suspect a BIOS bug. But it's easy enough to workaround in the
-driver, so let's do it.
-
-Signed-off-by: Jean Delvare
-Cc: Jean-Marc Spaggiari
-Acked-by: Jean Delvare
----
- drivers/hwmon/it87.c | 22 ++++++++++++++++++++++
- 1 file changed, 22 insertions(+)
-
---- linux-2.6.35-rc3.orig/drivers/hwmon/it87.c 2010-06-22 12:43:43.000000000 +0200
-+++ linux-2.6.35-rc3/drivers/hwmon/it87.c 2010-06-23 11:50:57.000000000 +0200
-@@ -80,6 +80,13 @@ superio_inb(int reg)
- return inb(VAL);
- }
-
-+static inline void
-+superio_outb(int reg, int val)
-+{
-+ outb(reg, REG);
-+ outb(val, VAL);
-+}
-+
- static int superio_inw(int reg)
- {
- int val;
-@@ -1517,6 +1524,21 @@ static int __init it87_find(unsigned sho
- sio_data->vid_value = superio_inb(IT87_SIO_VID_REG);
-
- reg = superio_inb(IT87_SIO_PINX2_REG);
-+ /*
-+ * The IT8720F has no VIN7 pin, so VCCH should always be
-+ * routed internally to VIN7 with an internal divider.
-+ * Curiously, there still is a configuration bit to control
-+ * this, which means it can be set incorrectly. And even
-+ * more curiously, many boards out there are improperly
-+ * configured, even though the IT8720F datasheet claims
-+ * that the internal routing of VCCH to VIN7 is the default
-+ * setting. So we force the internal routing in this case.
-+ */
-+ if (sio_data->type == it8720 && !(reg & (1 << 1))) {
-+ reg |= (1 << 1);
-+ superio_outb(IT87_SIO_PINX2_REG, reg);
-+ pr_notice("it87: Routing internal VCCH to in7\n");
-+ }
- if (reg & (1 << 0))
- pr_info("it87: in3 is VCC (+5V)\n");
- if (reg & (1 << 1))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.drivers/igb-entropy-source.patch new/patches.drivers/igb-entropy-source.patch
--- old/patches.drivers/igb-entropy-source.patch 2010-06-24 11:20:53.000000000 +0200
+++ new/patches.drivers/igb-entropy-source.patch 2010-08-18 19:44:13.000000000 +0200
@@ -17,7 +17,7 @@
--- a/drivers/net/igb/igb_main.c
+++ b/drivers/net/igb/igb_main.c
-@@ -60,6 +60,10 @@ static const struct e1000_info *igb_info
+@@ -61,6 +61,10 @@ static const struct e1000_info *igb_info
[board_82575] = &e1000_82575_info,
};
@@ -26,9 +26,9 @@
+MODULE_PARM_DESC(entropy, "Allow igb to populate the /dev/random entropy pool");
+
static DEFINE_PCI_DEVICE_TABLE(igb_pci_tbl) = {
- { PCI_VDEVICE(INTEL, E1000_DEV_ID_82580_COPPER), board_82575 },
- { PCI_VDEVICE(INTEL, E1000_DEV_ID_82580_FIBER), board_82575 },
-@@ -587,7 +591,8 @@ static int igb_request_msix(struct igb_a
+ { PCI_VDEVICE(INTEL, E1000_DEV_ID_I350_COPPER), board_82575 },
+ { PCI_VDEVICE(INTEL, E1000_DEV_ID_I350_FIBER), board_82575 },
+@@ -897,7 +901,8 @@ static int igb_request_msix(struct igb_a
int i, err = 0, vector = 0;
err = request_irq(adapter->msix_entries[vector].vector,
@@ -38,7 +38,7 @@
if (err)
goto out;
vector++;
-@@ -882,6 +887,10 @@ static int igb_request_irq(struct igb_ad
+@@ -1194,6 +1199,10 @@ static int igb_request_irq(struct igb_ad
struct net_device *netdev = adapter->netdev;
struct pci_dev *pdev = adapter->pdev;
int err = 0;
@@ -49,7 +49,7 @@
if (adapter->msix_entries) {
err = igb_request_msix(adapter);
-@@ -916,7 +925,7 @@ static int igb_request_irq(struct igb_ad
+@@ -1228,7 +1237,7 @@ static int igb_request_irq(struct igb_ad
}
if (adapter->flags & IGB_FLAG_HAS_MSI) {
@@ -58,7 +58,7 @@
netdev->name, adapter);
if (!err)
goto request_done;
-@@ -926,7 +935,8 @@ static int igb_request_irq(struct igb_ad
+@@ -1238,7 +1247,8 @@ static int igb_request_irq(struct igb_ad
adapter->flags &= ~IGB_FLAG_HAS_MSI;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.drivers/input-Add-LED-support-to-Synaptics-device new/patches.drivers/input-Add-LED-support-to-Synaptics-device
--- old/patches.drivers/input-Add-LED-support-to-Synaptics-device 2010-06-24 11:20:53.000000000 +0200
+++ new/patches.drivers/input-Add-LED-support-to-Synaptics-device 2010-08-18 19:44:13.000000000 +0200
@@ -26,7 +26,7 @@
--- a/drivers/input/mouse/Kconfig
+++ b/drivers/input/mouse/Kconfig
-@@ -19,6 +19,7 @@
+@@ -19,6 +19,7 @@ config MOUSE_PS2
select SERIO_LIBPS2
select SERIO_I8042 if X86
select SERIO_GSCPS2 if GSC
@@ -34,7 +34,7 @@
help
Say Y here if you have a PS/2 mouse connected to your system. This
includes the standard 2 or 3-button PS/2 mouse, as well as PS/2
-@@ -67,6 +68,14 @@
+@@ -67,6 +68,14 @@ config MOUSE_PS2_SYNAPTICS
If unsure, say Y.
@@ -59,7 +59,7 @@
#include
#include "psmouse.h"
#include "synaptics.h"
-@@ -335,6 +336,110 @@
+@@ -353,6 +354,110 @@ static void synaptics_pt_create(struct p
serio_register_port(serio);
}
@@ -170,7 +170,7 @@
/*****************************************************************************
* Functions to interpret the absolute mode packets
****************************************************************************/
-@@ -622,6 +727,7 @@
+@@ -647,6 +752,7 @@ static void set_input_params(struct inpu
static void synaptics_disconnect(struct psmouse *psmouse)
{
@@ -178,7 +178,7 @@
synaptics_reset(psmouse);
kfree(psmouse->private);
psmouse->private = NULL;
-@@ -653,6 +759,8 @@
+@@ -678,6 +784,8 @@ static int synaptics_reconnect(struct ps
return -1;
}
@@ -187,7 +187,7 @@
return 0;
}
-@@ -727,6 +835,9 @@
+@@ -752,6 +860,9 @@ int synaptics_init(struct psmouse *psmou
SYN_ID_MAJOR(priv->identity), SYN_ID_MINOR(priv->identity),
priv->model_id, priv->capabilities, priv->ext_cap, priv->ext_cap_0c);
@@ -199,7 +199,7 @@
/*
--- a/drivers/input/mouse/synaptics.h
+++ b/drivers/input/mouse/synaptics.h
-@@ -94,6 +94,8 @@
+@@ -97,6 +97,8 @@ struct synaptics_hw_state {
signed char scroll;
};
@@ -208,7 +208,7 @@
struct synaptics_data {
/* Data read from the touchpad */
unsigned long int model_id; /* Model-ID */
-@@ -107,6 +109,7 @@
+@@ -110,6 +112,7 @@ struct synaptics_data {
unsigned char pkt_type; /* packet type - old, new, etc */
unsigned char mode; /* current mode byte */
int scroll;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.drivers/ixgbe-entropy-source.patch new/patches.drivers/ixgbe-entropy-source.patch
--- old/patches.drivers/ixgbe-entropy-source.patch 2010-06-24 11:20:53.000000000 +0200
+++ new/patches.drivers/ixgbe-entropy-source.patch 2010-08-18 19:44:13.000000000 +0200
@@ -17,7 +17,7 @@
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
-@@ -55,6 +55,11 @@ static const char ixgbe_driver_string[]
+@@ -56,6 +56,11 @@ static const char ixgbe_driver_string[]
const char ixgbe_driver_version[] = DRV_VERSION;
static char ixgbe_copyright[] = "Copyright (c) 1999-2010 Intel Corporation.";
@@ -29,7 +29,7 @@
static const struct ixgbe_info *ixgbe_info_tbl[] = {
[board_82598] = &ixgbe_82598_info,
[board_82599] = &ixgbe_82599_info,
-@@ -1717,6 +1722,7 @@ static int ixgbe_request_msix_irqs(struc
+@@ -2121,6 +2126,7 @@ static int ixgbe_request_msix_irqs(struc
irqreturn_t (*handler)(int, void *);
int i, vector, q_vectors, err;
int ri=0, ti=0;
@@ -37,7 +37,7 @@
/* Decrement for Other and TCP Timer vectors */
q_vectors = adapter->num_msix_vectors - NON_Q_VECTORS;
-@@ -1732,20 +1738,26 @@ static int ixgbe_request_msix_irqs(struc
+@@ -2136,20 +2142,26 @@ static int ixgbe_request_msix_irqs(struc
for (vector = 0; vector < q_vectors; vector++) {
handler = SET_HANDLER(adapter->q_vector[vector]);
@@ -65,8 +65,8 @@
+ handler, irq_flags, adapter->name[vector],
adapter->q_vector[vector]);
if (err) {
- DPRINTK(PROBE, ERR,
-@@ -1931,14 +1943,19 @@ static int ixgbe_request_irq(struct ixgb
+ e_err(probe, "request_irq failed for MSIX interrupt "
+@@ -2336,14 +2348,19 @@ static int ixgbe_request_irq(struct ixgb
{
struct net_device *netdev = adapter->netdev;
int err;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.drivers/libata-add-waits-for-govault new/patches.drivers/libata-add-waits-for-govault
--- old/patches.drivers/libata-add-waits-for-govault 2010-06-24 11:20:53.000000000 +0200
+++ new/patches.drivers/libata-add-waits-for-govault 1970-01-01 01:00:00.000000000 +0100
@@ -1,35 +0,0 @@
-From: Tejun Heo
-Date: Wed, 7 Feb 2007 12:37:41 -0800
-Subject: [PATCH] libata: add waits for GoVault
-References: 246451
-Patch-mainline: not yet
-
-Iomega GoVault drives need specific waits here and there. Upstream
-approach hasn't been determined yet. This is temp solution from Gary
-Hade. Read the following thread for details.
-
-http://thread.gmane.org/gmane.linux.ide/14545/focus=14663
-
-With recent changes in the reset sequence (ATA_TMOUT_FF_WAIT and
-prefer-hardreset), the only thing which needs adjustment is
-ATA_TMOUT_FF_WAIT (the prereset wait part is unnecessary as the wait
-is necessary only for softreset when SCR registers are accessible and
-in those cases libata now always uses hardreset which doesn't require
-such wait).
-
-Signed-off-by: Tejun Heo
----
- include/linux/libata.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/include/linux/libata.h
-+++ b/include/linux/libata.h
-@@ -260,7 +260,7 @@ enum {
- * HHD424020F7SV00. Increase to 2secs when parallel probing
- * is in place.
- */
-- ATA_TMOUT_FF_WAIT = 800,
-+ ATA_TMOUT_FF_WAIT = 2000,
-
- /* Spec mandates to wait for ">= 2ms" before checking status
- * after reset. We wait 150ms, because that was the magic
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.drivers/libata-ata_generic-mcp89-mbp71 new/patches.drivers/libata-ata_generic-mcp89-mbp71
--- old/patches.drivers/libata-ata_generic-mcp89-mbp71 2010-06-24 11:20:53.000000000 +0200
+++ new/patches.drivers/libata-ata_generic-mcp89-mbp71 1970-01-01 01:00:00.000000000 +0100
@@ -1,81 +0,0 @@
-From: Tejun Heo
-Subject: ahci,ata_generic: let ata_generic handle new MBP w/ MCP89
-References: bko#15923
-Patch-Mainline: pending for 2.6.35 and -stable
-
-For yet unknown reason, MCP89 on MBP 7,1 doesn't work w/ ahci under
-linux but the controller doesn't require explicit mode setting and
-works fine with ata_generic. Make ahci ignore the controller on MBP
-7,1 and let ata_generic take it for now.
-
-Reported in bko#15923.
-
- https://bugzilla.kernel.org/show_bug.cgi?id=15923
-
-NVIDIA is investigating why ahci mode doesn't work.
-
-Signed-off-by: Tejun Heo
-Cc: Peer Chen
-Cc: stable@kernel.org
-Reported-by: Anders Østhus
-Reported-by: Andreas Graf
-Reported-by: Benoit Gschwind
-Reported-by: Damien Cassou
-Reported-by: tixetsal@juno.com
-Signed-off-by: Tejun Heo
----
- drivers/ata/ahci.c | 10 ++++++++++
- drivers/ata/ata_generic.c | 6 ++++++
- include/linux/pci_ids.h | 1 +
- 3 files changed, 17 insertions(+)
-
-Index: linux-2.6.34-master/drivers/ata/ahci.c
-===================================================================
---- linux-2.6.34-master.orig/drivers/ata/ahci.c
-+++ linux-2.6.34-master/drivers/ata/ahci.c
-@@ -3249,6 +3249,16 @@ static int ahci_init_one(struct pci_dev
- if (pdev->vendor == PCI_VENDOR_ID_MARVELL && !marvell_enable)
- return -ENODEV;
-
-+ /*
-+ * For some reason, MCP89 on MacBook 7,1 doesn't work with
-+ * ahci, use ata_generic instead.
-+ */
-+ if (pdev->vendor == PCI_VENDOR_ID_NVIDIA &&
-+ pdev->device == PCI_DEVICE_ID_NVIDIA_NFORCE_MCP89_SATA &&
-+ pdev->subsystem_vendor == PCI_VENDOR_ID_APPLE &&
-+ pdev->subsystem_device == 0xcb89)
-+ return -ENODEV;
-+
- /* Promise's PDC42819 is a SAS/SATA controller that has an AHCI mode.
- * At the moment, we can only use the AHCI mode. Let the users know
- * that for SAS drives they're out of luck.
-Index: linux-2.6.34-master/drivers/ata/ata_generic.c
-===================================================================
---- linux-2.6.34-master.orig/drivers/ata/ata_generic.c
-+++ linux-2.6.34-master/drivers/ata/ata_generic.c
-@@ -168,6 +168,12 @@ static struct pci_device_id ata_generic[
- { PCI_DEVICE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C561), },
- { PCI_DEVICE(PCI_VENDOR_ID_OPTI, PCI_DEVICE_ID_OPTI_82C558), },
- { PCI_DEVICE(PCI_VENDOR_ID_CENATEK,PCI_DEVICE_ID_CENATEK_IDE), },
-+ /*
-+ * For some reason, MCP89 on MacBook 7,1 doesn't work with
-+ * ahci, use ata_generic instead.
-+ */
-+ { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP89_SATA,
-+ PCI_VENDOR_ID_APPLE, 0xcb89, },
- #if !defined(CONFIG_PATA_TOSHIBA) && !defined(CONFIG_PATA_TOSHIBA_MODULE)
- { PCI_DEVICE(PCI_VENDOR_ID_TOSHIBA,PCI_DEVICE_ID_TOSHIBA_PICCOLO_1), },
- { PCI_DEVICE(PCI_VENDOR_ID_TOSHIBA,PCI_DEVICE_ID_TOSHIBA_PICCOLO_2), },
-Index: linux-2.6.34-master/include/linux/pci_ids.h
-===================================================================
---- linux-2.6.34-master.orig/include/linux/pci_ids.h
-+++ linux-2.6.34-master/include/linux/pci_ids.h
-@@ -1261,6 +1261,7 @@
- #define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP77_IDE 0x0759
- #define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP73_SMBUS 0x07D8
- #define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP79_SMBUS 0x0AA2
-+#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP89_SATA 0x0D85
-
- #define PCI_VENDOR_ID_IMS 0x10e0
- #define PCI_DEVICE_ID_IMS_TT128 0x9128
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.drivers/libata-unlock-hpa-by-default new/patches.drivers/libata-unlock-hpa-by-default
--- old/patches.drivers/libata-unlock-hpa-by-default 2010-06-24 11:20:53.000000000 +0200
+++ new/patches.drivers/libata-unlock-hpa-by-default 2010-08-18 19:44:13.000000000 +0200
@@ -13,7 +13,7 @@
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
-@@ -139,7 +139,7 @@ int libata_fua = 0;
+@@ -138,7 +138,7 @@ int libata_fua = 0;
module_param_named(fua, libata_fua, int, 0444);
MODULE_PARM_DESC(fua, "FUA support (0=off [default], 1=on)");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.drivers/megaraid-mbox-fix-SG_IO new/patches.drivers/megaraid-mbox-fix-SG_IO
--- old/patches.drivers/megaraid-mbox-fix-SG_IO 2010-06-24 11:20:53.000000000 +0200
+++ new/patches.drivers/megaraid-mbox-fix-SG_IO 2010-08-18 19:44:13.000000000 +0200
@@ -21,7 +21,7 @@
--- a/drivers/scsi/megaraid/megaraid_mbox.c
+++ b/drivers/scsi/megaraid/megaraid_mbox.c
-@@ -1585,13 +1585,20 @@ megaraid_mbox_build_cmd(adapter_t *adapt
+@@ -1586,13 +1586,20 @@ megaraid_mbox_build_cmd(adapter_t *adapt
case MODE_SENSE:
{
struct scatterlist *sgl;
@@ -45,7 +45,7 @@
}
else {
con_log(CL_ANN, (KERN_WARNING
-@@ -2329,9 +2336,20 @@ megaraid_mbox_dpc(unsigned long devp)
+@@ -2330,9 +2337,20 @@ megaraid_mbox_dpc(unsigned long devp)
if (scp->cmnd[0] == INQUIRY && status == 0 && islogical == 0
&& IS_RAID_CH(raid_dev, scb->dev_channel)) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.drivers/pci-disable-msi-on-K8M800 new/patches.drivers/pci-disable-msi-on-K8M800
--- old/patches.drivers/pci-disable-msi-on-K8M800 2010-06-24 11:20:53.000000000 +0200
+++ new/patches.drivers/pci-disable-msi-on-K8M800 1970-01-01 01:00:00.000000000 +0100
@@ -1,30 +0,0 @@
-From: Tejun Heo
-Subject: [PATCH] pci: disable MSI on VIA K8M800
-References: bnc#599508
-Patch-Mainline: Pending for 2.6.35 and -stable
-
-MSI delivery from on-board ahci controller doesn't work on K8M800. At
-this point, it's unclear whether the culprit is with the ahci
-controller or the host bridge. Given the track record and considering
-the rather minimal impact of MSI, disabling it seems reasonable.
-
-Signed-off-by: Tejun Heo
-Reported-by: Rainer Hurtado Navarro
-Cc: stable@kernel.org
-Signed-off-by: Tejun Heo
----
- drivers/pci/quirks.c | 1 +
- 1 file changed, 1 insertion(+)
-
-Index: linux-2.6.34-master/drivers/pci/quirks.c
-===================================================================
---- linux-2.6.34-master.orig/drivers/pci/quirks.c
-+++ linux-2.6.34-master/drivers/pci/quirks.c
-@@ -2112,6 +2112,7 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AT
- DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_VT3336, quirk_disable_all_msi);
- DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_VT3351, quirk_disable_all_msi);
- DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_VT3364, quirk_disable_all_msi);
-+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8380_0, quirk_disable_all_msi);
-
- /* Disable MSI on chipsets that are known to not support it */
- static void __devinit quirk_disable_msi(struct pci_dev *dev)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.drivers/tg3-5785-and-57780-asic-revs-not-working.patch new/patches.drivers/tg3-5785-and-57780-asic-revs-not-working.patch
--- old/patches.drivers/tg3-5785-and-57780-asic-revs-not-working.patch 2010-06-24 11:20:53.000000000 +0200
+++ new/patches.drivers/tg3-5785-and-57780-asic-revs-not-working.patch 2010-08-18 19:44:13.000000000 +0200
@@ -29,11 +29,9 @@
drivers/net/tg3.h | 9 +++++
2 files changed, 92 insertions(+)
-Index: linux-2.6.34-master/drivers/net/tg3.c
-===================================================================
---- linux-2.6.34-master.orig/drivers/net/tg3.c
-+++ linux-2.6.34-master/drivers/net/tg3.c
-@@ -1956,6 +1956,58 @@ static int tg3_phy_reset(struct tg3 *tp)
+--- a/drivers/net/tg3.c
++++ b/drivers/net/tg3.c
+@@ -1998,6 +1998,58 @@ static int tg3_phy_reset(struct tg3 *tp)
tg3_phy_toggle_apd(tp, false);
out:
@@ -89,14 +87,14 @@
+ MII_TG3_AUXCTL_ACTL_TX_6DB;
+ tg3_writephy(tp, MII_TG3_AUX_CTRL, reg);
+ }
- if (tp->tg3_flags2 & TG3_FLG2_PHY_ADC_BUG) {
+ if (tp->phy_flags & TG3_PHYFLG_ADC_BUG) {
tg3_writephy(tp, MII_TG3_AUX_CTRL, 0x0c00);
- tg3_writephy(tp, MII_TG3_DSP_ADDRESS, 0x201f);
-@@ -2018,6 +2070,22 @@ out:
+ tg3_phydsp_write(tp, 0x201f, 0x2aaa);
+@@ -2054,6 +2106,22 @@ out:
/* adjust output voltage */
tg3_writephy(tp, MII_TG3_FET_PTEST, 0x12);
}
-+ else if (tp->tg3_flags3 & TG3_FLG3_PHY_IS_FET) {
++ else if (tp->phy_flags & TG3_PHYFLG_IS_FET) {
+ u32 brcmtest;
+ if (!tg3_readphy(tp, MII_TG3_FET_TEST, &brcmtest) &&
+ !tg3_writephy(tp, MII_TG3_FET_TEST,
@@ -115,7 +113,7 @@
tg3_phy_toggle_automdix(tp, 1);
tg3_phy_set_wirespeed(tp);
-@@ -3260,6 +3328,15 @@ relink:
+@@ -3288,6 +3356,15 @@ relink:
tw32_f(MAC_MODE, tp->mac_mode);
udelay(40);
@@ -131,7 +129,7 @@
if (tp->tg3_flags & TG3_FLAG_USE_LINKCHG_REG) {
/* Polled via timer. */
tw32_f(MAC_EVENT, 0);
-@@ -13505,9 +13582,11 @@ static int __devinit tg3_get_invariants(
+@@ -13411,9 +13488,11 @@ static int __devinit tg3_get_invariants(
GET_CHIP_REV(tp->pci_chip_rev_id) != CHIPREV_5700_BX)
tp->coalesce_mode |= HOSTCC_MODE_32BYTE;
@@ -143,10 +141,10 @@
err = tg3_mdio_init(tp);
if (err)
-@@ -14293,6 +14372,10 @@ static char * __devinit tg3_phy_string(s
- case TG3_PHY_ID_BCM5718C: return "5718C";
+@@ -14203,6 +14282,10 @@ static char * __devinit tg3_phy_string(s
case TG3_PHY_ID_BCM5718S: return "5718S";
case TG3_PHY_ID_BCM57765: return "57765";
+ case TG3_PHY_ID_BCM5719C: return "5719C";
+ case TG3_PHY_ID_BCM50610: return "50610";
+ case TG3_PHY_ID_BCM50610M: return "50610M";
+ case TG3_PHY_ID_BCMAC131: return "AC131";
@@ -154,11 +152,9 @@
case TG3_PHY_ID_BCM8002: return "8002/serdes";
case 0: return "serdes";
default: return "unknown";
-Index: linux-2.6.34-master/drivers/net/tg3.h
-===================================================================
---- linux-2.6.34-master.orig/drivers/net/tg3.h
-+++ linux-2.6.34-master/drivers/net/tg3.h
-@@ -2086,6 +2086,7 @@
+--- a/drivers/net/tg3.h
++++ b/drivers/net/tg3.h
+@@ -2072,6 +2072,7 @@
#define MII_TG3_DSP_EXP8_REJ2MHz 0x0001
#define MII_TG3_DSP_EXP8_AEDW 0x0200
#define MII_TG3_DSP_EXP75 0x0f75
@@ -166,7 +162,7 @@
#define MII_TG3_DSP_EXP96 0x0f96
#define MII_TG3_DSP_EXP97 0x0f97
-@@ -2141,6 +2142,8 @@
+@@ -2127,6 +2128,8 @@
#define MII_TG3_MISC_SHDW_SCR5_LPED 0x0010
#define MII_TG3_MISC_SHDW_SCR5_SEL 0x1400
@@ -175,7 +171,7 @@
#define MII_TG3_TEST1 0x1e
#define MII_TG3_TEST1_TRIM_EN 0x0010
#define MII_TG3_TEST1_CRC_EN 0x8000
-@@ -2158,6 +2161,8 @@
+@@ -2144,6 +2147,8 @@
#define MII_TG3_FET_SHDW_MISCCTRL_MDIX 0x4000
#define MII_TG3_FET_SHDW_AUXMODE4 0x1a
@@ -184,8 +180,8 @@
#define MII_TG3_FET_SHDW_AUXMODE4_SBPD 0x0008
#define MII_TG3_FET_SHDW_AUXSTAT2 0x1b
-@@ -2943,6 +2948,10 @@ struct tg3 {
- #define TG3_PHY_ID_BCM57765 0x5c0d8a40
+@@ -2922,6 +2927,10 @@ struct tg3 {
+ #define TG3_PHY_ID_BCM5719C 0x5c0d8a20
#define TG3_PHY_ID_BCM5906 0xdc00ac40
#define TG3_PHY_ID_BCM8002 0x60010140
+#define TG3_PHY_ID_BCM50610 0xbc050d60
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.drivers/tg3-entropy-source.patch new/patches.drivers/tg3-entropy-source.patch
--- old/patches.drivers/tg3-entropy-source.patch 2010-06-24 11:20:53.000000000 +0200
+++ new/patches.drivers/tg3-entropy-source.patch 2010-08-18 19:44:13.000000000 +0200
@@ -18,8 +18,8 @@
-
#include
#include
- #include
-@@ -66,6 +65,10 @@
+ #include
+@@ -67,6 +66,10 @@
#include "tg3.h"
@@ -28,9 +28,9 @@
+MODULE_PARM_DESC(entropy, "Allow tg3 to populate the /dev/random entropy pool");
+
#define DRV_MODULE_NAME "tg3"
- #define DRV_MODULE_VERSION "3.108"
- #define DRV_MODULE_RELDATE "February 17, 2010"
-@@ -8494,10 +8497,13 @@ restart_timer:
+ #define TG3_MAJ_NUM 3
+ #define TG3_MIN_NUM 113
+@@ -8590,10 +8593,13 @@ restart_timer:
static int tg3_request_irq(struct tg3 *tp, int irq_num)
{
irq_handler_t fn;
@@ -45,7 +45,7 @@
if (tp->irq_cnt == 1)
name = tp->dev->name;
else {
-@@ -8510,12 +8516,11 @@ static int tg3_request_irq(struct tg3 *t
+@@ -8606,12 +8612,11 @@ static int tg3_request_irq(struct tg3 *t
fn = tg3_msi;
if (tp->tg3_flags2 & TG3_FLG2_1SHOT_MSI)
fn = tg3_msi_1shot;
++++++ patches.fixes.tar.bz2 ++++++
++++ 28584 lines of diff (skipped)
++++++ patches.kernel.org.tar.bz2 ++++++
kernel-source/patches.kernel.org.tar.bz2 kernel-source/patches.kernel.org.tar.bz2 differ: char 11, line 1
++++++ patches.rpmify.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.rpmify/buildhost new/patches.rpmify/buildhost
--- old/patches.rpmify/buildhost 2010-03-18 18:58:09.000000000 +0100
+++ new/patches.rpmify/buildhost 2010-08-24 17:47:48.000000000 +0200
@@ -7,21 +7,20 @@
Signed-off-by: Andreas Gruenbacher
- scripts/mkcompile_h | 17 +++--------------
- 1 file changed, 3 insertions(+), 14 deletions(-)
+ scripts/mkcompile_h | 16 +++-------------
+ 1 file changed, 3 insertions(+), 13 deletions(-)
--- a/scripts/mkcompile_h
+++ b/scripts/mkcompile_h
-@@ -64,20 +64,9 @@ UTS_TRUNCATE="cut -b -$UTS_LEN"
+@@ -64,19 +64,9 @@ UTS_TRUNCATE="cut -b -$UTS_LEN"
echo \#define UTS_VERSION \"`echo $UTS_VERSION | $UTS_TRUNCATE`\"
echo \#define LINUX_COMPILE_TIME \"`date +%T`\"
- echo \#define LINUX_COMPILE_BY \"`whoami`\"
- echo \#define LINUX_COMPILE_HOST \"`hostname | $UTS_TRUNCATE`\"
-
-- if [ -x /bin/dnsdomainname ]; then
-- domain=`dnsdomainname 2> /dev/null`
-- elif [ -x /bin/domainname ]; then
+- domain=`dnsdomainname 2> /dev/null`
+- if [ -z "$domain" ]; then
- domain=`domainname 2> /dev/null`
- fi
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.rpmify/cloneconfig.diff new/patches.rpmify/cloneconfig.diff
--- old/patches.rpmify/cloneconfig.diff 2010-03-18 18:58:09.000000000 +0100
+++ new/patches.rpmify/cloneconfig.diff 2010-08-24 17:47:48.000000000 +0200
@@ -8,15 +8,16 @@
Signed-off-by: Andreas Gruenbacher
- scripts/kconfig/Makefile | 16 ++++++++++++++++
- 1 file changed, 16 insertions(+)
+ scripts/kconfig/Makefile | 17 +++++++++++++++++
+ 1 file changed, 17 insertions(+)
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
-@@ -106,6 +106,22 @@ allnoconfig: $(obj)/conf
- allmodconfig: $(obj)/conf
- $< -m $(Kconfig)
+@@ -99,6 +99,23 @@ PHONY += allnoconfig allyesconfig allmod
+ allnoconfig allyesconfig allmodconfig alldefconfig randconfig: $(obj)/conf
+ $< --$@ $(Kconfig)
++
+UNAME_RELEASE := $(shell uname -r)
+CLONECONFIG := $(firstword $(wildcard /proc/config.gz \
+ /lib/modules/$(UNAME_RELEASE)/.config \
@@ -33,6 +34,6 @@
+ echo -e "Cloning configuration file $(CLONECONFIG)\n"
+ $(Q)$< -D .config.running arch/$(SRCARCH)/Kconfig
+
- defconfig: $(obj)/conf
- ifeq ($(KBUILD_DEFCONFIG),)
- $< -d $(Kconfig)
+
+ PHONY += listnewconfig oldnoconfig savedefconfig defconfig
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.rpmify/dmar-fix-section-mismatch new/patches.rpmify/dmar-fix-section-mismatch
--- old/patches.rpmify/dmar-fix-section-mismatch 2010-03-18 18:58:09.000000000 +0100
+++ new/patches.rpmify/dmar-fix-section-mismatch 1970-01-01 01:00:00.000000000 +0100
@@ -1,26 +0,0 @@
-From: Jeff Mahoney
-Subject: dmar: Fix section mismatch
-Patch-mainline: Next linux-next sync
-Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/sfr/linux-next.git
-Git-commit: 0b8973a81876d90f916507ac40d1381068dc986a
-
- dmar_ir_support uses dmar_tbl, which is __initdata. dmar_ir_support is
- only called by intr_remapping_supported, which is __init. So, we mark
- dmar_ir_support as __init as well.
-
-Signed-off-by: Jeff Mahoney
----
- drivers/pci/dmar.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/pci/dmar.c
-+++ b/drivers/pci/dmar.c
-@@ -1456,7 +1456,7 @@ int dmar_reenable_qi(struct intel_iommu
- /*
- * Check interrupt remapping support in DMAR table description.
- */
--int dmar_ir_support(void)
-+int __init dmar_ir_support(void)
- {
- struct acpi_table_dmar *dmar;
- dmar = (struct acpi_table_dmar *)dmar_tbl;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.rpmify/firmware-path new/patches.rpmify/firmware-path
--- old/patches.rpmify/firmware-path 2010-03-18 18:58:09.000000000 +0100
+++ new/patches.rpmify/firmware-path 2010-08-24 17:47:48.000000000 +0200
@@ -15,7 +15,7 @@
--- a/Makefile
+++ b/Makefile
-@@ -1028,7 +1028,7 @@ depend dep:
+@@ -975,7 +975,7 @@ depend dep:
# ---------------------------------------------------------------------------
# Firmware install
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.rpmify/ia64-mca-fix-cast-from-integer-to-pointer-warning new/patches.rpmify/ia64-mca-fix-cast-from-integer-to-pointer-warning
--- old/patches.rpmify/ia64-mca-fix-cast-from-integer-to-pointer-warning 2010-03-18 18:58:09.000000000 +0100
+++ new/patches.rpmify/ia64-mca-fix-cast-from-integer-to-pointer-warning 2010-08-24 17:47:48.000000000 +0200
@@ -13,7 +13,7 @@
--- a/arch/ia64/kernel/mca.c
+++ b/arch/ia64/kernel/mca.c
-@@ -1858,7 +1858,8 @@ ia64_mca_cpu_init(void *cpu_data)
+@@ -1859,7 +1859,8 @@ ia64_mca_cpu_init(void *cpu_data)
data = mca_bootmem();
first_time = 0;
} else
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.rpmify/powerpc-kvm-build-failure-workaround new/patches.rpmify/powerpc-kvm-build-failure-workaround
--- old/patches.rpmify/powerpc-kvm-build-failure-workaround 2010-03-18 18:58:09.000000000 +0100
+++ new/patches.rpmify/powerpc-kvm-build-failure-workaround 1970-01-01 01:00:00.000000000 +0100
@@ -1,31 +0,0 @@
-From: Jeff Mahoney
-Subject: powerpc: kvm build failure workaround
-Patch-mainline: Hopefully never
-
- This patch works around an issue with gcc 4.5 that is failing the build
- with:
- arch/powerpc/kvm/book3s.c:1102:23: error: 'ext_bkp.vrsave' may be used uninitialized in this function
-
- The warning is incorrect, so we work around it by explicitly setting it to
- 0.
-
-Signed-off-by: Jeff Mahoney
----
- arch/powerpc/kvm/book3s.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
---- a/arch/powerpc/kvm/book3s.c
-+++ b/arch/powerpc/kvm/book3s.c
-@@ -1104,6 +1104,12 @@ int __kvmppc_vcpu_run(struct kvm_run *kv
- bool save_vsx = current->thread.used_vsr;
- ulong ext_msr;
-
-+#ifdef CONFIG_ALTIVEC
-+ /* JDM This is functionally unnecessary but works around an
-+ * over-eager unintialized usage checker in gcc 4.5 */
-+ ext_bkp.vrsave = current->thread.vrsave;
-+#endif
-+
- /* No need to go into the guest when all we do is going out */
- if (signal_pending(current)) {
- kvm_run->exit_reason = KVM_EXIT_INTR;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.rpmify/ppc-crashdump-typefix new/patches.rpmify/ppc-crashdump-typefix
--- old/patches.rpmify/ppc-crashdump-typefix 2010-03-18 18:58:09.000000000 +0100
+++ new/patches.rpmify/ppc-crashdump-typefix 1970-01-01 01:00:00.000000000 +0100
@@ -1,23 +0,0 @@
-From: Jeff Mahoney
-Subject: powerpc: use min_t in copy_oldmem_page
-Patch-mainline: not yet
-
- The gcc used in Factory considers the comparison of csize and PAGE_SIZE
- to be invalid and causes a build failure. This patch forces it to use size_t.
-
-Signed-off-by: Jeff Mahoney
----
- arch/powerpc/kernel/crash_dump.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/arch/powerpc/kernel/crash_dump.c
-+++ b/arch/powerpc/kernel/crash_dump.c
-@@ -128,7 +128,7 @@ ssize_t copy_oldmem_page(unsigned long p
- if (!csize)
- return 0;
-
-- csize = min(csize, PAGE_SIZE);
-+ csize = min_t(size_t, csize, PAGE_SIZE);
-
- if (pfn < max_pfn) {
- vaddr = __va(pfn << PAGE_SHIFT);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.rpmify/spectra-depends-on-moorestown new/patches.rpmify/spectra-depends-on-moorestown
--- old/patches.rpmify/spectra-depends-on-moorestown 1970-01-01 01:00:00.000000000 +0100
+++ new/patches.rpmify/spectra-depends-on-moorestown 2010-08-24 17:47:48.000000000 +0200
@@ -0,0 +1,23 @@
+From: Jeff Mahoney
+Subject: spectra: depend on X86_MRST
+Patch-mainline: Submitted Aug 24
+
+ lld_nand fails to build on arches without virt_to_bus. Since this driver
+ is specifically for hardware enablment on Moorestown, this patch adds
+ Moorestown MID support as a dependency.
+
+Signed-off-by: Jeff Mahoney
+---
+ drivers/staging/spectra/Kconfig | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/staging/spectra/Kconfig
++++ b/drivers/staging/spectra/Kconfig
+@@ -2,6 +2,7 @@
+ menuconfig SPECTRA
+ tristate "Denali Spectra Flash Translation Layer"
+ depends on BLOCK
++ depends on X86_MRST
+ default n
+ ---help---
+ Enable the FTL pseudo-filesystem used with the NAND Flash
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.rpmify/tioca-fix-assignment-from-incompatible-pointer-warnings new/patches.rpmify/tioca-fix-assignment-from-incompatible-pointer-warnings
--- old/patches.rpmify/tioca-fix-assignment-from-incompatible-pointer-warnings 2010-03-18 18:58:09.000000000 +0100
+++ new/patches.rpmify/tioca-fix-assignment-from-incompatible-pointer-warnings 2010-08-24 17:47:48.000000000 +0200
@@ -12,7 +12,7 @@
--- a/arch/ia64/sn/pci/tioca_provider.c
+++ b/arch/ia64/sn/pci/tioca_provider.c
-@@ -508,7 +508,7 @@ tioca_dma_unmap(struct pci_dev *pdev, dm
+@@ -509,7 +509,7 @@ tioca_dma_unmap(struct pci_dev *pdev, dm
* use the GART mapped mode.
*/
static u64
++++++ patches.suse.tar.bz2 ++++++
++++ 109671 lines of diff (skipped)
++++++ patches.trace.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.trace/utrace-core new/patches.trace/utrace-core
--- old/patches.trace/utrace-core 2010-05-17 16:19:23.000000000 +0200
+++ new/patches.trace/utrace-core 2010-08-18 19:44:13.000000000 +0200
@@ -41,8 +41,8 @@
init/Kconfig | 9
kernel/Makefile | 1
kernel/ptrace.c | 14
- kernel/utrace.c | 2339 ++++++++++++++++++++++++++++++++++++++
- 12 files changed, 3790 insertions(+), 2 deletions(-)
+ kernel/utrace.c | 2340 ++++++++++++++++++++++++++++++++++++++
+ 12 files changed, 3791 insertions(+), 2 deletions(-)
--- a/Documentation/DocBook/Makefile
+++ b/Documentation/DocBook/Makefile
@@ -650,7 +650,7 @@
+</book>
--- a/fs/proc/array.c
+++ b/fs/proc/array.c
-@@ -82,6 +82,7 @@
+@@ -81,6 +81,7 @@
#include
#include
#include
@@ -658,7 +658,7 @@
#include
#include
-@@ -194,6 +195,8 @@ static inline void task_state(struct seq
+@@ -192,6 +193,8 @@ static inline void task_state(struct seq
cred->uid, cred->euid, cred->suid, cred->fsuid,
cred->gid, cred->egid, cred->sgid, cred->fsgid);
@@ -670,8 +670,8 @@
--- a/include/linux/init_task.h
+++ b/include/linux/init_task.h
@@ -165,6 +165,7 @@ extern struct cred init_cred;
- [PIDTYPE_SID] = INIT_PID_LINK(PIDTYPE_SID), \
}, \
+ .thread_group = LIST_HEAD_INIT(tsk.thread_group), \
.dirties = INIT_PROP_LOCAL_SINGLE(dirties), \
+ INIT_UTRACE(tsk) \
INIT_IDS \
@@ -687,7 +687,7 @@
#include
#include
-@@ -1352,6 +1353,11 @@ struct task_struct {
+@@ -1339,6 +1340,11 @@ struct task_struct {
#endif
seccomp_t seccomp;
@@ -1686,7 +1686,7 @@
+#endif /* linux/utrace_struct.h */
--- a/init/Kconfig
+++ b/init/Kconfig
-@@ -1301,6 +1301,15 @@ config STOP_MACHINE
+@@ -1315,6 +1315,15 @@ config STOP_MACHINE
help
Need stop_machine() primitive.
@@ -1706,23 +1706,23 @@
+++ b/kernel/Makefile
@@ -71,6 +71,7 @@ obj-$(CONFIG_IKCONFIG) += configs.o
obj-$(CONFIG_RESOURCE_COUNTERS) += res_counter.o
- obj-$(CONFIG_STOP_MACHINE) += stop_machine.o
+ obj-$(CONFIG_SMP) += stop_machine.o
obj-$(CONFIG_KPROBES_SANITY_TEST) += test_kprobes.o
+obj-$(CONFIG_UTRACE) += utrace.o
- obj-$(CONFIG_AUDIT) += audit.o auditfilter.o audit_watch.o
+ obj-$(CONFIG_AUDIT) += audit.o auditfilter.o
obj-$(CONFIG_AUDITSYSCALL) += auditsc.o
- obj-$(CONFIG_GCOV_KERNEL) += gcov/
+ obj-$(CONFIG_AUDIT_WATCH) += audit_watch.o
--- a/kernel/ptrace.c
+++ b/kernel/ptrace.c
-@@ -16,6 +16,7 @@
+@@ -15,6 +15,7 @@
+ #include
#include
- #include
#include
+#include
#include
#include
#include
-@@ -165,6 +166,14 @@ bool ptrace_may_access(struct task_struc
+@@ -163,6 +164,14 @@ bool ptrace_may_access(struct task_struc
return !err;
}
@@ -1737,7 +1737,7 @@
int ptrace_attach(struct task_struct *task)
{
int retval;
-@@ -188,6 +197,8 @@ int ptrace_attach(struct task_struct *ta
+@@ -186,6 +195,8 @@ int ptrace_attach(struct task_struct *ta
task_lock(task);
retval = __ptrace_may_access(task, PTRACE_MODE_ATTACH);
@@ -1746,7 +1746,7 @@
task_unlock(task);
if (retval)
goto unlock_creds;
-@@ -225,6 +236,9 @@ int ptrace_traceme(void)
+@@ -223,6 +234,9 @@ int ptrace_traceme(void)
{
int ret = -EPERM;
@@ -1758,7 +1758,7 @@
if (!current->ptrace) {
--- /dev/null
+++ b/kernel/utrace.c
-@@ -0,0 +1,2339 @@
+@@ -0,0 +1,2340 @@
+/*
+ * utrace infrastructure interface for debugging user processes
+ *
@@ -2011,7 +2011,8 @@
+ * Initialize the new engine structure. It starts out with two
+ * refs: one ref to return, and one ref for being attached.
+ */
-+ kref_set(&engine->kref, 2);
++ kref_init(&engine->kref);
++ kref_get(&engine->kref);
+ engine->flags = 0;
+ engine->ops = ops;
+ engine->data = data;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.trace/x86_cpufreq_make_trace_power_frequency_cpufreq_driver_independent.patch new/patches.trace/x86_cpufreq_make_trace_power_frequency_cpufreq_driver_independent.patch
--- old/patches.trace/x86_cpufreq_make_trace_power_frequency_cpufreq_driver_independent.patch 2010-05-17 16:19:23.000000000 +0200
+++ new/patches.trace/x86_cpufreq_make_trace_power_frequency_cpufreq_driver_independent.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,247 +0,0 @@
-From: Thomas Renninger
-Subject: x86 cpufreq: Make trace_power_frequency cpufreq driver independent
-Patch-Mainline: submitted - please revert after 2.6.35 (whether it's in or not)
-References: none
-
-and fix the broken case if a core's frequency depends on others.
-
-trace_power_frequency was only implemented in a rather ungeneric way
-in acpi-cpufreq driver's target() function only.
--> Move the call to trace_power_frequency to
- cpufreq.c:cpufreq_notify_transition() where CPUFREQ_POSTCHANGE
- notifier is triggered.
- This will support power frequency tracing by all cpufreq drivers
-
-trace_power_frequency did not trace frequency changes correctly when
-the userspace governor was used or when CPU cores' frequency depend
-on each other.
--> Moving this into the CPUFREQ_POSTCHANGE notifier and pass the cpu
- which gets switched automatically fixes this.
-
-Robert Schoene provided some important fixes on top of my initial
-quick shot version which are integrated in this patch:
-- Forgot some changes in power_end trace (TP_printk/variable names)
-- Variable dummy in power_end must now be cpu_id
-- Use static 64 bit variable instead of unsigned int for cpu_id
-
-Signed-off-by: Thomas Renninger
-CC: davej@redhat.com
-CC: arjan@infradead.org
-CC: davej@redhat.com
-CC: linux-kernel@vger.kernel.org
-CC: robert.schoene@tu-dresden.de
-Tested-by: robert.schoene@tu-dresden.de
----
- arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c | 3 ---
- arch/x86/kernel/process.c | 8 ++++----
- drivers/cpufreq/cpufreq.c | 5 +++++
- drivers/cpuidle/cpuidle.c | 2 +-
- include/trace/events/power.h | 27 +++++++++++++++------------
- tools/perf/builtin-timechart.c | 11 ++++++-----
- 6 files changed, 31 insertions(+), 25 deletions(-)
-
-diff --git a/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c b/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
-index c6de3a9..9241402 100644
---- a/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
-+++ b/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
-@@ -34,7 +34,6 @@
- #include
- #include
- #include
--#include
-
- #include
- #include
-@@ -364,8 +363,6 @@ static int acpi_cpufreq_target(struct cpufreq_policy *policy,
- }
- }
-
-- trace_power_frequency(POWER_PSTATE, data->freq_table[next_state].frequency);
--
- switch (data->cpu_feature) {
- case SYSTEM_INTEL_MSR_CAPABLE:
- cmd.type = SYSTEM_INTEL_MSR_CAPABLE;
-diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c
-index 28ad9f4..bc3bbf6 100644
---- a/arch/x86/kernel/process.c
-+++ b/arch/x86/kernel/process.c
-@@ -371,7 +371,7 @@ static inline int hlt_use_halt(void)
- void default_idle(void)
- {
- if (hlt_use_halt()) {
-- trace_power_start(POWER_CSTATE, 1);
-+ trace_power_start(POWER_CSTATE, 1, smp_processor_id());
- current_thread_info()->status &= ~TS_POLLING;
- /*
- * TS_POLLING-cleared state must be visible before we
-@@ -441,7 +441,7 @@ EXPORT_SYMBOL_GPL(cpu_idle_wait);
- */
- void mwait_idle_with_hints(unsigned long ax, unsigned long cx)
- {
-- trace_power_start(POWER_CSTATE, (ax>>4)+1);
-+ trace_power_start(POWER_CSTATE, (ax>>4)+1, smp_processor_id());
- if (!need_resched()) {
- if (cpu_has(¤t_cpu_data, X86_FEATURE_CLFLUSH_MONITOR))
- clflush((void *)¤t_thread_info()->flags);
-@@ -457,7 +457,7 @@ void mwait_idle_with_hints(unsigned long ax, unsigned long cx)
- static void mwait_idle(void)
- {
- if (!need_resched()) {
-- trace_power_start(POWER_CSTATE, 1);
-+ trace_power_start(POWER_CSTATE, 1, smp_processor_id());
- if (cpu_has(¤t_cpu_data, X86_FEATURE_CLFLUSH_MONITOR))
- clflush((void *)¤t_thread_info()->flags);
-
-@@ -478,7 +478,7 @@ static void mwait_idle(void)
- */
- static void poll_idle(void)
- {
-- trace_power_start(POWER_CSTATE, 0);
-+ trace_power_start(POWER_CSTATE, 0, smp_processor_id());
- local_irq_enable();
- while (!need_resched())
- cpu_relax();
-diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
-index 2d5d575..8ec1539 100644
---- a/drivers/cpufreq/cpufreq.c
-+++ b/drivers/cpufreq/cpufreq.c
-@@ -29,6 +29,8 @@
- #include
- #include
-
-+#include
-+
- #define dprintk(msg...) cpufreq_debug_printk(CPUFREQ_DEBUG_CORE, \
- "cpufreq-core", msg)
-
-@@ -354,6 +356,9 @@ void cpufreq_notify_transition(struct cpufreq_freqs *freqs, unsigned int state)
-
- case CPUFREQ_POSTCHANGE:
- adjust_jiffies(CPUFREQ_POSTCHANGE, freqs);
-+ dprintk("FREQ: %lu - CPU: %lu", (unsigned long)freqs->new,
-+ (unsigned long)freqs->cpu);
-+ trace_power_frequency(POWER_PSTATE, freqs->new, freqs->cpu);
- srcu_notifier_call_chain(&cpufreq_transition_notifier_list,
- CPUFREQ_POSTCHANGE, freqs);
- if (likely(policy) && likely(policy->cpu == freqs->cpu))
-diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c
-index 12fdd39..c672f4a 100644
---- a/drivers/cpuidle/cpuidle.c
-+++ b/drivers/cpuidle/cpuidle.c
-@@ -95,7 +95,7 @@ static void cpuidle_idle_call(void)
- /* give the governor an opportunity to reflect on the outcome */
- if (cpuidle_curr_governor->reflect)
- cpuidle_curr_governor->reflect(dev);
-- trace_power_end(0);
-+ trace_power_end(smp_processor_id());
- }
-
- /**
-diff --git a/include/trace/events/power.h b/include/trace/events/power.h
-index c4efe9b..35a2a6e 100644
---- a/include/trace/events/power.h
-+++ b/include/trace/events/power.h
-@@ -18,52 +18,55 @@ enum {
-
- DECLARE_EVENT_CLASS(power,
-
-- TP_PROTO(unsigned int type, unsigned int state),
-+ TP_PROTO(unsigned int type, unsigned int state, unsigned int cpu_id),
-
-- TP_ARGS(type, state),
-+ TP_ARGS(type, state, cpu_id),
-
- TP_STRUCT__entry(
- __field( u64, type )
- __field( u64, state )
-+ __field( u64, cpu_id )
- ),
-
- TP_fast_assign(
- __entry->type = type;
- __entry->state = state;
-+ __entry->cpu_id = cpu_id;
- ),
-
-- TP_printk("type=%lu state=%lu", (unsigned long)__entry->type, (unsigned long)__entry->state)
-+ TP_printk("type=%lu state=%lu cpu_id=%lu", (unsigned long)__entry->type,
-+ (unsigned long)__entry->state, (unsigned long)__entry->cpu_id)
- );
-
- DEFINE_EVENT(power, power_start,
-
-- TP_PROTO(unsigned int type, unsigned int state),
-+ TP_PROTO(unsigned int type, unsigned int state, unsigned int cpu_id),
-
-- TP_ARGS(type, state)
-+ TP_ARGS(type, state, cpu_id)
- );
-
- DEFINE_EVENT(power, power_frequency,
-
-- TP_PROTO(unsigned int type, unsigned int state),
-+ TP_PROTO(unsigned int type, unsigned int state, unsigned int cpu_id),
-
-- TP_ARGS(type, state)
-+ TP_ARGS(type, state, cpu_id)
- );
-
- TRACE_EVENT(power_end,
-
-- TP_PROTO(int dummy),
-+ TP_PROTO(unsigned int cpu_id),
-
-- TP_ARGS(dummy),
-+ TP_ARGS(cpu_id),
-
- TP_STRUCT__entry(
-- __field( u64, dummy )
-+ __field( u64, cpu_id )
- ),
-
- TP_fast_assign(
-- __entry->dummy = 0xffff;
-+ __entry->cpu_id = cpu_id;
- ),
-
-- TP_printk("dummy=%lu", (unsigned long)__entry->dummy)
-+ TP_printk("cpu_id=%lu", (unsigned long)__entry->cpu_id)
-
- );
-
-diff --git a/tools/perf/builtin-timechart.c b/tools/perf/builtin-timechart.c
-index 0d4d8ff..7809bef 100644
---- a/tools/perf/builtin-timechart.c
-+++ b/tools/perf/builtin-timechart.c
-@@ -306,8 +306,9 @@ struct trace_entry {
-
- struct power_entry {
- struct trace_entry te;
-- s64 type;
-- s64 value;
-+ u64 type;
-+ u64 value;
-+ u64 cpu_id;
- };
-
- #define TASK_COMM_LEN 16
-@@ -504,13 +505,13 @@ static int process_sample_event(event_t *event, struct perf_session *session)
- return 0;
-
- if (strcmp(event_str, "power:power_start") == 0)
-- c_state_start(data.cpu, data.time, pe->value);
-+ c_state_start(pe->cpu_id, data.time, pe->value);
-
- if (strcmp(event_str, "power:power_end") == 0)
-- c_state_end(data.cpu, data.time);
-+ c_state_end(pe->cpu_id, data.time);
-
- if (strcmp(event_str, "power:power_frequency") == 0)
-- p_state_change(data.cpu, data.time, pe->value);
-+ p_state_change(pe->cpu_id, data.time, pe->value);
-
- if (strcmp(event_str, "sched:sched_wakeup") == 0)
- sched_wakeup(data.cpu, data.time, data.pid, te);
---
-1.6.3
-
++++++ patches.xen.tar.bz2 ++++++
++++ 45576 lines of diff (skipped)
++++++ series.conf ++++++
--- /var/tmp/diff_new_pack.CXp4uP/_old 2010-09-07 15:27:49.000000000 +0200
+++ /var/tmp/diff_new_pack.CXp4uP/_new 2010-09-07 15:27:49.000000000 +0200
@@ -27,6 +27,9 @@
# DO NOT MODIFY THEM!
# Send separate patches upstream if you find a problem...
########################################################
+ patches.kernel.org/patch-2.6.36-rc1
+ patches.kernel.org/patch-2.6.36-rc1-rc2
+ patches.kernel.org/patch-2.6.36-rc2-rc3
########################################################
# Build fixes that apply to the vanilla kernel too.
@@ -35,10 +38,7 @@
########################################################
patches.rpmify/tioca-fix-assignment-from-incompatible-pointer-warnings
patches.rpmify/ia64-mca-fix-cast-from-integer-to-pointer-warning
-
- patches.rpmify/dmar-fix-section-mismatch
- patches.rpmify/ppc-crashdump-typefix
- patches.rpmify/powerpc-kvm-build-failure-workaround
+ patches.rpmify/spectra-depends-on-moorestown
########################################################
# kABI consistency patches
@@ -64,9 +64,8 @@
# kbuild/module infrastructure fixes
########################################################
patches.suse/supported-flag
- patches.suse/supported-flag-sysfs
patches.suse/supported-flag-enterprise
- patches.fixes/kbuild-fix-generating-of-.symtypes-files
++36 patches.fixes/kbuild-fix-generating-of-.symtypes-files
patches.suse/genksyms-add-override-flag.diff
patches.suse/kconfig-automate-kernel-desktop
@@ -90,17 +89,6 @@
patches.suse/hung_task_timeout-configurable-default
+needs_update-33 patches.suse/sched-revert-latency-defaults
- # writable limits
- patches.suse/rlim-0015-SECURITY-add-task_struct-to-setrlimit.patch
- patches.suse/rlim-0016-core-add-task_struct-to-update_rlimit_cpu.patch
- patches.suse/rlim-0017-sys_setrlimit-make-sure-rlim_max-never-grows.patch
- patches.suse/rlim-0018-core-split-sys_setrlimit.patch
- patches.suse/rlim-0019-core-allow-setrlimit-to-non-current-tasks.patch
- patches.suse/rlim-0020-core-optimize-setrlimit-for-current-task.patch
- patches.suse/rlim-0021-FS-proc-switch-limits-reading-to-fops.patch
- patches.suse/rlim-0022-FS-proc-make-limits-writable.patch
- patches.suse/rlim-0023-core-do-security-check-under-task_lock.patch
-
patches.fixes/make-note_interrupt-fast.diff
patches.fixes/twl6030-fix-note_interrupt-call
@@ -146,7 +134,6 @@
patches.arch/kvm-replace-kvm-io-delay-pv-ops-with-linux-magic
patches.suse/x86-mark_rodata_rw.patch
- patches.fixes/dmar-fix-oops-with-no-dmar-table
########################################################
# x86 MCE/MCA (Machine Check Error/Architecture) extensions
@@ -157,6 +144,7 @@
patches.arch/x86_mce_intel_decode_physical_address.patch
patches.arch/x86_mce_intel_decode_physical_address_rename_fix.patch
patches.arch/x86_mce_intel_decode_physical_address_compile_fix.patch
+ patches.arch/x86_mce_intel_decode_physical_fix_dynamic_debug.patch
########################################################
# x86_64/4096CPUS - from SGI
@@ -166,8 +154,6 @@
########################################################
# x86 UV patches from SGI
########################################################
- # bug 566745
- patches.arch/UV-Expose-irq_desc-node-in-proc.patch
########################################################
# x86_64/i386 depending on the UV patchset
@@ -176,13 +162,11 @@
########################################################
# powerpc/generic
########################################################
- patches.suse/of_platform_driver.module-owner.patch
patches.suse/led_classdev.sysfs-name.patch
patches.suse/radeon-monitor-jsxx-quirk.patch
patches.suse/8250-sysrq-ctrl_o.patch
- patches.suse/ppc-no-LDFLAGS_MODULE.patch
- patches.arch/ppc-vio-modalias.patch
++needs_update? patches.suse/ppc-no-LDFLAGS_MODULE.patch
patches.arch/ppc-pegasos-console-autodetection.patch
patches.suse/ppc-powerbook-usb-fn-key-default.patch
patches.drivers/ppc64-adb
@@ -191,8 +175,6 @@
patches.arch/ppc-prom-nodisplay.patch
patches.fixes/ptrace-getsiginfo
patches.arch/ppc-ipic-suspend-without-83xx-fix
- patches.arch/ppc-vmcoreinfo.diff
- patches.fixes/powerpc-fix-handling-of-strnlen-with-zero-len
########################################################
# PS3
@@ -213,7 +195,6 @@
# VM/FS patches
########################################################
patches.suse/unmap_vmas-lat
- patches.suse/silent-stack-overflow-2.patch
patches.fixes/oom-warning
patches.suse/shmall-bigger
patches.fixes/grab-swap-token-oops
@@ -228,7 +209,7 @@
patches.suse/mm-devzero-optimisation.patch
- patches.fixes/aggressive-zone-reclaim.patch
++36 patches.fixes/aggressive-zone-reclaim.patch
patches.suse/readahead-request-tunables.patch
########################################################
@@ -256,14 +237,16 @@
patches.arch/acpi_thinkpad_introduce_acpi_root_table_boot_param.patch
+trenn patches.suse/acpi-dsdt-initrd-v0.9a-2.6.25.patch
- patches.suse/add-initramfs-file_read_write
- patches.suse/init-move-populate_rootfs-back-to-start_kernel
- patches.suse/acpi-generic-initramfs-table-override-support
- patches.suse/acpi-don-t-preempt-until-the-system-is-up
++jeffm patches.suse/add-initramfs-file_read_write
++jeffm patches.suse/init-move-populate_rootfs-back-to-start_kernel
++jeffm patches.suse/acpi-generic-initramfs-table-override-support
++jeffm patches.suse/acpi-don-t-preempt-until-the-system-is-up
patches.arch/acpi_thermal_passive_blacklist.patch
patches.arch/acpi-export-hotplug_execute
+ patches.arch/acpi_fix_fadt_32_bit_zero_length.patch
+
+needs_update-32 patches.arch/acpi_ec_provide_non_interrupt_mode_boot_param.patch
# Adjust this patch for every new product (at least Enterprise
@@ -275,14 +258,6 @@
patches.arch/acpi_srat-pxm-rev-ia64.patch
patches.arch/acpi_srat-pxm-rev-x86-64.patch
- # HP WMI patches
- patches.fixes/hp-wmi_detect_keys.patch
- patches.fixes/hp_wmi_catch_unkown_event_key_codes.patch
- patches.fixes/hp_wmi_use_prefix_string.patch
- patches.fixes/hp_wmi_add_media_key.patch
-
- patches.fixes/acpi_processor_check_maxcpus.patch
-
########################################################
# CPUFREQ
########################################################
@@ -299,10 +274,6 @@
# patches.suse/cpuidle-documentation
patches.fixes/cpufreq_ondemand_performance_optimise_default_settings.patch
- patches.fixes/acpi-cpufreq_fix_cpu_any_notification.patch
- patches.arch/x86-cpu-add-amd-core-boosting-feature-flag-to-proc-cpuinfo
- patches.arch/powernow-k8-add-core-performance-boost-support
- patches.arch/x86-cpufreq-add-aperf-mperf-support-for-amd-processors
########################################################
# AGP, graphics related stuff
@@ -321,6 +292,8 @@
# Networking, IPv6
########################################################
patches.fixes/bridge-module-get-put.patch
+ patches.fixes/net-sched-fix-kernel-leak-in-act_police
+ patches.fixes/bonding-jiffies2.patch
########################################################
# NFS
@@ -331,7 +304,6 @@
patches.fixes/nfsd-06-sunrpc-cache-retry-cache-lookups-that-return-ETIMEDO.patch
patches.fixes/nfsd-07-nfsd-idmap-drop-special-request-deferal-in-favour-of.patch
patches.fixes/sunrpc-monotonic-expiry
- patches.fixes/nfs_wb_page_deadlock.fix
########################################################
# lockd + statd
@@ -340,7 +312,6 @@
########################################################
# cifs patches
########################################################
- patches.fixes/cifs-fix-oops-due-to-null-nameidata
########################################################
# ext2/ext3
@@ -352,54 +323,10 @@
########################################################
# ext4
########################################################
- patches.fixes/ext4-make-sure-the-move_ext-ioctl-can-t-overwrite-append-only-files
########################################################
# btrfs
########################################################
- patches.fixes/blkdev-generalize-flags-for-blkdev_issue_fn-functions
- patches.fixes/nilfs-fix-breakage-caused-by-barrier-flag-changes
- patches.fixes/btrfs-link-block-groups-of-different-raid-types
- patches.fixes/btrfs-kill-allocate_wait-in-space_info
- patches.fixes/btrfs-shrink-delay-allocated-space-in-a-synchronized
- patches.fixes/btrfs-kill-init_btrfs_i
- patches.fixes/btrfs-introduce-contexts-for-metadata-reservation
- patches.fixes/btrfs-integrate-metadata-reservation-with-start_transaction
- patches.fixes/btrfs-update-metadata-reservation-for-delayed-allocation
- patches.fixes/btrfs-introduce-global-metadata-reservation
- patches.fixes/btrfs-metadata-reservation-for-orphan-inodes
- patches.fixes/btrfs-metadata-enospc-handling-for-tree-log
- patches.fixes/btrfs-pre-allocate-space-for-data-relocation
- patches.fixes/btrfs-metadata-enospc-handling-for-balance
- patches.fixes/direct-io-add-a-hook-for-the-fs-to-provide-its-own-submit_bio-function
- patches.fixes/btrfs-add-basic-dio-read-write-support
- patches.fixes/btrfs-do-aio_write-instead-of-write
- patches.fixes/btrfs-don-t-walk-around-with-task-state-task_running
- patches.fixes/btrfs-use-async-helpers-for-dio-write-checksumming
- patches.fixes/btrfs-rework-o_direct-enospc-handling
- patches.fixes/btrfs-move-o_direct-space-reservation-to-btrfs_direct_io
- patches.fixes/btrfs-avoid-enospc-errors-in-btrfs_dirty_inode
- patches.fixes/btrfs-fix-preallocation-and-nodatacow-checks-in-o_direct
- patches.fixes/btrfs-fix-block-generation-verification-race
- patches.fixes/btrfs-drop-verbose-enospc-printk
- patches.fixes/btrfs-allow-unaligned-dio
- patches.fixes/btrfs-add-more-error-checking-to-btrfs_dirty_inode
- patches.fixes/btrfs-fix-loop-device-on-top-of-btrfs
- patches.fixes/btrfs-fix-fallocate-regression
- patches.fixes/btrfs-uninitialized-data-is-check_path_shared
- patches.fixes/btrfs-fix-remap_file_pages-error
- patches.fixes/btrfs-fix-null-dereference-in-relocation-c
- patches.fixes/btrfs-fix-bug_on-for-fs-converted-from-extn
- patches.fixes/btrfs-handle-error-returns-from-btrfs_lookup_dir_item
- patches.fixes/btrfs-handle-kzalloc-failure-in-open_ctree
- patches.fixes/btrfs-btrfs_iget-returns-err_ptr
- patches.fixes/btrfs-unwind-after-btrfs_start_transaction-errors
- patches.fixes/btrfs-btrfs_read_fs_root_no_name-returns-err_ptrs
- patches.fixes/btrfs-btrfs_lookup_dir_item-can-return-err_ptr
- patches.fixes/btrfs-should-add-a-permission-check-for-setfacl
- patches.fixes/btrfs-prohibit-a-operation-of-changing-acl-s-mask-when-noacl-mount-option-used
- patches.fixes/btrfs-avoid-bug-when-dropping-root-and-reference-in-same-transaction
- patches.fixes/btrfs-handle-err_ptr-from-posix_acl_from_xattr
########################################################
# Reiserfs Patches
@@ -415,32 +342,20 @@
# ocfs2
########################################################
- patches.suse/ocfs2-allocation-resrvations.patch
-
########################################################
# gfs2
########################################################
- patches.fixes/gfs2-fix-permissions-checking-for-setflags-ioctl
- patches.fixes/gfs2-fix-writing-to-non-page-aligned-gfs2_quota-structures
########################################################
# xfs
########################################################
- patches.suse/xfs-dmapi-src
- patches.suse/xfs-dmapi-enable
- patches.suse/xfs-dmapi-xfs-enable
- patches.suse/xfs-dmapi-re-add-flags-for-xfs_free_eofblocks
- patches.suse/xfs-nfsd-dmapi-aware
- patches.fixes/xfs-dmapi-fixes
- patches.fixes/xfs-export-debug
- patches.suse/xfs-dmapi-2-6-34-api-changes
- patches.suse/xfs-dmapi-fix-incompatible-pointer-type-warning
########################################################
# novfs
########################################################
patches.suse/novfs-client-module
patches.suse/novfs-fix-debug-message.patch
+ patches.suse/novfs-2.6.35-api-changes
patches.fixes/novfs-err_ptr-fix.diff
patches.fixes/novfs-fix-inode-uid
patches.fixes/novfs-incorrect-filesize-fix
@@ -449,6 +364,14 @@
patches.fixes/novfs-dentry-cache-limit.patch
patches.fixes/novfs-return-ENOTEMPTY-when-deleting-nonempty-dir
patches.fixes/novfs-LFS-initialization
+ patches.fixes/novfs-overflow-fixes
+ patches.fixes/novfs-bdi-init.diff
+ patches.fixes/novfs-xattr-memleak
+ patches.fixes/novfs-xattr-errcode-cleanup
+ patches.fixes/novfs-xattr-errcode-cleanup2
+ patches.fixes/novfs-lindent
+ patches.suse/novfs-fix-ioctl-usage
+ patches.suse/novfs-use-evict_inode
########################################################
# other filesystem stuff: richacls
@@ -511,11 +434,8 @@
# Netfilter
########################################################
- patches.suse/netfilter-ipt_LOG-mac
-
patches.suse/netfilter-ip_conntrack_slp.patch
patches.fixes/fix-nf_conntrack_slp
- patches.fixes/netfilter-remove-pointless-config_nf_ct_acct-warning
########################################################
#
@@ -530,9 +450,7 @@
########################################################
# libata
- patches.drivers/libata-add-waits-for-govault
patches.drivers/libata-unlock-hpa-by-default
- patches.drivers/libata-ata_generic-mcp89-mbp71
# Block layer fixes
patches.fixes/scsi-inquiry-too-short-ratelimit
@@ -548,7 +466,7 @@
patches.fixes/scsi-check-host-lookup-failure
patches.drivers/megaraid-mbox-fix-SG_IO
- patches.drivers/qla4xxx-5.01.00-k9-5.01.00.00.11.01-k10.patch
++needs_update-35 patches.drivers/qla4xxx-5.01.00-k9-5.01.00.00.11.01-k10.patch
# Remaining SCSI patches (garloff)
patches.suse/scsi-error-test-unit-ready-timeout
@@ -584,15 +502,15 @@
patches.drivers/tg3-entropy-source.patch
patches.drivers/tg3-5785-and-57780-asic-revs-not-working.patch
+ patches.fixes/irda-correctly-clean-up-self-ias_obj-on-irda_bind-failure
-+needs_update patches.drivers/e1000-enhance-frame-fragment-detection.patch
-+needs_update patches.drivers/e1000e-enhance-frame-fragment-detection.patch
########################################################
# Wireless Networking
########################################################
patches.suse/wireless-no-aes-select
patches.suse/b43-missing-firmware-info.patch
+ patches.fixes/iwlwifi-fix-tx-power-configuration-on-3945-and-4965-devices
########################################################
# iSCSI
@@ -601,13 +519,10 @@
########################################################
# PCI and PCI hotplug
########################################################
- patches.drivers/pci-disable-msi-on-K8M800
- patches.fixes/pci-hotplug-cpqphp-fix-crash.patch
########################################################
# sysfs / driver core
########################################################
- patches.drivers/driver-core-add-devname-module-aliases-to-allow-module-on-demand-auto-loading.patch
########################################################
# USB
@@ -626,6 +541,7 @@
patches.suse/bootsplash-scaler
patches.suse/bootsplash-console-fix
patches.drivers/elousb.patch
+ patches.suse/elousb-2.6.35-api-changes
patches.fixes/input-add-acer-aspire-5710-to-nomux.patch
patches.drivers/input-Add-LED-support-to-Synaptics-device
@@ -638,7 +554,6 @@
########################################################
patches.fixes/ieee1394-sbp2_long_sysfs_ieee1394_id.patch
patches.fixes/parport-mutex
- patches.drivers/hwmon-it87-fix-in7-on-IT8720F.patch
# suse-2.4 compatible crypto loop driver
patches.suse/twofish-2.6
@@ -661,6 +576,7 @@
patches.suse/dm-raid45-26-Nov-2009.patch
patches.suse/dmraid45-dm_dirty_log_create-api-fix
patches.suse/dmraid45-dm_get_device-takes-fewer-arguments
+ patches.suse/dm-raid45-api-update-remove-dm_put-after-dm_table_get_md
patches.fixes/dm-mpath-reattach-dh
patches.suse/dm-mpath-leastpending-path-update
patches.suse/dm-mpath-accept-failed-paths
@@ -689,48 +605,6 @@
##########################################################
# AppArmor
##########################################################
- patches.apparmor/apparmor-security-module
- patches.apparmor/apparmor-default-lsm
- patches.apparmor/apparmor-correct-mapping-of-file-permissions
- patches.apparmor/apparmor-turn-auditing-of-ptrace-on
- patches.apparmor/apparmor-fix-operator-precidence-issue-in-as_path_link
- patches.apparmor/apparmor-explicitly-include-header-files-to-allow-apparmor-to-build-on-powerpc
- patches.apparmor/apparmor-ensure-apparmor-enabled-parmater-is-off-if-apparmor-fails-to-initialize
- patches.apparmor/apparmor-fix-auditing-of-domain-transitions-to-include-target-profile-information
- patches.apparmor/apparmor-fix-c99-violation
- patches.apparmor/apparmor-fix-build-failure-on-ia64
- patches.apparmor/apparmor-revert-reporting-of-create-to-write-permission
- patches.apparmor/apparmor-fix-null-pointer-dereference-oops-in-profile-attachment
- patches.apparmor/apparmor-fix-argument-size-missmatch-on-64-bit-builds
- patches.apparmor/apparmor-fix-change_profile-failing-lpn401931
- patches.apparmor/apparmor-fix-determination-of-forced-audit-messages
- patches.apparmor/apparmor-fix-oops-in-auditing-of-the-policy-interface-offset
- patches.apparmor/apparmor-fix-profile-attachment-for-regexp-based-profile-names
- patches.apparmor/apparmor-return-the-correct-error-codes-on-profile-addition-removal
- patches.apparmor/apparmor-fix-oops-in-profile-listing-and-display-full-list
- patches.apparmor/apparmor-fix-mapping-of-pux-to-new-internal-permission-format
- patches.apparmor/apparmor-fix-change_profile-failure
- patches.apparmor/apparmor-fix-profile-namespace-removal
- patches.apparmor/apparmor-fix-oops-when-auditing-the-addition-of-profile-namespace
- patches.apparmor/apparmor-fix-mediation-of-created-paths-that-look-like-deleted-paths
- patches.apparmor/apparmor-fix-file-auditing-when-quiet-is-used
- patches.apparmor/apparmor-policy-load-and-replacement-can-fail-to-alloc-mem
- patches.apparmor/apparmor-fix-failure-to-audit-change_hat-correctly
-
- patches.apparmor/apparmor-allow-truncation-of-deleted-files
- patches.apparmor/apparmor-fix-oops-after-profile-removal
- patches.apparmor/apparmor-fix-oops-when-in-apparmor_bprm_set_creds
- patches.apparmor/apparmor-fix-cap-audit_caching-preemption-disabling
- patches.apparmor/apparmor-fix-refcounting-bug-causing-leak-of-creds-and-oops
- patches.apparmor/apparmor-fix-leak-when-profile-transition-table-fails-unpack
- patches.apparmor/apparmor-fully-close-race-condition-for-deleted-paths
-
- patches.apparmor/apparmor-missing-unlock
- patches.apparmor/ptrace_may_access-fix
- patches.apparmor/apparmor-fix-security_ops-task_setrlimit-api-use
- patches.apparmor/apparmor-check-for-network-in-interrupt-and-work-around
-
- patches.apparmor/apparmor-add-temporary-declaration-for-vfsmount_lock
########################################################
# Address space layout randomization
@@ -740,18 +614,18 @@
# KDB v4.4
########################################################
- patches.suse/kdb-common
- patches.suse/kdb-x86
- patches.suse/kdb-ia64
- patches.suse/kdb-build-fixes
- patches.suse/kdb-x86-build-fixes
- patches.suse/kdb-usb-rework
- patches.suse/kdb_fix_ia64_build.patch
- patches.suse/kdb_dont_touch_i8042_early.patch
- patches.suse/kdb-fix-assignment-from-incompatible-pointer-warnings
- patches.suse/kdb-handle-nonexistance-keyboard-controller
- patches.suse/kdb-fix-kdb_cmds-to-include-the-arch-common-macro
- patches.suse/kdb-vm-api-changes-for-2-6-34
+# patches.suse/kdb-common
+# patches.suse/kdb-x86
+# patches.suse/kdb-ia64
+# patches.suse/kdb-build-fixes
+# patches.suse/kdb-x86-build-fixes
+# patches.suse/kdb-usb-rework
+# patches.suse/kdb_fix_ia64_build.patch
+# patches.suse/kdb_dont_touch_i8042_early.patch
+# patches.suse/kdb-fix-assignment-from-incompatible-pointer-warnings
+# patches.suse/kdb-handle-nonexistance-keyboard-controller
+# patches.suse/kdb-fix-kdb_cmds-to-include-the-arch-common-macro
+# patches.suse/kdb-vm-api-changes-for-2-6-34
########################################################
# Other patches for debugging
@@ -759,6 +633,7 @@
patches.suse/crasher-26.diff
patches.suse/stack-unwind
patches.suse/no-frame-pointer-select
+ patches.arch/i386-unwind-annotations
patches.arch/x86_64-unwind-annotations
########################################################
@@ -784,9 +659,6 @@
patches.trace/utrace-core
- patches.trace/x86_cpufreq_make_trace_power_frequency_cpufreq_driver_independent.patch
-
-+needs_update-32 patches.fixes/nfs-write.c-bug-removal.patch
patches.fixes/ia64-configure-HAVE_UNSTABLE_SCHED_CLOCK-for-SGI_SN.patch
########################################################
@@ -807,7 +679,6 @@
# moblin to try to speed up the boot process
########################################################
patches.suse/linux-2.6.29-dont-wait-for-mouse.patch
- patches.suse/linux-2.6.29-enable-async-by-default.patch
- patches.suse/linux-2.6.29-even-faster-kms.patch
patches.suse/linux-2.6.29-silence-acer-message.patch
patches.suse/linux-2.6.29-kms-after-sata.patch
@@ -894,17 +765,19 @@
patches.xen/xen3-patch-2.6.32
patches.xen/xen3-patch-2.6.33
patches.xen/xen3-patch-2.6.34
+ patches.xen/xen3-patch-2.6.35
+ patches.xen/xen3-patch-2.6.36-rc3
patches.xen/xen3-seccomp-disable-tsc-option
patches.xen/xen3-x86-mcp51-no-dac
patches.xen/xen3-x86-mark_rodata_rw.patch
patches.xen/xen3-acpi_processor_check_maxcpus.patch
- patches.xen/xen3-driver-core-add-devname-module-aliases-to-allow-module-on-demand-auto-loading.patch
- patches.xen/xen3-kdb-x86
+# patches.xen/xen3-kdb-x86
patches.xen/xen3-stack-unwind
+ patches.xen/xen3-i386-unwind-annotations
patches.xen/xen3-x86_64-unwind-annotations
- patches.xen/xen3-x86_cpufreq_make_trace_power_frequency_cpufreq_driver_independent.patch
# bugfixes and enhancements
+ patches.xen/xen-device-names
patches.xen/xen-balloon-max-target
patches.xen/xen-modular-blktap
patches.xen/xen-blkback-bimodal-suse
@@ -929,11 +802,14 @@
patches.xen/xen-netback-generalize
patches.xen/xen-netback-multiple-tasklets
patches.xen/xen-netback-kernel-threads
+ patches.xen/xen-netback-extend-pull
+ patches.xen/xen-netback-allow-large-mtu
patches.xen/xen-netfront-ethtool
patches.xen/xen-dcdbas
patches.xen/xen-floppy
patches.xen/xen-kzalloc
patches.xen/xen-unpriv-build
+ patches.xen/xen-setup-gsi
patches.xen/xen-x86-panic-no-reboot
patches.xen/xen-x86-dcr-fallback
patches.xen/xen-x86-consistent-nmi
++++++ source-timestamp ++++++
--- /var/tmp/diff_new_pack.CXp4uP/_old 2010-09-07 15:27:49.000000000 +0200
+++ /var/tmp/diff_new_pack.CXp4uP/_new 2010-09-07 15:27:49.000000000 +0200
@@ -1,3 +1,3 @@
-2010-06-29 02:39:08 +0200
-GIT Revision: 7a744773dd7c2539b7757435d0108cb701dd0165
-GIT Branch: openSUSE-11.3
+2010-09-03 18:57:13 +0200
+GIT Revision: d9bfa1ecca24ec81ab846933e63ff35170e49370
+GIT Branch: master
++++++ supported.conf ++++++
--- /var/tmp/diff_new_pack.CXp4uP/_old 2010-09-07 15:27:49.000000000 +0200
+++ /var/tmp/diff_new_pack.CXp4uP/_new 2010-09-07 15:27:49.000000000 +0200
@@ -158,6 +158,7 @@
kernel/drivers/acpi/video
kernel/drivers/acpi/wmi
+base kernel/drivers/ata/ahci
++base kernel/drivers/ata/libahci
kernel/drivers/ata/ata_generic
+base kernel/drivers/ata/ata_piix # SCSI low-level driver for Intel PIIX/ICH ATA controllers
+base kernel/drivers/ata/libata # Library module for ATA devices
@@ -1587,11 +1588,13 @@
kernel/drivers/pci/hotplug/pci_hotplug # PCI Hot Plug PCI Core
kernel/drivers/pci/hotplug/sgi_hotplug # SGI's PCI Hotplug controller Driver
kernel/drivers/pci/hotplug/shpchp # Standard Hot Plug PCI Controller Driver
+ kernel/drivers/pci/pci-iomul # PCI I/O port multiplexer interface
kernel/drivers/pci/pcie/aer/aer_inject # fate #306815
kernel/drivers/pcmcia/i82092
+isa kernel/drivers/pcmcia/i82365
kernel/drivers/pcmcia/pcmcia
kernel/drivers/pcmcia/pcmcia_core # Linux Kernel Card Services
+ kernel/drivers/pcmcia/pcmcia_rsrc
kernel/drivers/pcmcia/pd6729 # Driver for the Cirrus PD6729 PCI-PCMCIA bridge
kernel/drivers/pcmcia/rsrc_nonstatic
kernel/drivers/pcmcia/tcic # Databook TCIC-2 PCMCIA socket driver
@@ -1715,6 +1718,7 @@
- kernel/drivers/scsi/initio # INITIO 9100
+external kernel/drivers/scsi/ipr # IBM pSeries storage driver
kernel/drivers/scsi/ips
+ kernel/drivers/scsi/iscsi_boot_sysfs
kernel/drivers/scsi/iscsi_tcp # open-iscsi client
kernel/drivers/scsi/libfc/libfc # Library module for FC devices
kernel/drivers/scsi/libiscsi # open-iscsi library
@@ -1898,6 +1902,7 @@
kernel/drivers/usb/serial/symbolserial
kernel/drivers/usb/serial/ti_usb_3410_5052
kernel/drivers/usb/serial/usb_debug
+ kernel/drivers/usb/serial/usb_wwan
kernel/drivers/usb/serial/usbserial # USB Serial Driver core
kernel/drivers/usb/serial/visor # USB HandSpring Visor / Palm OS driver
kernel/drivers/usb/serial/whiteheat # USB ConnectTech WhiteHEAT driver
@@ -2707,5 +2712,6 @@
kernel/sound/usb/caiaq/snd-usb-caiaq # Native Instruments USB audio
kernel/sound/usb/snd-usb-audio # USB Audio
kernel/sound/usb/snd-usb-lib # USB Audio/MIDI helper module
+ kernel/sound/usb/snd-usbmidi-lib
kernel/sound/usb/usx2y/snd-usb-usx2y # TASCAM US-X2Y Version 0.7.2
- kernel/sound/usb/usx2y/snd-usb-us122l
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org