rpms/kernel/devel patch-2.6.31-rc6.bz2.sign, NONE, 1.1.2.2 .cvsignore, 1.1014.2.22, 1.1014.2.23 kernel.spec, 1.1294.2.51, 1.1294.2.52 sources, 1.976.2.23, 1.976.2.24 upstream, 1.888.2.22, 1.888.2.23 xen.pvops.patch, 1.1.2.32, 1.1.2.33 drm-hush-vblank-warning.patch, 1.1.2.2, NONE drm-radeon-fixes.patch, 1.1.2.2, NONE linux-2.6-ppc-perfctr-oops-fix.patch, 1.2.2.3, NONE patch-2.6.31-rc5-git3.bz2.sign, 1.1.2.2, NONE patch-2.6.31-rc5.bz2.sign, 1.1.6.2, NONE revert-ftrace-powerpc-snafu.patch, 1.1.2.2, NONE
myoung
myoung at fedoraproject.org
Fri Aug 14 18:31:37 UTC 2009
- Previous message (by thread): rpms/xrdp/EL-4 import.log, NONE, 1.1 xrdp.init, NONE, 1.1 xrdp.logrotate, NONE, 1.1 xrdp.spec, NONE, 1.1 xrdp.sysconfig, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message (by thread): rpms/python-psycopg2/devel .cvsignore, 1.9, 1.10 python-psycopg2.spec, 1.25, 1.26 sources, 1.9, 1.10
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: myoung
Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12829
Modified Files:
Tag: private-myoung-dom0-branch
.cvsignore kernel.spec sources upstream xen.pvops.patch
Added Files:
Tag: private-myoung-dom0-branch
patch-2.6.31-rc6.bz2.sign
Removed Files:
Tag: private-myoung-dom0-branch
drm-hush-vblank-warning.patch drm-radeon-fixes.patch
linux-2.6-ppc-perfctr-oops-fix.patch
patch-2.6.31-rc5-git3.bz2.sign patch-2.6.31-rc5.bz2.sign
revert-ftrace-powerpc-snafu.patch
Log Message:
Another pvops update, and add "perf" to the list of source files so it builds
--- NEW FILE patch-2.6.31-rc6.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info
iD8DBQBKhJwayGugalF9Dw4RApxAAJwPZmk4WG9CYJYy3TctvpzcXYj2NwCdFzAJ
A1H1MYHBR0WF6zAO81Pd830=
=W6Px
-----END PGP SIGNATURE-----
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.1014.2.22
retrieving revision 1.1014.2.23
diff -u -p -r1.1014.2.22 -r1.1014.2.23
--- .cvsignore 5 Aug 2009 23:00:08 -0000 1.1014.2.22
+++ .cvsignore 14 Aug 2009 18:31:25 -0000 1.1014.2.23
@@ -5,5 +5,4 @@ kernel-2.6.*.config
temp-*
kernel-2.6.30
linux-2.6.30.tar.bz2
-patch-2.6.31-rc5.bz2
-patch-2.6.31-rc5-git3.bz2
+patch-2.6.31-rc6.bz2
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1294.2.51
retrieving revision 1.1294.2.52
diff -u -p -r1.1294.2.51 -r1.1294.2.52
--- kernel.spec 13 Aug 2009 21:26:09 -0000 1.1294.2.51
+++ kernel.spec 14 Aug 2009 18:31:25 -0000 1.1294.2.52
@@ -60,9 +60,9 @@ Summary: The Linux kernel
# The next upstream release sublevel (base_sublevel+1)
%define upstream_sublevel %(echo $((%{base_sublevel} + 1)))
# The rc snapshot level
-%define rcrev 5
+%define rcrev 6
# The git snapshot level
-%define gitrev 3
+%define gitrev 0
# Set rpm version accordingly
%define rpmversion 2.6.%{upstream_sublevel}
%endif
@@ -544,6 +544,8 @@ Source90: config-sparc64-generic
Source100: config-arm
+Source999: perf
+
# Here should be only the patches up to the upstream canonical Linus tree.
# For a stable release kernel
@@ -591,8 +593,6 @@ Patch05: linux-2.6-makefile-after_link.p
%if !%{nopatches}
-# revert powerpc breakage
-Patch08: revert-ftrace-powerpc-snafu.patch
# revert upstream patches we get via other methods
Patch09: linux-2.6-upstream-reverts.patch
# Git trees.
@@ -617,7 +617,6 @@ Patch141: linux-2.6-ps3-storage-alias.pa
Patch143: linux-2.6-g5-therm-shutdown.patch
Patch144: linux-2.6-vio-modalias.patch
Patch147: linux-2.6-imac-transparent-bridge.patch
-Patch148: linux-2.6-ppc-perfctr-oops-fix.patch
Patch150: linux-2.6.29-sparc-IOC_TYPECHECK.patch
@@ -678,7 +677,6 @@ Patch1551: linux-2.6-ksm-kvm.patch
Patch1552: linux-2.6-ksm-updates.patch
# nouveau + drm fixes
-Patch1810: drm-radeon-fixes.patch
Patch1813: drm-radeon-pm.patch
Patch1814: drm-nouveau.patch
Patch1818: drm-i915-resume-force-mode.patch
@@ -688,7 +686,6 @@ Patch1821: drm-page-flip.patch
Patch1824: drm-intel-next.patch
Patch1825: drm-intel-pm.patch
Patch1826: drm-r600-kms.patch
-Patch1827: drm-hush-vblank-warning.patch
# vga arb
Patch1900: linux-2.6-vga-arb.patch
@@ -1127,7 +1124,6 @@ ApplyOptionalPatch linux-2.6-compile-fix
# revert patches from upstream that conflict or that we get via other means
ApplyOptionalPatch linux-2.6-upstream-reverts.patch -R
-ApplyPatch revert-ftrace-powerpc-snafu.patch
#ApplyPatch git-cpufreq.patch
#ApplyPatch git-bluetooth.patch
@@ -1171,8 +1167,6 @@ ApplyPatch linux-2.6-g5-therm-shutdown.p
ApplyPatch linux-2.6-vio-modalias.patch
# Work around PCIe bridge setup on iSight
ApplyPatch linux-2.6-imac-transparent-bridge.patch
-# Fix oops in 7450 perfctr
-ApplyPatch linux-2.6-ppc-perfctr-oops-fix.patch
#
# SPARC64
@@ -1301,7 +1295,7 @@ ApplyPatch hid-ignore-all-recent-imon-de
ApplyPatch linux-2.6-ksm.patch
ApplyPatch linux-2.6-ksm-updates.patch
# Optimize KVM for KSM support
-ApplyPatch linux-2.6-ksm-kvm.patch
+#ApplyPatch linux-2.6-ksm-kvm.patch
# Fix block I/O errors in KVM
ApplyPatch linux-2.6-block-silently-error-unsupported-empty-barriers-too.patch
@@ -1309,9 +1303,7 @@ ApplyPatch linux-2.6-block-silently-erro
ApplyPatch linux-2.6-e1000-ich9.patch
# Nouveau DRM + drm fixes
-ApplyPatch drm-radeon-fixes.patch
ApplyPatch drm-r600-kms.patch
-ApplyPatch drm-hush-vblank-warning.patch
ApplyPatch drm-nouveau.patch
# pm broken on my thinkpad t60p - airlied
@@ -1319,7 +1311,7 @@ ApplyPatch drm-nouveau.patch
ApplyPatch drm-i915-resume-force-mode.patch
ApplyPatch drm-intel-big-hammer.patch
ApplyPatch drm-page-flip.patch
-ApplyPatch drm-intel-next.patch
+#ApplyPatch drm-intel-next.patch
ApplyPatch drm-intel-pm.patch
# VGA arb + drm
@@ -1986,6 +1978,13 @@ fi
# and build.
%changelog
+* Fri Aug 14 2009 Michael Young <m.a.young at durham.ac.uk>
+- another rebase/master update
+- make perf a Source file so the kernel builds
+
+* Fri Aug 14 2009 Dave Jones <davej at redhat.com> 2.6.31-0.155.rc6
+- 2.6.31-rc6
+
* Thu Aug 13 2009 Michael Young <m.a.young at durham.ac.uk>
- add another rebase/master update
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.976.2.23
retrieving revision 1.976.2.24
diff -u -p -r1.976.2.23 -r1.976.2.24
--- sources 5 Aug 2009 23:00:18 -0000 1.976.2.23
+++ sources 14 Aug 2009 18:31:26 -0000 1.976.2.24
@@ -1,3 +1,2 @@
7a80058a6382e5108cdb5554d1609615 linux-2.6.30.tar.bz2
-09d608a6f10801d34097d0e127e36d5b patch-2.6.31-rc5.bz2
-6bc3320216b43bd8ce98e5f0565b485f patch-2.6.31-rc5-git3.bz2
+056ab6d753725f14d2d44eec2c1f471f patch-2.6.31-rc6.bz2
Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.888.2.22
retrieving revision 1.888.2.23
diff -u -p -r1.888.2.22 -r1.888.2.23
--- upstream 5 Aug 2009 23:00:18 -0000 1.888.2.22
+++ upstream 14 Aug 2009 18:31:26 -0000 1.888.2.23
@@ -1,3 +1,2 @@
linux-2.6.30.tar.bz2
-patch-2.6.31-rc5.bz2
-patch-2.6.31-rc5-git3.bz2
+patch-2.6.31-rc6.bz2
xen.pvops.patch:
arch/x86/Kconfig | 4
arch/x86/include/asm/agp.h | 15
arch/x86/include/asm/e820.h | 2
arch/x86/include/asm/i387.h | 1
arch/x86/include/asm/io.h | 15
arch/x86/include/asm/io_apic.h | 7
arch/x86/include/asm/microcode.h | 9
arch/x86/include/asm/paravirt.h | 718 -------------
arch/x86/include/asm/paravirt_types.h | 722 +++++++++++++
arch/x86/include/asm/pci.h | 8
arch/x86/include/asm/pci_x86.h | 2
arch/x86/include/asm/pgtable.h | 3
arch/x86/include/asm/processor.h | 4
arch/x86/include/asm/tlbflush.h | 6
arch/x86/include/asm/xen/hypercall.h | 36
arch/x86/include/asm/xen/interface.h | 8
arch/x86/include/asm/xen/interface_32.h | 5
arch/x86/include/asm/xen/interface_64.h | 13
arch/x86/include/asm/xen/iommu.h | 12
arch/x86/include/asm/xen/page.h | 16
arch/x86/include/asm/xen/pci.h | 13
arch/x86/kernel/Makefile | 1
arch/x86/kernel/acpi/boot.c | 18
arch/x86/kernel/acpi/sleep.c | 2
arch/x86/kernel/apic/io_apic.c | 37
arch/x86/kernel/cpu/mtrr/Makefile | 1
arch/x86/kernel/cpu/mtrr/amd.c | 6
arch/x86/kernel/cpu/mtrr/centaur.c | 6
arch/x86/kernel/cpu/mtrr/cyrix.c | 6
arch/x86/kernel/cpu/mtrr/generic.c | 10
arch/x86/kernel/cpu/mtrr/main.c | 19
arch/x86/kernel/cpu/mtrr/mtrr.h | 11
arch/x86/kernel/cpu/mtrr/xen.c | 104 +
arch/x86/kernel/e820.c | 30
arch/x86/kernel/ioport.c | 29
arch/x86/kernel/microcode_core.c | 5
arch/x86/kernel/microcode_xen.c | 200 +++
arch/x86/kernel/paravirt.c | 1
arch/x86/kernel/pci-dma.c | 3
arch/x86/kernel/pci-swiotlb.c | 30
arch/x86/kernel/process.c | 27
arch/x86/kernel/process_32.c | 27
arch/x86/kernel/process_64.c | 33
arch/x86/kernel/setup.c | 4
arch/x86/kernel/traps.c | 33
arch/x86/mm/init_32.c | 42
arch/x86/mm/pat.c | 2
arch/x86/mm/pgtable.c | 10
arch/x86/mm/tlb.c | 35
arch/x86/pci/Makefile | 1
arch/x86/pci/common.c | 18
arch/x86/pci/i386.c | 3
arch/x86/pci/init.c | 6
arch/x86/pci/xen.c | 51
arch/x86/xen/Kconfig | 33
arch/x86/xen/Makefile | 4
arch/x86/xen/apic.c | 60 +
arch/x86/xen/enlighten.c | 63 +
arch/x86/xen/mmu.c | 455 ++++++++
arch/x86/xen/pci-swiotlb.c | 53 +
arch/x86/xen/pci.c | 86 +
arch/x86/xen/setup.c | 50
arch/x86/xen/smp.c | 2
arch/x86/xen/time.c | 2
arch/x86/xen/vga.c | 67 +
arch/x86/xen/xen-ops.h | 19
block/blk-core.c | 2
drivers/acpi/acpica/hwsleep.c | 17
drivers/acpi/sleep.c | 19
drivers/block/Kconfig | 1
drivers/char/agp/intel-agp.c | 17
drivers/char/hvc_xen.c | 99 +
drivers/net/Kconfig | 1
drivers/pci/Makefile | 2
drivers/pci/pci.h | 2
drivers/pci/xen-iommu.c | 332 ++++++
drivers/xen/Kconfig | 32
drivers/xen/Makefile | 18
drivers/xen/acpi.c | 23
drivers/xen/balloon.c | 152 ++
drivers/xen/biomerge.c | 14
drivers/xen/blkback/Makefile | 3
drivers/xen/blkback/blkback.c | 658 ++++++++++++
drivers/xen/blkback/common.h | 137 ++
drivers/xen/blkback/interface.c | 182 +++
drivers/xen/blkback/vbd.c | 118 ++
drivers/xen/blkback/xenbus.c | 542 ++++++++++
drivers/xen/events.c | 322 +++++-
drivers/xen/grant-table.c | 103 +
drivers/xen/netback/Makefile | 3
drivers/xen/netback/common.h | 221 ++++
drivers/xen/netback/interface.c | 401 +++++++
drivers/xen/netback/netback.c | 1513 +++++++++++++++++++++++++++++
drivers/xen/netback/xenbus.c | 454 ++++++++
drivers/xen/pci.c | 116 ++
drivers/xen/xenbus/Makefile | 5
drivers/xen/xenbus/xenbus_comms.c | 1
drivers/xen/xenbus/xenbus_probe.c | 380 +------
drivers/xen/xenbus/xenbus_probe.h | 29
drivers/xen/xenbus/xenbus_probe_backend.c | 298 +++++
drivers/xen/xenbus/xenbus_probe_frontend.c | 292 +++++
drivers/xen/xenfs/Makefile | 3
drivers/xen/xenfs/privcmd.c | 403 +++++++
drivers/xen/xenfs/super.c | 98 +
drivers/xen/xenfs/xenfs.h | 3
drivers/xen/xenfs/xenstored.c | 67 +
include/asm-generic/pci.h | 2
include/linux/interrupt.h | 1
include/linux/page-flags.h | 18
include/linux/pci.h | 6
include/xen/Kbuild | 1
include/xen/acpi.h | 23
include/xen/balloon.h | 8
include/xen/blkif.h | 122 ++
include/xen/events.h | 27
include/xen/grant_table.h | 43
include/xen/interface/grant_table.h | 22
include/xen/interface/memory.h | 92 +
include/xen/interface/physdev.h | 21
include/xen/interface/platform.h | 222 ++++
include/xen/interface/xen.h | 43
include/xen/privcmd.h | 80 +
include/xen/swiotlb.h | 18
include/xen/xen-ops.h | 11
include/xen/xenbus.h | 2
kernel/irq/manage.c | 3
lib/swiotlb.c | 5
mm/page_alloc.c | 14
128 files changed, 9895 insertions(+), 1296 deletions(-)
Index: xen.pvops.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Attic/xen.pvops.patch,v
retrieving revision 1.1.2.32
retrieving revision 1.1.2.33
diff -u -p -r1.1.2.32 -r1.1.2.33
--- xen.pvops.patch 13 Aug 2009 18:13:04 -0000 1.1.2.32
+++ xen.pvops.patch 14 Aug 2009 18:31:26 -0000 1.1.2.33
@@ -1,5 +1,5 @@
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
-index 738bdc6..a619154 100644
+index 13ffa5d..ae6617b 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -1884,6 +1884,10 @@ config PCI_OLPC
@@ -7514,7 +7514,7 @@ index 0000000..650f4b3
+ (void)xenbus_register_backend(&blkback);
+}
diff --git a/drivers/xen/events.c b/drivers/xen/events.c
-index abad71b..2aed84f 100644
+index abad71b..8bcbf6b 100644
--- a/drivers/xen/events.c
+++ b/drivers/xen/events.c
@@ -16,7 +16,7 @@
@@ -7539,7 +7539,7 @@ index abad71b..2aed84f 100644
#include <asm/sync_bitops.h>
#include <asm/xen/hypercall.h>
#include <asm/xen/hypervisor.h>
-@@ -83,16 +85,16 @@ struct irq_info
+@@ -83,20 +85,25 @@ struct irq_info
enum ipi_vector ipi;
struct {
unsigned short gsi;
@@ -7561,7 +7561,17 @@ index abad71b..2aed84f 100644
struct cpu_evtchn_s {
unsigned long bits[NR_EVENT_CHANNELS/BITS_PER_LONG];
};
-@@ -106,6 +108,7 @@ static inline unsigned long *cpu_evtchn_mask(int cpu)
+-static struct cpu_evtchn_s *cpu_evtchn_mask_p;
++
++static __initdata struct cpu_evtchn_s init_evtchn_mask = {
++ .bits[0 ... (NR_EVENT_CHANNELS/BITS_PER_LONG)-1] = ~0ul,
++};
++static struct cpu_evtchn_s *cpu_evtchn_mask_p = &init_evtchn_mask;
++
+ static inline unsigned long *cpu_evtchn_mask(int cpu)
+ {
+ return cpu_evtchn_mask_p[cpu].bits;
+@@ -106,6 +113,7 @@ static inline unsigned long *cpu_evtchn_mask(int cpu)
#define VALID_EVTCHN(chn) ((chn) != 0)
static struct irq_chip xen_dynamic_chip;
@@ -7569,7 +7579,7 @@ index abad71b..2aed84f 100644
/* Constructor for packed IRQ information. */
static struct irq_info mk_unbound_info(void)
-@@ -218,6 +221,15 @@ static unsigned int cpu_from_evtchn(unsigned int evtchn)
+@@ -218,6 +226,15 @@ static unsigned int cpu_from_evtchn(unsigned int evtchn)
return ret;
}
@@ -7585,7 +7595,7 @@ index abad71b..2aed84f 100644
static inline unsigned long active_evtchns(unsigned int cpu,
struct shared_info *sh,
unsigned int idx)
-@@ -329,12 +341,24 @@ static void unmask_evtchn(int port)
+@@ -329,12 +346,24 @@ static void unmask_evtchn(int port)
put_cpu();
}
@@ -7611,7 +7621,7 @@ index abad71b..2aed84f 100644
if (irq_info[irq].type == IRQT_UNBOUND)
break;
-@@ -350,6 +374,213 @@ static int find_unbound_irq(void)
+@@ -350,6 +379,213 @@ static int find_unbound_irq(void)
return irq;
}
@@ -7825,7 +7835,7 @@ index abad71b..2aed84f 100644
int bind_evtchn_to_irq(unsigned int evtchn)
{
int irq;
-@@ -409,8 +640,23 @@ static int bind_ipi_to_irq(unsigned int ipi, unsigned int cpu)
+@@ -409,8 +645,23 @@ static int bind_ipi_to_irq(unsigned int ipi, unsigned int cpu)
return irq;
}
@@ -7843,14 +7853,14 @@ index abad71b..2aed84f 100644
+
+ return err ? : bind_evtchn_to_irq(bind_interdomain.local_port);
+}
-+
-static int bind_virq_to_irq(unsigned int virq, unsigned int cpu)
++
+int bind_virq_to_irq(unsigned int virq, unsigned int cpu)
{
struct evtchn_bind_virq bind_virq;
int evtchn, irq;
-@@ -501,6 +747,29 @@ int bind_evtchn_to_irqhandler(unsigned int evtchn,
+@@ -501,6 +752,29 @@ int bind_evtchn_to_irqhandler(unsigned int evtchn,
}
EXPORT_SYMBOL_GPL(bind_evtchn_to_irqhandler);
@@ -7880,7 +7890,7 @@ index abad71b..2aed84f 100644
int bind_virq_to_irqhandler(unsigned int virq, unsigned int cpu,
irq_handler_t handler,
unsigned long irqflags, const char *devname, void *dev_id)
-@@ -532,6 +801,7 @@ int bind_ipi_to_irqhandler(enum ipi_vector ipi,
+@@ -532,6 +806,7 @@ int bind_ipi_to_irqhandler(enum ipi_vector ipi,
if (irq < 0)
return irq;
@@ -7888,7 +7898,7 @@ index abad71b..2aed84f 100644
retval = request_irq(irq, handler, irqflags, devname, dev_id);
if (retval != 0) {
unbind_from_irq(irq);
-@@ -924,13 +1194,38 @@ static struct irq_chip xen_dynamic_chip __read_mostly = {
+@@ -924,13 +1199,38 @@ static struct irq_chip xen_dynamic_chip __read_mostly = {
.retrigger = retrigger_dynirq,
};
@@ -7928,7 +7938,7 @@ index abad71b..2aed84f 100644
init_evtchn_cpu_bindings();
-@@ -939,4 +1234,6 @@ void __init xen_init_IRQ(void)
+@@ -939,4 +1239,6 @@ void __init xen_init_IRQ(void)
mask_evtchn(i);
irq_ctx_init(smp_processor_id());
@@ -13700,7 +13710,7 @@ index b9763ba..542ca7c 100644
int (*read_otherend_details)(struct xenbus_device *dev);
int (*is_ready)(struct xenbus_device *dev);
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
-index 61c679d..c077438 100644
+index d222515..d5e2bb8 100644
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
@@ -200,7 +200,8 @@ static inline int setup_affinity(unsigned int irq, struct irq_desc *desc)
--- drm-hush-vblank-warning.patch DELETED ---
--- drm-radeon-fixes.patch DELETED ---
--- linux-2.6-ppc-perfctr-oops-fix.patch DELETED ---
--- patch-2.6.31-rc5-git3.bz2.sign DELETED ---
--- patch-2.6.31-rc5.bz2.sign DELETED ---
--- revert-ftrace-powerpc-snafu.patch DELETED ---
- Previous message (by thread): rpms/xrdp/EL-4 import.log, NONE, 1.1 xrdp.init, NONE, 1.1 xrdp.logrotate, NONE, 1.1 xrdp.spec, NONE, 1.1 xrdp.sysconfig, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message (by thread): rpms/python-psycopg2/devel .cvsignore, 1.9, 1.10 python-psycopg2.spec, 1.25, 1.26 sources, 1.9, 1.10
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list