Hello community, here is the log from the commit of package kernel-source for openSUSE:Factory checked in at Fri Jul 8 09:32:26 CEST 2011.
-------- --- kernel-source/kernel-debug.changes 2011-06-30 07:03:47.000000000 +0200 +++ /mounts/work_src_done/STABLE/kernel-source/kernel-debug.changes 2011-07-07 17:26:27.000000000 +0200 @@ -1,0 +2,25 @@ +Thu Jul 7 00:58:01 CEST 2011 - [email protected] + +- Update to 3.0-rc6. + - Eliminated 1 patch. +- commit 56e99da + +------------------------------------------------------------------- +Tue Jul 5 09:18:43 CEST 2011 - [email protected] + +- Update Xen patches to 3.0-rc5 and c/s 1095. +- xen: prepare tmem shim to handle frontswap. +- support booting Xen from EFI (fate#311376, fate#311529, + bnc#578927, bnc#628554). +- config.conf: Re-enabled Xen flavors. +- Update x86 config files. +- Delete patches.xen/xen-blkback-bimodal-suse. +- commit 4c2a76f + +------------------------------------------------------------------- +Mon Jul 4 12:07:08 CEST 2011 - [email protected] + +- Fix invalid colormap override in SUSE-bootsplash patch (bnc#584493) +- commit ac30089 + +------------------------------------------------------------------- kernel-default.changes: same change kernel-desktop.changes: same change kernel-docs.changes: same change New Changes file: --- /dev/null 2010-08-26 16:28:41.000000000 +0200 +++ /mounts/work_src_done/STABLE/kernel-source/kernel-ec2.changes 2011-07-07 17:26:30.000000000 +0200 @@ -0,0 +1,23708 @@ +------------------------------------------------------------------- +Thu Jul 7 00:58:01 CEST 2011 - [email protected] + +- Update to 3.0-rc6. + - Eliminated 1 patch. +- commit 56e99da + +------------------------------------------------------------------- +Tue Jul 5 09:18:43 CEST 2011 - [email protected] + +- Update Xen patches to 3.0-rc5 and c/s 1095. +- xen: prepare tmem shim to handle frontswap. +- support booting Xen from EFI (fate#311376, fate#311529, + bnc#578927, bnc#628554). +- config.conf: Re-enabled Xen flavors. +- Update x86 config files. +- Delete patches.xen/xen-blkback-bimodal-suse. +- commit 4c2a76f + +------------------------------------------------------------------- +Mon Jul 4 12:07:08 CEST 2011 - [email protected] + +- Fix invalid colormap override in SUSE-bootsplash patch (bnc#584493) +- commit ac30089 + +------------------------------------------------------------------- +Wed Jun 29 15:12:07 CEST 2011 - [email protected] + +- Update to 3.0-rc5. +- commit 9eb1a0f + +------------------------------------------------------------------- +Wed Jun 29 14:46:33 CEST 2011 - [email protected] + +- TTY: ldisc, do not close until there are readers (bnc#698247 + bnc#693374). +- commit b3afb1a + +------------------------------------------------------------------- +Fri Jun 24 01:30:11 CEST 2011 - [email protected] + +- Enable TOMOYO (FATE#310292, bnc#668381). +- commit 997e757 + +------------------------------------------------------------------- +Tue Jun 21 14:06:48 CEST 2011 - [email protected] + +- Update vanilla configs. +- commit 1738011 + +------------------------------------------------------------------- +Tue Jun 21 12:14:44 CEST 2011 - [email protected] + +- Update to 3.0-rc4 +- commit 1b6bf5d + +------------------------------------------------------------------- +Fri Jun 17 17:29:41 CEST 2011 - [email protected] + +- rpm/post.sh: Touch /boot/do_purge_kernels on package install + (fate#312018). +- rpm/postun.sh: Remove it again if it still exists on package + uninstall. +- commit 82f4a5d + +------------------------------------------------------------------- +Fri Jun 17 13:23:54 CEST 2011 - [email protected] + +- stop_machine: implement stop_machine_from_offline_cpu() + (bnc#697859). +- stop_machine: kill __stop_machine() (bnc#697859). +- x86, mtrr: lock stop machine during MTRR rendezvous sequence + (bnc#697859). +- stop_machine: reorganize stop_cpus() implementation + (bnc#697859). +- x86, mtrr: use __stop_machine() for doing MTRR rendezvous + (bnc#697859). +- commit aa3d6e2 + +------------------------------------------------------------------- +Thu Jun 16 12:16:16 CEST 2011 - [email protected] + +- Remove the novfs patches, it should be packaged as a KMP, or + ideally, reimplemented as a fuse filesystem (which is the reason why + the current implementation it is never going to be accepted upstream). +- Delete patches.fixes/novfs-copy_user-fixes.diff. +- Delete patches.fixes/novfs-minsize-fixes. +- Delete patches.fixes/novfs-nwcapi.patch. +- Delete patches.suse/novfs-client-module. +- Delete patches.suse/novfs-remove-bkl. +- commit bc3a79d + +------------------------------------------------------------------- +Thu Jun 16 12:04:56 CEST 2011 - [email protected] + +- Update vanilla config files. +- commit a642909 + +------------------------------------------------------------------- +Thu Jun 16 11:50:58 CEST 2011 - [email protected] + +- rpm/kernel-binary.spec.in: + jobs is not defined for home: projects, use the new _smp_mflags to enable parallel build +- rpm/kernel-binary.spec.in: + jobs is not defined for home: projects, use the new _smp_mflags to enable parallel build +- commit 1009eaf + +------------------------------------------------------------------- +Thu Jun 16 11:27:44 CEST 2011 - [email protected] + +- rpm/kernel-binary.spec.in: + Update comment, get the number of cpus from /proc/stat +- rpm/kernel-binary.spec.in: + Update comment, get the number of cpus from /proc/stat +- commit b4cf18c + +------------------------------------------------------------------- +Wed Jun 15 20:40:28 CEST 2011 - [email protected] + +- Update config files: Disable BRCMSMAC on ppc/ppc64. +- commit 20b3d8e + +------------------------------------------------------------------- +Wed Jun 15 18:33:50 CEST 2011 - [email protected] + +- "Unable to save Login Script" appears when trying to save a + user login script (bnc#638985). +- commit 7c243a4 + +------------------------------------------------------------------- +Wed Jun 15 18:22:05 CEST 2011 - [email protected] + +- fs: novfs: Limit check for datacopy between user and kernel space. +- commit 5fbc5ed + +------------------------------------------------------------------- +Wed Jun 15 08:05:05 CEST 2011 - [email protected] + +- Update to 3.0-rc3. + - Eliminated 2 patches. +- commit a1fe999 + +------------------------------------------------------------------- +Tue Jun 14 17:13:47 CEST 2011 - [email protected] + +- scripts/config.sh: Remove MIRROR handling, _find_tarball() does it + itself. +- commit 18ad47f + +------------------------------------------------------------------- +Mon Jun 13 21:52:37 CEST 2011 - [email protected] + +- nouveau: Make vga_switcheroo code depend on VGA_SWITCHEROO. +- commit b3f32a6 + +------------------------------------------------------------------- +Mon Jun 13 17:29:32 CEST 2011 - [email protected] + +- apm: Honor CONFIG_APM_CPU_IDLE=n. +- commit 8ad9b51 + +------------------------------------------------------------------- +Mon Jun 13 17:18:17 CEST 2011 - [email protected] + +- Update config files. +- commit 2cd7359 + +------------------------------------------------------------------- +Mon Jun 13 17:15:33 CEST 2011 - [email protected] + +- Delete patches.rpmify/qla4xx-missing-readq-definition. +- commit b48337d + +------------------------------------------------------------------- +Mon Jun 13 16:58:50 CEST 2011 - [email protected] + +- Remove copypasted lines from vanilla configs. +- commit b395e52 + +------------------------------------------------------------------- +Mon Jun 13 16:27:20 CEST 2011 - [email protected] + +- rpm/kernel-binary.spec.in: Call gzip with -n. +- commit 9a65e48 + +------------------------------------------------------------------- +Mon Jun 13 16:00:19 CEST 2011 - [email protected] + +- rpm/mkspec: Put the -rcX tag into the rpm version instead of the + trailing zero. Rpm considers "rc" older than "0", so this will sort + properly. +- commit 8d9b2b9 + +------------------------------------------------------------------- +Mon Jun 13 14:41:50 CEST 2011 - [email protected] + +- x86, build: Do not set the root_dev field in bzImage. ++++ 23511 more lines (skipped) ++++ between /dev/null ++++ and /mounts/work_src_done/STABLE/kernel-source/kernel-ec2.changes --- kernel-source/kernel-pae.changes 2011-06-30 07:03:54.000000000 +0200 +++ /mounts/work_src_done/STABLE/kernel-source/kernel-pae.changes 2011-07-07 17:26:30.000000000 +0200 @@ -1,0 +2,25 @@ +Thu Jul 7 00:58:01 CEST 2011 - [email protected] + +- Update to 3.0-rc6. + - Eliminated 1 patch. +- commit 56e99da + +------------------------------------------------------------------- +Tue Jul 5 09:18:43 CEST 2011 - [email protected] + +- Update Xen patches to 3.0-rc5 and c/s 1095. +- xen: prepare tmem shim to handle frontswap. +- support booting Xen from EFI (fate#311376, fate#311529, + bnc#578927, bnc#628554). +- config.conf: Re-enabled Xen flavors. +- Update x86 config files. +- Delete patches.xen/xen-blkback-bimodal-suse. +- commit 4c2a76f + +------------------------------------------------------------------- +Mon Jul 4 12:07:08 CEST 2011 - [email protected] + +- Fix invalid colormap override in SUSE-bootsplash patch (bnc#584493) +- commit ac30089 + +------------------------------------------------------------------- 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 New Changes file: --- /dev/null 2010-08-26 16:28:41.000000000 +0200 +++ /mounts/work_src_done/STABLE/kernel-source/kernel-xen.changes 2011-07-07 17:26:35.000000000 +0200 @@ -0,0 +1,23708 @@ +------------------------------------------------------------------- +Thu Jul 7 00:58:01 CEST 2011 - [email protected] + +- Update to 3.0-rc6. + - Eliminated 1 patch. +- commit 56e99da + +------------------------------------------------------------------- +Tue Jul 5 09:18:43 CEST 2011 - [email protected] + +- Update Xen patches to 3.0-rc5 and c/s 1095. +- xen: prepare tmem shim to handle frontswap. +- support booting Xen from EFI (fate#311376, fate#311529, + bnc#578927, bnc#628554). +- config.conf: Re-enabled Xen flavors. +- Update x86 config files. +- Delete patches.xen/xen-blkback-bimodal-suse. +- commit 4c2a76f + +------------------------------------------------------------------- +Mon Jul 4 12:07:08 CEST 2011 - [email protected] + +- Fix invalid colormap override in SUSE-bootsplash patch (bnc#584493) +- commit ac30089 + +------------------------------------------------------------------- +Wed Jun 29 15:12:07 CEST 2011 - [email protected] + +- Update to 3.0-rc5. +- commit 9eb1a0f + +------------------------------------------------------------------- +Wed Jun 29 14:46:33 CEST 2011 - [email protected] + +- TTY: ldisc, do not close until there are readers (bnc#698247 + bnc#693374). +- commit b3afb1a + +------------------------------------------------------------------- +Fri Jun 24 01:30:11 CEST 2011 - [email protected] + +- Enable TOMOYO (FATE#310292, bnc#668381). +- commit 997e757 + +------------------------------------------------------------------- +Tue Jun 21 14:06:48 CEST 2011 - [email protected] + +- Update vanilla configs. +- commit 1738011 + +------------------------------------------------------------------- +Tue Jun 21 12:14:44 CEST 2011 - [email protected] + +- Update to 3.0-rc4 +- commit 1b6bf5d + +------------------------------------------------------------------- +Fri Jun 17 17:29:41 CEST 2011 - [email protected] + +- rpm/post.sh: Touch /boot/do_purge_kernels on package install + (fate#312018). +- rpm/postun.sh: Remove it again if it still exists on package + uninstall. +- commit 82f4a5d + +------------------------------------------------------------------- +Fri Jun 17 13:23:54 CEST 2011 - [email protected] + +- stop_machine: implement stop_machine_from_offline_cpu() + (bnc#697859). +- stop_machine: kill __stop_machine() (bnc#697859). +- x86, mtrr: lock stop machine during MTRR rendezvous sequence + (bnc#697859). +- stop_machine: reorganize stop_cpus() implementation + (bnc#697859). +- x86, mtrr: use __stop_machine() for doing MTRR rendezvous + (bnc#697859). +- commit aa3d6e2 + +------------------------------------------------------------------- +Thu Jun 16 12:16:16 CEST 2011 - [email protected] + +- Remove the novfs patches, it should be packaged as a KMP, or + ideally, reimplemented as a fuse filesystem (which is the reason why + the current implementation it is never going to be accepted upstream). +- Delete patches.fixes/novfs-copy_user-fixes.diff. +- Delete patches.fixes/novfs-minsize-fixes. +- Delete patches.fixes/novfs-nwcapi.patch. +- Delete patches.suse/novfs-client-module. +- Delete patches.suse/novfs-remove-bkl. +- commit bc3a79d + +------------------------------------------------------------------- +Thu Jun 16 12:04:56 CEST 2011 - [email protected] + +- Update vanilla config files. +- commit a642909 + +------------------------------------------------------------------- +Thu Jun 16 11:50:58 CEST 2011 - [email protected] + +- rpm/kernel-binary.spec.in: + jobs is not defined for home: projects, use the new _smp_mflags to enable parallel build +- rpm/kernel-binary.spec.in: + jobs is not defined for home: projects, use the new _smp_mflags to enable parallel build +- commit 1009eaf + +------------------------------------------------------------------- +Thu Jun 16 11:27:44 CEST 2011 - [email protected] + +- rpm/kernel-binary.spec.in: + Update comment, get the number of cpus from /proc/stat +- rpm/kernel-binary.spec.in: + Update comment, get the number of cpus from /proc/stat +- commit b4cf18c + +------------------------------------------------------------------- +Wed Jun 15 20:40:28 CEST 2011 - [email protected] + +- Update config files: Disable BRCMSMAC on ppc/ppc64. +- commit 20b3d8e + +------------------------------------------------------------------- +Wed Jun 15 18:33:50 CEST 2011 - [email protected] + +- "Unable to save Login Script" appears when trying to save a + user login script (bnc#638985). +- commit 7c243a4 + +------------------------------------------------------------------- +Wed Jun 15 18:22:05 CEST 2011 - [email protected] + +- fs: novfs: Limit check for datacopy between user and kernel space. +- commit 5fbc5ed + +------------------------------------------------------------------- +Wed Jun 15 08:05:05 CEST 2011 - [email protected] + +- Update to 3.0-rc3. + - Eliminated 2 patches. +- commit a1fe999 + +------------------------------------------------------------------- +Tue Jun 14 17:13:47 CEST 2011 - [email protected] + +- scripts/config.sh: Remove MIRROR handling, _find_tarball() does it + itself. +- commit 18ad47f + +------------------------------------------------------------------- +Mon Jun 13 21:52:37 CEST 2011 - [email protected] + +- nouveau: Make vga_switcheroo code depend on VGA_SWITCHEROO. +- commit b3f32a6 + +------------------------------------------------------------------- +Mon Jun 13 17:29:32 CEST 2011 - [email protected] + +- apm: Honor CONFIG_APM_CPU_IDLE=n. +- commit 8ad9b51 + +------------------------------------------------------------------- +Mon Jun 13 17:18:17 CEST 2011 - [email protected] + +- Update config files. +- commit 2cd7359 + +------------------------------------------------------------------- +Mon Jun 13 17:15:33 CEST 2011 - [email protected] + +- Delete patches.rpmify/qla4xx-missing-readq-definition. +- commit b48337d + +------------------------------------------------------------------- +Mon Jun 13 16:58:50 CEST 2011 - [email protected] + +- Remove copypasted lines from vanilla configs. +- commit b395e52 + +------------------------------------------------------------------- +Mon Jun 13 16:27:20 CEST 2011 - [email protected] + +- rpm/kernel-binary.spec.in: Call gzip with -n. +- commit 9a65e48 + +------------------------------------------------------------------- +Mon Jun 13 16:00:19 CEST 2011 - [email protected] + +- rpm/mkspec: Put the -rcX tag into the rpm version instead of the + trailing zero. Rpm considers "rc" older than "0", so this will sort + properly. +- commit 8d9b2b9 + +------------------------------------------------------------------- +Mon Jun 13 14:41:50 CEST 2011 - [email protected] + +- x86, build: Do not set the root_dev field in bzImage. ++++ 23511 more lines (skipped) ++++ between /dev/null ++++ and /mounts/work_src_done/STABLE/kernel-source/kernel-xen.changes calling whatdependson for head-i586 Old: ---- linux-3.0-rc5.tar.bz2 New: ---- kernel-ec2.changes kernel-ec2.spec kernel-xen.changes kernel-xen.spec linux-3.0-rc6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kernel-debug.spec ++++++ --- /var/tmp/diff_new_pack.Ndb0mQ/_old 2011-07-08 09:28:09.000000000 +0200 +++ /var/tmp/diff_new_pack.Ndb0mQ/_new 2011-07-08 09:28:09.000000000 +0200 @@ -17,8 +17,8 @@ # norootforbuild -%define srcversion 3.0-rc5 -%define patchversion 3.0.0-rc5 +%define srcversion 3.0-rc6 +%define patchversion 3.0.0-rc6 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -55,7 +55,7 @@ Name: kernel-debug Summary: A Debug Version of the Kernel -Version: 3.0.rc5 +Version: 3.0.rc6 Release: 1 %if %using_buildservice %else kernel-default.spec: same change kernel-desktop.spec: same change ++++++ kernel-docs.spec ++++++ --- /var/tmp/diff_new_pack.Ndb0mQ/_old 2011-07-08 09:28:09.000000000 +0200 +++ /var/tmp/diff_new_pack.Ndb0mQ/_new 2011-07-08 09:28:09.000000000 +0200 @@ -17,14 +17,14 @@ # norootforbuild -%define patchversion 3.0.0-rc5 +%define patchversion 3.0.0-rc6 %define variant %{nil} %include %_sourcedir/kernel-spec-macros Name: kernel-docs Summary: Kernel Documentation -Version: 3.0.rc5 +Version: 3.0.rc6 Release: 1 %if %using_buildservice %else ++++++ kernel-ec2.spec ++++++ ++++ 892 lines (skipped) ++++++ kernel-pae.spec ++++++ --- /var/tmp/diff_new_pack.Ndb0mQ/_old 2011-07-08 09:28:09.000000000 +0200 +++ /var/tmp/diff_new_pack.Ndb0mQ/_new 2011-07-08 09:28:09.000000000 +0200 @@ -17,8 +17,8 @@ # norootforbuild -%define srcversion 3.0-rc5 -%define patchversion 3.0.0-rc5 +%define srcversion 3.0-rc6 +%define patchversion 3.0.0-rc6 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -55,7 +55,7 @@ Name: kernel-pae Summary: Kernel with PAE Support -Version: 3.0.rc5 +Version: 3.0.rc6 Release: 1 %if %using_buildservice %else kernel-ppc64.spec: same change kernel-ps3.spec: same change kernel-s390.spec: same change ++++++ kernel-source.spec ++++++ --- /var/tmp/diff_new_pack.Ndb0mQ/_old 2011-07-08 09:28:09.000000000 +0200 +++ /var/tmp/diff_new_pack.Ndb0mQ/_new 2011-07-08 09:28:09.000000000 +0200 @@ -18,8 +18,8 @@ # norootforbuild # icecream 0 -%define srcversion 3.0-rc5 -%define patchversion 3.0.0-rc5 +%define srcversion 3.0-rc6 +%define patchversion 3.0.0-rc6 %define variant %{nil} %define vanilla_only 0 @@ -29,7 +29,7 @@ Name: kernel-source Summary: The Linux Kernel Sources -Version: 3.0.rc5 +Version: 3.0.rc6 Release: 1 %if %using_buildservice %else ++++++ kernel-syms.spec ++++++ --- /var/tmp/diff_new_pack.Ndb0mQ/_old 2011-07-08 09:28:09.000000000 +0200 +++ /var/tmp/diff_new_pack.Ndb0mQ/_new 2011-07-08 09:28:09.000000000 +0200 @@ -23,7 +23,7 @@ Name: kernel-syms Summary: Kernel Symbol Versions (modversions) -Version: 3.0.rc5 +Version: 3.0.rc6 Release: 1 %if %using_buildservice %else @@ -49,6 +49,9 @@ %ifarch s390 Requires: kernel-s390-devel = %version-%source_rel %endif +%ifarch %ix86 x86_64 +Requires: kernel-xen-devel = %version-%source_rel +%endif Provides: multiversion(kernel) Provides: %name = %version-%source_rel Source: README.KSYMS ++++++ kernel-trace.spec ++++++ --- /var/tmp/diff_new_pack.Ndb0mQ/_old 2011-07-08 09:28:09.000000000 +0200 +++ /var/tmp/diff_new_pack.Ndb0mQ/_new 2011-07-08 09:28:09.000000000 +0200 @@ -17,8 +17,8 @@ # norootforbuild -%define srcversion 3.0-rc5 -%define patchversion 3.0.0-rc5 +%define srcversion 3.0-rc6 +%define patchversion 3.0.0-rc6 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -55,7 +55,7 @@ Name: kernel-trace Summary: The Standard Kernel with Tracing Features -Version: 3.0.rc5 +Version: 3.0.rc6 Release: 1 %if %using_buildservice %else kernel-vanilla.spec: same change ++++++ kernel-xen.spec ++++++ ++++ 892 lines (skipped) ++++++ config.conf ++++++ --- /var/tmp/diff_new_pack.Ndb0mQ/_old 2011-07-08 09:28:09.000000000 +0200 +++ /var/tmp/diff_new_pack.Ndb0mQ/_new 2011-07-08 09:28:09.000000000 +0200 @@ -12,8 +12,8 @@ +i386 i386/desktop +i386 i386/pae +i386 -syms i386/debug -#+i386 i386/xen -#+i386 -syms i386/ec2 ++i386 i386/xen ++i386 -syms i386/ec2 +i386 i386/vanilla +i386 -syms i386/trace @@ -24,8 +24,8 @@ +x86_64 x86_64/default +x86_64 x86_64/desktop -#+x86_64 x86_64/xen -#+x86_64 -syms x86_64/ec2 ++x86_64 x86_64/xen ++x86_64 -syms x86_64/ec2 +x86_64 -syms x86_64/debug +x86_64 x86_64/vanilla +x86_64 -syms x86_64/trace ++++++ config.sh ++++++ --- /var/tmp/diff_new_pack.Ndb0mQ/_old 2011-07-08 09:28:09.000000000 +0200 +++ /var/tmp/diff_new_pack.Ndb0mQ/_new 2011-07-08 09:28:09.000000000 +0200 @@ -1,5 +1,5 @@ # The version of the main tarball to use -SRCVERSION=3.0-rc5 +SRCVERSION=3.0-rc6 # variant of the kernel-source package, either empty or "-rt" VARIANT= # buildservice projects to build the kernel against ++++++ config.tar.bz2 ++++++ ++++ 15993 lines of diff (skipped) ++++++ linux-3.0-rc5.tar.bz2 -> linux-3.0-rc6.tar.bz2 ++++++ kernel-source/linux-3.0-rc5.tar.bz2 /mounts/work_src_done/STABLE/kernel-source/linux-3.0-rc6.tar.bz2 differ: char 11, line 1 ++++++ minmem ++++++ --- /var/tmp/diff_new_pack.Ndb0mQ/_old 2011-07-08 09:28:10.000000000 +0200 +++ /var/tmp/diff_new_pack.Ndb0mQ/_new 2011-07-08 09:28:10.000000000 +0200 @@ -1 +1 @@ -2096000 +1048576 ++++++ needed_space_in_mb ++++++ --- /var/tmp/diff_new_pack.Ndb0mQ/_old 2011-07-08 09:28:10.000000000 +0200 +++ /var/tmp/diff_new_pack.Ndb0mQ/_new 2011-07-08 09:28:10.000000000 +0200 @@ -1 +1 @@ -6000 +6144 ++++++ patches.fixes.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/tty-ldisc-do-not-close-until-there-are-readers.patch new/patches.fixes/tty-ldisc-do-not-close-until-there-are-readers.patch --- old/patches.fixes/tty-ldisc-do-not-close-until-there-are-readers.patch 2011-06-29 14:46:33.000000000 +0200 +++ new/patches.fixes/tty-ldisc-do-not-close-until-there-are-readers.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,104 +0,0 @@ -From 92f6fa09bd453ffe3351fa1f1377a1b7cfa911e6 Mon Sep 17 00:00:00 2001 -From: Jiri Slaby <[email protected]> -Date: Sun, 5 Jun 2011 14:16:16 +0200 -Subject: TTY: ldisc, do not close until there are readers -Git-commit: 92f6fa09bd453ffe3351fa1f1377a1b7cfa911e6 -Patch-mainline: 3.0-rc6 -References: bnc#698247 bnc#693374 - -We restored tty_ldisc_wait_idle in 100eeae2c5c (TTY: restore -tty_ldisc_wait_idle). We used it in the ldisc changing path to fix the -case where there are tasks in n_tty_read waiting for data and somebody -tries to change ldisc. - -Similar to the case above, there may be also tasks waiting in -n_tty_read while hangup is performed. As 65b770468e98 (tty-ldisc: turn -ldisc user count into a proper refcount) removed the wait-until-idle -from all paths, hangup path won't wait for them to disappear either -now. So add it back even to the hangup path. - -There is a difference, we need uninterruptible sleep as there is -obviously HUP signal pending. So tty_ldisc_wait_idle now sleeps -without possibility to be interrupted. This is what original -tty_ldisc_wait_idle did. After the wait idle reintroduction -(100eeae2c5c), we have had interruptible sleeps for the ldisc changing -path. But as there is a 5s timeout anyway, we don't allow it to be -interrupted from now on. It's not worth the added complexity of -deciding what kind of sleep we want. - -Before 65b770468e98 tty_ldisc_release was called also from -tty_ldisc_release. It is called from tty_release, so I don't think we -need to restore that one. - -This is nicely reproducible after constifying the timing when -drivers/tty/n_tty.c is patched as follows ("TTY: ntty, add one more -sanity check" patch is needed to actually see it explode): -%% -1548,6 +1549,7 @@ static int n_tty_open(struct tty_struct *tty) - - /* These are ugly. Currently a malloc failure here can panic */ - if (!tty->read_buf) { -+ msleep(100); - tty->read_buf = kzalloc(N_TTY_BUF_SIZE, GFP_KERNEL); - if (!tty->read_buf) - return -ENOMEM; -%% -1785,6 +1788,7 @@ do_it_again: - break; - } - timeout = schedule_timeout(timeout); -+ msleep(20); - continue; - } - __set_current_state(TASK_RUNNING); -===== With a process: ===== - while (1) { - int fd = open(argv[1], O_RDWR); - read(fd, buf, sizeof(buf)); - close(fd); - } -===== and its child: ===== - setsid(); - while (1) { - int fd = open(tty, O_RDWR|O_NOCTTY); - ioctl(fd, TIOCSCTTY, 1); - vhangup(); - close(fd); - usleep(100 * (10 + random() % 1000)); - } -===== EOF ===== - -References: https://bugzilla.novell.com/show_bug.cgi?id=693374 -References: https://bugzilla.novell.com/show_bug.cgi?id=694509 -Signed-off-by: Jiri Slaby <[email protected]> -Cc: Alan Cox <[email protected]> -Cc: Linus Torvalds <[email protected]> -Cc: stable <[email protected]> [32, 33, 34, 39] -Signed-off-by: Greg Kroah-Hartman <[email protected]> ---- - drivers/tty/tty_ldisc.c | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -diff --git a/drivers/tty/tty_ldisc.c b/drivers/tty/tty_ldisc.c -index 5d01d32..ef925d5 100644 ---- a/drivers/tty/tty_ldisc.c -+++ b/drivers/tty/tty_ldisc.c -@@ -555,7 +555,7 @@ static void tty_ldisc_flush_works(struct tty_struct *tty) - static int tty_ldisc_wait_idle(struct tty_struct *tty) - { - int ret; -- ret = wait_event_interruptible_timeout(tty_ldisc_idle, -+ ret = wait_event_timeout(tty_ldisc_idle, - atomic_read(&tty->ldisc->users) == 1, 5 * HZ); - if (ret < 0) - return ret; -@@ -763,6 +763,8 @@ static int tty_ldisc_reinit(struct tty_struct *tty, int ldisc) - if (IS_ERR(ld)) - return -1; - -+ WARN_ON_ONCE(tty_ldisc_wait_idle(tty)); -+ - tty_ldisc_close(tty, tty->ldisc); - tty_ldisc_put(tty->ldisc); - tty->ldisc = NULL; --- -1.7.6 - ++++++ patches.suse.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/SUSE-bootsplash new/patches.suse/SUSE-bootsplash --- old/patches.suse/SUSE-bootsplash 2011-06-15 08:05:05.000000000 +0200 +++ new/patches.suse/SUSE-bootsplash 2011-07-04 12:07:08.000000000 +0200 @@ -15,25 +15,24 @@ Signed-off-by: Egbert Eich <[email protected]> --- - drivers/tty/n_tty.c | 11 + - drivers/tty/vt/keyboard.c | 9 + - drivers/tty/vt/vt.c | 29 + - drivers/video/Kconfig | 4 + - drivers/video/Makefile | 1 + - drivers/video/bootsplash/Kconfig | 17 + - drivers/video/bootsplash/Makefile | 5 + - drivers/video/bootsplash/bootsplash.c | 2424 +++++++++++++++++++++++++++++++++ + drivers/tty/n_tty.c | 11 + drivers/tty/vt/keyboard.c | 9 + drivers/tty/vt/vt.c | 29 + drivers/video/Kconfig | 4 + drivers/video/Makefile | 1 + drivers/video/bootsplash/Kconfig | 17 + drivers/video/bootsplash/Makefile | 5 + drivers/video/bootsplash/bootsplash.c | 2414 ++++++++++++++++++++++++++++++++++ drivers/video/bootsplash/decode-jpg.c | 998 ++++++++++++++ - drivers/video/bootsplash/decode-jpg.h | 36 + - drivers/video/bootsplash/render.c | 491 +++++++ - drivers/video/console/bitblit.c | 31 + - drivers/video/console/fbcon.c | 58 + - drivers/video/console/fbcon.h | 45 + + drivers/video/bootsplash/decode-jpg.h | 36 + drivers/video/bootsplash/render.c | 491 ++++++ + drivers/video/console/bitblit.c | 31 + drivers/video/console/fbcon.c | 58 + drivers/video/console/fbcon.h | 47 include/linux/bootsplash.h | 76 + - include/linux/console_struct.h | 3 + - include/linux/fb.h | 4 + - kernel/panic.c | 7 + - 18 files changed, 4249 insertions(+), 0 deletions(-) + include/linux/console_struct.h | 3 + include/linux/fb.h | 4 + 17 files changed, 4234 insertions(+) create mode 100644 drivers/video/bootsplash/Kconfig create mode 100644 drivers/video/bootsplash/Makefile create mode 100644 drivers/video/bootsplash/bootsplash.c @@ -42,10 +41,8 @@ create mode 100644 drivers/video/bootsplash/render.c create mode 100644 include/linux/bootsplash.h -Index: linux-2.6.39-rc3-master/drivers/tty/n_tty.c -=================================================================== ---- linux-2.6.39-rc3-master.orig/drivers/tty/n_tty.c -+++ linux-2.6.39-rc3-master/drivers/tty/n_tty.c +--- a/drivers/tty/n_tty.c ++++ b/drivers/tty/n_tty.c @@ -50,6 +50,8 @@ #include <linux/uaccess.h> #include <linux/module.h> @@ -55,7 +52,7 @@ #include <asm/system.h> /* number of characters left in xmit buffer before select has we have room */ -@@ -1796,6 +1798,15 @@ do_it_again: +@@ -1796,6 +1798,15 @@ tty->minimum_to_wake = (minimum - (b - buf)); if (!input_available_p(tty, 0)) { @@ -71,11 +68,9 @@ if (test_bit(TTY_OTHER_CLOSED, &tty->flags)) { retval = -EIO; break; -Index: linux-2.6.39-rc3-master/drivers/tty/vt/keyboard.c -=================================================================== ---- linux-2.6.39-rc3-master.orig/drivers/tty/vt/keyboard.c -+++ linux-2.6.39-rc3-master/drivers/tty/vt/keyboard.c -@@ -45,6 +45,8 @@ +--- a/drivers/tty/vt/keyboard.c ++++ b/drivers/tty/vt/keyboard.c +@@ -43,6 +43,8 @@ #include <linux/notifier.h> #include <linux/jiffies.h> @@ -84,7 +79,7 @@ extern void ctrl_alt_del(void); /* -@@ -1203,6 +1205,13 @@ static void kbd_keycode(unsigned int key +@@ -1201,6 +1203,13 @@ pr_warning("can't emulate rawmode for keycode %d\n", keycode); @@ -98,11 +93,9 @@ #ifdef CONFIG_SPARC if (keycode == KEY_A && sparc_l1_a_state) { sparc_l1_a_state = false; -Index: linux-2.6.39-rc3-master/drivers/tty/vt/vt.c -=================================================================== ---- linux-2.6.39-rc3-master.orig/drivers/tty/vt/vt.c -+++ linux-2.6.39-rc3-master/drivers/tty/vt/vt.c -@@ -4201,6 +4201,35 @@ void vcs_scr_updated(struct vc_data *vc) +--- a/drivers/tty/vt/vt.c ++++ b/drivers/tty/vt/vt.c +@@ -4204,6 +4204,35 @@ notify_update(vc); } @@ -138,11 +131,9 @@ /* * Visible symbols for modules */ -Index: linux-2.6.39-rc3-master/drivers/video/Kconfig -=================================================================== ---- linux-2.6.39-rc3-master.orig/drivers/video/Kconfig -+++ linux-2.6.39-rc3-master/drivers/video/Kconfig -@@ -2355,4 +2355,8 @@ if FB || SGI_NEWPORT_CONSOLE +--- a/drivers/video/Kconfig ++++ b/drivers/video/Kconfig +@@ -2397,4 +2397,8 @@ source "drivers/video/logo/Kconfig" endif @@ -151,11 +142,9 @@ +endif + endmenu -Index: linux-2.6.39-rc3-master/drivers/video/Makefile -=================================================================== ---- linux-2.6.39-rc3-master.orig/drivers/video/Makefile -+++ linux-2.6.39-rc3-master/drivers/video/Makefile -@@ -14,6 +14,7 @@ fb-objs := $(f +--- a/drivers/video/Makefile ++++ b/drivers/video/Makefile +@@ -14,6 +14,7 @@ obj-$(CONFIG_VT) += console/ obj-$(CONFIG_LOGO) += logo/ obj-y += backlight/ display/ @@ -163,10 +152,8 @@ obj-$(CONFIG_FB_CFB_FILLRECT) += cfbfillrect.o obj-$(CONFIG_FB_CFB_COPYAREA) += cfbcopyarea.o -Index: linux-2.6.39-rc3-master/drivers/video/bootsplash/Kconfig -=================================================================== --- /dev/null -+++ linux-2.6.39-rc3-master/drivers/video/bootsplash/Kconfig ++++ b/drivers/video/bootsplash/Kconfig @@ -0,0 +1,17 @@ +# +# Bootsplash configuration @@ -185,21 +172,17 @@ + If you are unsure, say N +endmenu + -Index: linux-2.6.39-rc3-master/drivers/video/bootsplash/Makefile -=================================================================== --- /dev/null -+++ linux-2.6.39-rc3-master/drivers/video/bootsplash/Makefile ++++ b/drivers/video/bootsplash/Makefile @@ -0,0 +1,5 @@ +# Makefile for the Linux bootsplash + +obj-$(CONFIG_BOOTSPLASH) += bootsplash.o +obj-$(CONFIG_BOOTSPLASH) += decode-jpg.o +obj-$(CONFIG_BOOTSPLASH) += render.o -Index: linux-2.6.39-rc3-master/drivers/video/bootsplash/bootsplash.c -=================================================================== --- /dev/null -+++ linux-2.6.39-rc3-master/drivers/video/bootsplash/bootsplash.c -@@ -0,0 +1,2424 @@ ++++ b/drivers/video/bootsplash/bootsplash.c +@@ -0,0 +1,2414 @@ +/* + * linux/drivers/video/bootsplash/bootsplash.c - + * splash screen handling functions. @@ -1257,6 +1240,14 @@ + return -1; +} + ++static void splash_update_redraw(struct vc_data *vc, struct fb_info *info) ++{ ++ update_region(vc, ++ vc->vc_origin + vc->vc_size_row * vc->vc_top, ++ vc->vc_size_row * (vc->vc_bottom - vc->vc_top) / 2); ++ splash_clear_margins(vc, info, 0); ++} ++ +int splash_do_verbose(void) +{ + struct vc_data *vc; @@ -1288,10 +1279,7 @@ + if (!info || !info->splash_data) + goto done; + -+ update_region(vc, -+ vc->vc_origin + vc->vc_size_row * vc->vc_top, -+ vc->vc_size_row * (vc->vc_bottom - vc->vc_top) / 2); -+ splash_clear_margins(vc, info, 0); ++ splash_update_redraw(vc, info); + ret = 0; + + done: @@ -1326,8 +1314,6 @@ + info->splash_data = 0; + if (rows != vc->vc_rows || cols != vc->vc_cols) + vc_resize(vc, rows, cols); -+ if (vc->vc_def_color != 0x07) -+ con_remap_def_color(vc, 0x07); +} + +/* look for the splash with the matching size and set it as the current */ @@ -1406,6 +1392,25 @@ + return -1; +} + ++static int splash_recolor(struct vc_data *vc, struct fb_info *info) ++{ ++ int color; ++ ++ SPLASH_DEBUG(); ++ if (!vc->vc_splash_data) ++ return -1; ++ if (!vc->vc_splash_data->splash_state) ++ return 0; ++ color = vc->vc_splash_data->imgd->splash_color << 4 | ++ vc->vc_splash_data->imgd->splash_fg_color; ++ if (vc->vc_def_color != color) ++ con_remap_def_color(vc, color); ++ if (info && fg_console == vc->vc_num) ++ splash_update_redraw(vc, info); ++ vc->vc_splash_data->color_set = 1; ++ return 0; ++} ++ +int splash_prepare(struct vc_data *vc, struct fb_info *info) +{ + int err; @@ -1543,16 +1548,14 @@ + / vc->vc_font.width; + int rows = vc->vc_splash_data->splash_vc_text_he + / vc->vc_font.height; -+ int color = vc->vc_splash_data->imgd->splash_color << 4 | -+ vc->vc_splash_data->imgd->splash_fg_color; ++ + info->splash_data = vc->vc_splash_data; + + /* vc_resize also calls con_switch which resets yscroll */ + if (rows != vc->vc_rows || cols != vc->vc_cols) + vc_resize(vc, cols, rows); -+ if (vc->vc_def_color != color) -+ con_remap_def_color(vc, color); -+ ++ if (!vc->vc_splash_data->color_set) ++ splash_recolor(vc, NULL); + } else { + splash_off(vc, info); + return -5; @@ -1570,33 +1573,10 @@ +static int splash_write_proc(struct file *file, const char *buffer, + unsigned long count, void *data); +static int splash_status(struct vc_data *vc); -+static int splash_recolor(struct vc_data *vc); +static int splash_proc_register(void); + +static struct proc_dir_entry *proc_splash; + -+static int splash_recolor(struct vc_data *vc) -+{ -+ int color; -+ -+ SPLASH_DEBUG(); -+ if (!vc->vc_splash_data) -+ return -1; -+ if (!vc->vc_splash_data->splash_state) -+ return 0; -+ color = vc->vc_splash_data->imgd->splash_color << 4 | -+ vc->vc_splash_data->imgd->splash_fg_color; -+ if (vc->vc_def_color != color) -+ con_remap_def_color(vc, color); -+ if (fg_console == vc->vc_num) { -+ update_region(vc, -+ vc->vc_origin + vc->vc_size_row * vc->vc_top, -+ vc->vc_size_row -+ * (vc->vc_bottom - vc->vc_top) / 2); -+ } -+ return 0; -+} -+ +static int splash_status(struct vc_data *vc) +{ + struct fb_info *info; @@ -1612,20 +1592,13 @@ + + if (fg_console == vc->vc_num) + splash_prepare(vc, info); -+ if (vc->vc_splash_data && vc->vc_splash_data->splash_state) { -+ if (info->splash_data) { -+ if (fg_console == vc->vc_num) { -+ update_region(vc, -+ vc->vc_origin -+ + vc->vc_size_row * vc->vc_top, -+ vc->vc_size_row -+ * (vc->vc_bottom - vc->vc_top) -+ / 2); -+ splash_clear_margins(vc, info, 0); -+ } -+ } -+ } else ++ if (vc->vc_splash_data && vc->vc_splash_data->splash_state) ++ splash_recolor(vc, info); ++ else { + splash_off(vc, info); ++ if (vc->vc_def_color != 0x07) ++ con_remap_def_color(vc, 0x07); ++ } + + return 0; +} @@ -2016,7 +1989,7 @@ + vc_splash_data->imgd->splash_fg_color = uval >> 4 & 0x0f; + } + if ((uval & 1) == vc_splash_data->splash_state) -+ splash_recolor(vc); ++ splash_recolor(vc, NULL); + else { + vc_splash_data->splash_state = uval & 1; + splash_status(vc); @@ -2624,10 +2597,8 @@ + } + return 0; +} -Index: linux-2.6.39-rc3-master/drivers/video/bootsplash/decode-jpg.c -=================================================================== --- /dev/null -+++ linux-2.6.39-rc3-master/drivers/video/bootsplash/decode-jpg.c ++++ b/drivers/video/bootsplash/decode-jpg.c @@ -0,0 +1,998 @@ +/* + * linux/drivers/video/bootsplash/decode-jpg.c - a tiny jpeg decoder. @@ -3627,10 +3598,8 @@ + outy += 64 * 2 - 16 * 4; + } +} -Index: linux-2.6.39-rc3-master/drivers/video/bootsplash/decode-jpg.h -=================================================================== --- /dev/null -+++ linux-2.6.39-rc3-master/drivers/video/bootsplash/decode-jpg.h ++++ b/drivers/video/bootsplash/decode-jpg.h @@ -0,0 +1,36 @@ +/* + * linux/drivers/video/bootsplash/decode-jpg.h - a tiny jpeg decoder. @@ -3668,10 +3637,8 @@ +extern void jpeg_get_size(unsigned char *, int *, int *); + +#endif -Index: linux-2.6.39-rc3-master/drivers/video/bootsplash/render.c -=================================================================== --- /dev/null -+++ linux-2.6.39-rc3-master/drivers/video/bootsplash/render.c ++++ b/drivers/video/bootsplash/render.c @@ -0,0 +1,491 @@ +/* + * linux/drivers/video/bootsplash/render.c - splash screen render functions. @@ -4164,10 +4131,8 @@ + /* update_screen(vc->vc_num); */ + } +} -Index: linux-2.6.39-rc3-master/drivers/video/console/bitblit.c -=================================================================== ---- linux-2.6.39-rc3-master.orig/drivers/video/console/bitblit.c -+++ linux-2.6.39-rc3-master/drivers/video/console/bitblit.c +--- a/drivers/video/console/bitblit.c ++++ b/drivers/video/console/bitblit.c @@ -19,6 +19,9 @@ #include <asm/types.h> #include "fbcon.h" @@ -4178,7 +4143,7 @@ /* * Accelerated handlers. */ -@@ -48,6 +51,12 @@ static void bit_bmove(struct vc_data *vc +@@ -48,6 +51,12 @@ { struct fb_copyarea area; @@ -4191,7 +4156,7 @@ area.sx = sx * vc->vc_font.width; area.sy = sy * vc->vc_font.height; area.dx = dx * vc->vc_font.width; -@@ -64,6 +73,12 @@ static void bit_clear(struct vc_data *vc +@@ -64,6 +73,12 @@ int bgshift = (vc->vc_hi_font_mask) ? 13 : 12; struct fb_fillrect region; @@ -4204,7 +4169,7 @@ region.color = attr_bgcol_ec(bgshift, vc, info); region.dx = sx * vc->vc_font.width; region.dy = sy * vc->vc_font.height; -@@ -161,6 +176,11 @@ static void bit_putcs(struct vc_data *vc +@@ -161,6 +176,11 @@ image.height = vc->vc_font.height; image.depth = 1; @@ -4216,7 +4181,7 @@ if (attribute) { buf = kmalloc(cellsize, GFP_KERNEL); if (!buf) -@@ -214,6 +234,11 @@ static void bit_clear_margins(struct vc_ +@@ -214,6 +234,11 @@ unsigned int bs = info->var.yres - bh; struct fb_fillrect region; @@ -4228,7 +4193,7 @@ region.color = attr_bgcol_ec(bgshift, vc, info); region.rop = ROP_COPY; -@@ -380,6 +405,12 @@ static void bit_cursor(struct vc_data *v +@@ -380,6 +405,12 @@ cursor.image.depth = 1; cursor.rop = ROP_XOR; @@ -4241,10 +4206,8 @@ if (info->fbops->fb_cursor) err = info->fbops->fb_cursor(info, &cursor); -Index: linux-2.6.39-rc3-master/drivers/video/console/fbcon.c -=================================================================== ---- linux-2.6.39-rc3-master.orig/drivers/video/console/fbcon.c -+++ linux-2.6.39-rc3-master/drivers/video/console/fbcon.c +--- a/drivers/video/console/fbcon.c ++++ b/drivers/video/console/fbcon.c @@ -80,6 +80,7 @@ #include <asm/system.h> @@ -4253,7 +4216,7 @@ #ifdef FBCONDEBUG # define DPRINTK(fmt, args...) printk(KERN_DEBUG "%s: " fmt, __func__ , ## args) -@@ -95,7 +96,11 @@ enum { +@@ -95,7 +96,11 @@ static struct display fb_display[MAX_NR_CONSOLES]; @@ -4265,7 +4228,7 @@ static signed char con2fb_map_boot[MAX_NR_CONSOLES]; static int logo_lines; -@@ -536,6 +541,8 @@ static int fbcon_takeover(int show_logo) +@@ -536,6 +541,8 @@ for (i = first_fb_vc; i <= last_fb_vc; i++) con2fb_map[i] = info_idx; @@ -4274,7 +4237,7 @@ err = take_over_console(&fb_con, first_fb_vc, last_fb_vc, fbcon_is_default); -@@ -1099,6 +1106,21 @@ static void fbcon_init(struct vc_data *v +@@ -1099,6 +1106,21 @@ new_cols /= vc->vc_font.width; new_rows /= vc->vc_font.height; @@ -4296,7 +4259,7 @@ /* * We must always set the mode. The mode of the previous console * driver could be in the same resolution but we are using different -@@ -1800,6 +1822,8 @@ static int fbcon_scroll(struct vc_data * +@@ -1800,6 +1822,8 @@ fbcon_softback_note(vc, t, count); if (logo_shown >= 0) goto redraw_up; @@ -4305,7 +4268,7 @@ switch (p->scrollmode) { case SCROLL_MOVE: fbcon_redraw_blit(vc, info, p, t, b - t - count, -@@ -1891,6 +1915,8 @@ static int fbcon_scroll(struct vc_data * +@@ -1891,6 +1915,8 @@ count = vc->vc_rows; if (logo_shown >= 0) goto redraw_down; @@ -4314,7 +4277,7 @@ switch (p->scrollmode) { case SCROLL_MOVE: fbcon_redraw_blit(vc, info, p, b - 1, b - t - count, -@@ -2039,6 +2065,12 @@ static void fbcon_bmove_rec(struct vc_da +@@ -2039,6 +2065,12 @@ } return; } @@ -4327,7 +4290,7 @@ ops->bmove(vc, info, real_y(p, sy), sx, real_y(p, dy), dx, height, width); } -@@ -2147,6 +2179,23 @@ static int fbcon_switch(struct vc_data * +@@ -2147,6 +2179,23 @@ info = registered_fb[con2fb_map[vc->vc_num]]; ops = info->fbcon_par; @@ -4351,7 +4314,7 @@ if (softback_top) { if (softback_lines) fbcon_set_origin(vc); -@@ -2280,6 +2329,11 @@ static void fbcon_generic_blank(struct v +@@ -2280,6 +2329,11 @@ { struct fb_event event; @@ -4363,7 +4326,7 @@ if (blank) { unsigned short charmask = vc->vc_hi_font_mask ? 0x1ff : 0xff; -@@ -2505,6 +2559,10 @@ static int fbcon_do_set_font(struct vc_d +@@ -2505,6 +2559,10 @@ cols = FBCON_SWAP(ops->rotate, info->var.xres, info->var.yres); rows = FBCON_SWAP(ops->rotate, info->var.yres, info->var.xres); @@ -4374,11 +4337,9 @@ cols /= w; rows /= h; vc_resize(vc, cols, rows); -Index: linux-2.6.39-rc3-master/drivers/video/console/fbcon.h -=================================================================== ---- linux-2.6.39-rc3-master.orig/drivers/video/console/fbcon.h -+++ linux-2.6.39-rc3-master/drivers/video/console/fbcon.h -@@ -25,6 +25,51 @@ +--- a/drivers/video/console/fbcon.h ++++ b/drivers/video/console/fbcon.h +@@ -25,6 +25,53 @@ * low-level frame buffer device */ @@ -4424,16 +4385,16 @@ + int splash_boxes_yoff; + int splash_sboxes_xoff; + int splash_sboxes_yoff; ++ ++ bool color_set; +}; +#endif + struct display { /* Filled in by the low-level console driver */ const u_char *fontdata; -Index: linux-2.6.39-rc3-master/include/linux/bootsplash.h -=================================================================== --- /dev/null -+++ linux-2.6.39-rc3-master/include/linux/bootsplash.h ++++ b/include/linux/bootsplash.h @@ -0,0 +1,76 @@ +/* + * linux/drivers/video/bootsplash/bootsplash.h - splash screen definition. @@ -4511,11 +4472,9 @@ +# endif + +#endif -Index: linux-2.6.39-rc3-master/include/linux/console_struct.h -=================================================================== ---- linux-2.6.39-rc3-master.orig/include/linux/console_struct.h -+++ linux-2.6.39-rc3-master/include/linux/console_struct.h -@@ -107,6 +107,9 @@ struct vc_data { +--- a/include/linux/console_struct.h ++++ b/include/linux/console_struct.h +@@ -107,6 +107,9 @@ unsigned long vc_uni_pagedir; unsigned long *vc_uni_pagedir_loc; /* [!] Location of uni_pagedir variable for this console */ bool vc_panic_force_write; /* when oops/panic this VC can accept forced output/blanking */ @@ -4525,11 +4484,9 @@ /* additional information is in vt_kern.h */ }; -Index: linux-2.6.39-rc3-master/include/linux/fb.h -=================================================================== ---- linux-2.6.39-rc3-master.orig/include/linux/fb.h -+++ linux-2.6.39-rc3-master/include/linux/fb.h -@@ -877,6 +877,10 @@ struct fb_info { +--- a/include/linux/fb.h ++++ b/include/linux/fb.h +@@ -878,6 +878,10 @@ void *fbcon_par; /* fbcon use-only private area */ /* From here on everything is device dependent */ void *par; ++++++ patches.xen.tar.bz2 ++++++ ++++ 39940 lines of diff (skipped) ++++++ series.conf ++++++ --- /var/tmp/diff_new_pack.Ndb0mQ/_old 2011-07-08 09:28:11.000000000 +0200 +++ /var/tmp/diff_new_pack.Ndb0mQ/_new 2011-07-08 09:28:11.000000000 +0200 @@ -430,7 +430,6 @@ ######################################################## # Char / serial ######################################################## - patches.fixes/tty-ldisc-do-not-close-until-there-are-readers.patch ######################################################## # Other driver fixes @@ -554,114 +553,113 @@ # re-basing to a newer xen tree. # ### both uml framebuffer and xen need this one. -+xen_needs_update patches.xen/add-console-use-vt -+xen_needs_update -+xen_needs_update # split out patches -+xen_needs_update patches.xen/linux-2.6.19-rc1-kexec-move_segment_code-i386.patch -+xen_needs_update patches.xen/linux-2.6.19-rc1-kexec-move_segment_code-x86_64.patch -+xen_needs_update patches.xen/ipv6-no-autoconf -+xen_needs_update patches.xen/pci-guestdev -+xen_needs_update patches.xen/pci-reserve -+xen_needs_update patches.xen/tmem -+xen_needs_update -+xen_needs_update # bulk stuff, new files for xen -+xen_needs_update patches.xen/xen3-auto-xen-arch.diff -+xen_needs_update patches.xen/xen3-auto-xen-drivers.diff -+xen_needs_update patches.xen/xen3-auto-include-xen-interface.diff -+xen_needs_update patches.xen/xen3-auto-blktap2-pvops.diff -+xen_needs_update -+xen_needs_update # kconfig bits for xen -+xen_needs_update patches.xen/xen3-auto-xen-kconfig.diff -+xen_needs_update -+xen_needs_update # common code changes -+xen_needs_update patches.xen/xen3-auto-common.diff -+xen_needs_update patches.xen/xen3-auto-arch-x86.diff -+xen_needs_update patches.xen/xen3-auto-arch-i386.diff -+xen_needs_update patches.xen/xen3-auto-arch-x86_64.diff -+xen_needs_update -+xen_needs_update # fixups due to upstream Xen parts -+xen_needs_update patches.xen/xen3-fixup-xen -+xen_needs_update -+xen_needs_update # newer changeset backports -+xen_needs_update -+xen_needs_update # changes outside arch/{i386,x86_64}/xen -+xen_needs_update patches.xen/xen3-fixup-kconfig -+xen_needs_update patches.xen/xen3-fixup-common -+xen_needs_update patches.xen/xen3-fixup-arch-x86 -+xen_needs_update patches.xen/xen3-fixup-blktap2-pvops -+xen_needs_update -+xen_needs_update # ports of other patches -+xen_needs_update patches.xen/xen3-patch-2.6.18 -+xen_needs_update patches.xen/xen3-patch-2.6.19 -+xen_needs_update patches.xen/xen3-patch-2.6.20 -+xen_needs_update patches.xen/xen3-patch-2.6.21 -+xen_needs_update patches.xen/xen3-patch-2.6.22 -+xen_needs_update patches.xen/xen3-patch-2.6.23 -+xen_needs_update patches.xen/xen3-patch-2.6.24 -+xen_needs_update patches.xen/xen3-patch-2.6.25 -+xen_needs_update patches.xen/xen3-patch-2.6.26 -+xen_needs_update patches.xen/xen3-patch-2.6.27 -+xen_needs_update patches.xen/xen3-patch-2.6.28 -+xen_needs_update patches.xen/xen3-patch-2.6.29 -+xen_needs_update patches.xen/xen3-patch-2.6.30 -+xen_needs_update patches.xen/xen3-patch-2.6.31 -+xen_needs_update patches.xen/xen3-patch-2.6.32 -+xen_needs_update patches.xen/xen3-patch-2.6.33 -+xen_needs_update patches.xen/xen3-patch-2.6.34 -+xen_needs_update patches.xen/xen3-patch-2.6.35 -+xen_needs_update patches.xen/xen3-patch-2.6.36 -+xen_needs_update patches.xen/xen3-patch-2.6.37 -+xen_needs_update patches.xen/xen3-patch-2.6.38 -+xen_needs_update patches.xen/xen3-patch-2.6.39 -+xen_needs_update patches.xen/xen3-stack-unwind -+xen_needs_update patches.xen/xen3-x86_64-unwind-annotations -+xen_needs_update -+xen_needs_update # bugfixes and enhancements -+xen_needs_update patches.xen/xen-balloon-max-target -+xen_needs_update patches.xen/xen-blkback-bimodal-suse -+xen_needs_update patches.xen/xen-blkif-protocol-fallback-hack -+xen_needs_update patches.xen/xen-blkback-cdrom -+xen_needs_update patches.xen/xen-blktap-modular -+xen_needs_update patches.xen/xen-blktap-write-barriers -+xen_needs_update patches.xen/xen-blktap2-use-after-free -+xen_needs_update patches.xen/xen-blktap2-configurable-nr-devs -+xen_needs_update patches.xen/xen-op-packet -+xen_needs_update patches.xen/xen-blkfront-cdrom -+xen_needs_update patches.xen/xen-kconfig-compat -+xen_needs_update patches.xen/xen-cpufreq-report -+xen_needs_update patches.xen/xen-sys-suspend -+xen_needs_update patches.xen/xen-ipi-per-cpu-irq -+xen_needs_update patches.xen/xen-virq-per-cpu-irq -+xen_needs_update patches.xen/xen-clockevents -+xen_needs_update patches.xen/xen-spinlock-poll-early -+xen_needs_update patches.xen/xen-pcpu-hotplug -+xen_needs_update patches.xen/xen-mem-hotplug -+xen_needs_update patches.xen/xen-swiotlb-heuristics -+xen_needs_update patches.xen/xen-configurable-guest-devices -+xen_needs_update patches.xen/xen-netback-nr-irqs -+xen_needs_update patches.xen/xen-netback-notify-multi -+xen_needs_update patches.xen/xen-netback-generalize -+xen_needs_update patches.xen/xen-netback-multiple-tasklets -+xen_needs_update patches.xen/xen-netback-kernel-threads -+xen_needs_update patches.xen/xen-cxgb3 -+xen_needs_update patches.xen/xen-dcdbas -+xen_needs_update patches.xen/xen-floppy -+xen_needs_update patches.xen/xen-sections -+xen_needs_update patches.xen/xen-kzalloc -+xen_needs_update patches.xen/xen-unpriv-build -+xen_needs_update patches.xen/xen-setup-gsi -+xen_needs_update patches.xen/xen-sfc-netfront-gcc46 -+xen_needs_update patches.xen/xen-x86-panic-no-reboot -+xen_needs_update patches.xen/xen-x86-dcr-fallback -+xen_needs_update patches.xen/xen-x86-no-lapic -+xen_needs_update patches.xen/xen-x86-pmd-handling -+xen_needs_update patches.xen/xen-x86-bigmem -+xen_needs_update patches.xen/xen-x86-exit-mmap -+xen_needs_update patches.xen/xen-x86-per-cpu-vcpu-info -+xen_needs_update patches.xen/xen-x86-msr-on-pcpu -+xen_needs_update patches.xen/xen-x86_64-pgd-pin -+xen_needs_update patches.xen/xen-x86_64-pgd-alloc-order -+xen_needs_update patches.xen/xen-x86_64-dump-user-pgt -+xen_needs_update patches.xen/xen-x86_64-note-init-p2m -+xen_needs_update patches.xen/xen-x86_64-unmapped-initrd + patches.xen/add-console-use-vt + # split out patches + patches.xen/kexec-move-segment-code-i386.patch + patches.xen/kexec-move-segment-code-x86_64.patch + patches.xen/ipv6-no-autoconf + patches.xen/pci-guestdev + patches.xen/pci-reserve + + # bulk stuff, new files for xen + patches.xen/xen3-auto-xen-arch.diff + patches.xen/xen3-auto-xen-drivers.diff + patches.xen/xen3-auto-include-xen-interface.diff + patches.xen/xen3-auto-blktap2-pvops.diff + + # kconfig bits for xen + patches.xen/xen3-auto-xen-kconfig.diff + + # common code changes + patches.xen/xen3-auto-common.diff + patches.xen/xen3-auto-arch-x86.diff + patches.xen/xen3-auto-arch-i386.diff + patches.xen/xen3-auto-arch-x86_64.diff + + # fixups due to upstream Xen parts + patches.xen/xen3-fixup-xen + + # newer changeset backports + + # changes outside arch/{i386,x86_64}/xen + patches.xen/xen3-fixup-kconfig + patches.xen/xen3-fixup-common + patches.xen/xen3-fixup-arch-x86 + patches.xen/xen3-fixup-blktap2-pvops + + # ports of other patches + patches.xen/xen3-patch-2.6.18 + patches.xen/xen3-patch-2.6.19 + patches.xen/xen3-patch-2.6.20 + patches.xen/xen3-patch-2.6.21 + patches.xen/xen3-patch-2.6.22 + patches.xen/xen3-patch-2.6.23 + patches.xen/xen3-patch-2.6.24 + patches.xen/xen3-patch-2.6.25 + patches.xen/xen3-patch-2.6.26 + patches.xen/xen3-patch-2.6.27 + patches.xen/xen3-patch-2.6.28 + patches.xen/xen3-patch-2.6.29 + patches.xen/xen3-patch-2.6.30 + patches.xen/xen3-patch-2.6.31 + 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 + patches.xen/xen3-patch-2.6.37 + patches.xen/xen3-patch-2.6.38 + patches.xen/xen3-patch-2.6.39 + patches.xen/xen3-patch-3.0-rc5 + patches.xen/xen3-stack-unwind + patches.xen/xen3-x86_64-unwind-annotations + + # bugfixes and enhancements + patches.xen/xen-balloon-max-target + patches.xen/xen-blkif-protocol-fallback-hack + patches.xen/xen-blkback-cdrom + patches.xen/xen-blktap-modular + patches.xen/xen-blktap-write-barriers + patches.xen/xen-blktap2-use-after-free + patches.xen/xen-blktap2-configurable-nr-devs + patches.xen/xen-op-packet + patches.xen/xen-blkfront-cdrom + patches.xen/xen-kconfig-compat + patches.xen/xen-cpufreq-report + patches.xen/xen-sys-suspend + patches.xen/xen-ipi-per-cpu-irq + patches.xen/xen-virq-per-cpu-irq + patches.xen/xen-clockevents + patches.xen/xen-spinlock-poll-early + patches.xen/xen-pcpu-hotplug + patches.xen/xen-mem-hotplug + patches.xen/xen-frontswap + patches.xen/xen-swiotlb-heuristics + patches.xen/xen-configurable-guest-devices + patches.xen/xen-netback-nr-irqs + patches.xen/xen-netback-notify-multi + patches.xen/xen-netback-generalize + patches.xen/xen-netback-multiple-tasklets + patches.xen/xen-netback-kernel-threads + patches.xen/xen-cxgb3 + patches.xen/xen-dcdbas + patches.xen/xen-floppy + patches.xen/xen-sections + 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-no-lapic + patches.xen/xen-x86-pmd-handling + patches.xen/xen-x86-bigmem + patches.xen/xen-x86-exit-mmap + patches.xen/xen-x86-per-cpu-vcpu-info + patches.xen/xen-x86-msr-on-pcpu + patches.xen/xen-x86-EFI + patches.xen/xen-x86_64-pgd-pin + patches.xen/xen-x86_64-pgd-alloc-order + patches.xen/xen-x86_64-dump-user-pgt + patches.xen/xen-x86_64-note-init-p2m + patches.xen/xen-x86_64-unmapped-initrd ++++++ source-timestamp ++++++ --- /var/tmp/diff_new_pack.Ndb0mQ/_old 2011-07-08 09:28:11.000000000 +0200 +++ /var/tmp/diff_new_pack.Ndb0mQ/_new 2011-07-08 09:28:11.000000000 +0200 @@ -1,3 +1,3 @@ -2011-06-29 15:14:02 +0200 -GIT Revision: e7003259e1bb642a167f70c787b240cc90bbd148 +2011-07-07 00:58:01 +0200 +GIT Revision: 56e99dabe82b4e0edb8c336cf9e74160fb86577a GIT Branch: master ++++++ supported.conf ++++++ --- /var/tmp/diff_new_pack.Ndb0mQ/_old 2011-07-08 09:28:11.000000000 +0200 +++ /var/tmp/diff_new_pack.Ndb0mQ/_new 2011-07-08 09:28:11.000000000 +0200 @@ -1615,6 +1615,7 @@ kernel/drivers/rtc/rtc-ds1553 kernel/drivers/rtc/rtc-ds1672 kernel/drivers/rtc/rtc-ds1742 + kernel/drivers/rtc/rtc-efi kernel/drivers/rtc/rtc-fm3130 kernel/drivers/rtc/rtc-isl1208 kernel/drivers/rtc/rtc-lib ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
