rpms/kernel/devel patch-2.6.22-git2.bz2.sign, NONE, 1.1 .cvsignore, 1.648, 1.649 kernel-2.6.spec, 1.3298, 1.3299 sources, 1.612, 1.613 upstream, 1.534, 1.535 utrace-core.patch, 1.1, 1.2 utrace-ptrace-compat.patch, 1.1, 1.2 linux-2.6-libata-ich8m-add-pciid.patch, 1.1, NONE linux-2.6-sky2-restore-workarounds.patch, 1.1, NONE patch-2.6.22-git1.bz2.sign, 1.1, NONE

Dave Jones (davej) fedora-extras-commits at redhat.com
Thu Jul 12 16:47:38 UTC 2007


Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17023

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream utrace-core.patch 
	utrace-ptrace-compat.patch 
Added Files:
	patch-2.6.22-git2.bz2.sign 
Removed Files:
	linux-2.6-libata-ich8m-add-pciid.patch 
	linux-2.6-sky2-restore-workarounds.patch 
	patch-2.6.22-git1.bz2.sign 
Log Message:
* Thu Jul 12 2007 Dave Jones <davej at redhat.com>
- 2.6.22-git2



--- NEW FILE patch-2.6.22-git2.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBGlIDryGugalF9Dw4RAnMuAJ970by0RCix9zoJEvS86b8vwM8+LQCglSne
HQ/CMziWz+ZOPKHhhU5gUwI=
=f/Wd
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.648
retrieving revision 1.649
diff -u -r1.648 -r1.649
--- .cvsignore	11 Jul 2007 01:59:16 -0000	1.648
+++ .cvsignore	12 Jul 2007 16:47:05 -0000	1.649
@@ -3,4 +3,4 @@
 temp-*
 kernel-2.6.22
 linux-2.6.22.tar.bz2
-patch-2.6.22-git1.bz2
+patch-2.6.22-git2.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3298
retrieving revision 1.3299
diff -u -r1.3298 -r1.3299
--- kernel-2.6.spec	12 Jul 2007 01:33:31 -0000	1.3298
+++ kernel-2.6.spec	12 Jul 2007 16:47:05 -0000	1.3299
@@ -44,7 +44,7 @@
 # The rc snapshot level
 %define rcrev 0
 # The git snapshot level
-%define gitrev 1
+%define gitrev 2
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -572,12 +572,10 @@
 Patch620: linux-2.6-defaults-unicode-vt.patch
 Patch630: linux-2.6-defaults-nonmi.patch
 Patch660: linux-2.6-libata-ali-atapi-dma.patch
-Patch661: linux-2.6-libata-ich8m-add-pciid.patch
 Patch670: linux-2.6-ata-quirk.patch
 Patch680: git-wireless-dev.patch
 Patch681: git-iwlwifi.patch
 Patch690: linux-2.6-e1000-ich9.patch
-Patch691: linux-2.6-sky2-restore-workarounds.patch
 Patch710: linux-2.6-bcm43xx-pci-neuter.patch
 #Patch780: linux-2.6-clockevents-fix-resume-logic.patch
 Patch780: linux-2.6-highres-timers.patch
@@ -1200,9 +1198,6 @@
 
 # Disable ATAPI DMA on ALI chipsets.
 ApplyPatch linux-2.6-libata-ali-atapi-dma.patch
-# libata: don't initialize sg in ata_exec_internal() if DMA_NONE
-#libata add ich8m (santa rosa) pata controller ID
-ApplyPatch linux-2.6-libata-ich8m-add-pciid.patch
 # ia64 ata quirk
 ApplyPatch linux-2.6-ata-quirk.patch
 
@@ -1212,8 +1207,6 @@
 ApplyPatch git-iwlwifi.patch
 # add patch from markmc so that e1000 supports ICH9
 ApplyPatch linux-2.6-e1000-ich9.patch
-# sky2: restore workarounds for lost interrupts
-ApplyPatch linux-2.6-sky2-restore-workarounds.patch
 # avoid bcm3xx vs bcm43xx-mac80211 PCI ID conflicts
 ApplyPatch linux-2.6-bcm43xx-pci-neuter.patch
 
@@ -2151,6 +2144,9 @@
 %endif
 
 %changelog
+* Thu Jul 12 2007 Dave Jones <davej at redhat.com>
+- 2.6.22-git2
+
 * Wed Jul 11 2007 Roland McGrath <roland at redhat.com>
 - core dump enhancement: include first page of ELF files, with sysctl control
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.612
retrieving revision 1.613
diff -u -r1.612 -r1.613
--- sources	11 Jul 2007 01:59:16 -0000	1.612
+++ sources	12 Jul 2007 16:47:05 -0000	1.613
@@ -1,2 +1,2 @@
 2e230d005c002fb3d38a3ca07c0200d0  linux-2.6.22.tar.bz2
-5c95a66fcb1ba09688dfaa5799f6f431  patch-2.6.22-git1.bz2
+92cd4b5907f204f2539f876907a6fa8b  patch-2.6.22-git2.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.534
retrieving revision 1.535
diff -u -r1.534 -r1.535
--- upstream	11 Jul 2007 01:59:16 -0000	1.534
+++ upstream	12 Jul 2007 16:47:05 -0000	1.535
@@ -1,2 +1,2 @@
 linux-2.6.22.tar.bz2
-patch-2.6.22-git1.bz2
+patch-2.6.22-git2.bz2

utrace-core.patch:

Index: utrace-core.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/utrace-core.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- utrace-core.patch	10 Jul 2007 18:11:39 -0000	1.1
+++ utrace-core.patch	12 Jul 2007 16:47:05 -0000	1.2
@@ -27,8 +27,8 @@
  include/linux/tracehook.h         |   85 +
  include/linux/utrace.h            |  544 +++++++++
  include/linux/sched.h             |    5 
- init/Kconfig                      |   18 
- 9 files changed, 3502 insertions(+), 18 deletions(-)
+ init/Kconfig                      |   20 
+ 9 files changed, 3504 insertions(+), 18 deletions(-)
  create kernel/utrace.c
  create Documentation/utrace.txt
  create Documentation/DocBook/utrace.tmpl
@@ -3769,10 +3769,14 @@
     	u32 self_exec_id;
 --- linux-2.6/init/Kconfig
 +++ linux-2.6/init/Kconfig
-@@ -686,6 +686,24 @@ config STOP_MACHINE
+@@ -686,4 +686,24 @@ config STOP_MACHINE
  	  Need stop_machine() primitive.
  endmenu
  
++menu "Block layer"
+ source "block/Kconfig"
++endmenu
++
 +menu "Process debugging support"
 +
 +config UTRACE
@@ -3790,7 +3794,3 @@
 +	  kernel and are very sure you don't need these facilitiies,
 +	  say Y.
 +endmenu
-+
- menu "Block layer"
- source "block/Kconfig"
- endmenu

utrace-ptrace-compat.patch:

Index: utrace-ptrace-compat.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/utrace-ptrace-compat.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- utrace-ptrace-compat.patch	10 Jul 2007 18:11:39 -0000	1.1
+++ utrace-ptrace-compat.patch	12 Jul 2007 16:47:05 -0000	1.2
@@ -3092,7 +3092,7 @@
  #endif
 --- linux-2.6/init/Kconfig
 +++ linux-2.6/init/Kconfig
-@@ -688,10 +688,21 @@ endmenu
+@@ -692,10 +692,21 @@ endmenu
  
  menu "Process debugging support"
  


--- linux-2.6-libata-ich8m-add-pciid.patch DELETED ---


--- linux-2.6-sky2-restore-workarounds.patch DELETED ---


--- patch-2.6.22-git1.bz2.sign DELETED ---




More information about the fedora-extras-commits mailing list