debian-packaging
/
linux
8
0
Fork 0
Code Releases Activity

Updated changelog, added new series, removed non-applied patches, commented out non-applying ones, and updated the g3-750cxe patch. 

svn path=/dists/trunk/linux-2.6-2.6.14-rc4/; revision=4470
This commit is contained in:
Sven Luther 2005-10-16 08:34:08 +00:00
parent 7426446357
commit 87b2899f8f
5 changed files with 180 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
debian/changelog vendored
View File

@ -1,3 +1,11 @@
linux-2.6 (2.6.13+2.6.14-rc4-1) UNRELEASED; urgency=low
[ Sven Luther ]
* Temporary branch to sort stuff out locally, until we either upload this
one instead of 2.6.13-[23], or 2.6.14 is released.
-- Sven Luther <luther@debian.org> Sun, 16 Oct 2005 10:17:04 +0200
linux-2.6 (2.6.13-2) UNRELEASED; urgency=low
[ Jurij Smakov ]

119
debian/patches-debian/TODO vendored Normal file
View File

@ -0,0 +1,119 @@
Disabled because not applying cleanly, need investigating :
drivers-scsi-megaraid_splitup.patch
FAILS: 1 hunk (drivers/scsi/megaraid/Kconfig.megaraid)
ia64-irq-affinity-upfix.patch
FAILS 1 hunk (arch/ia64/kernel/irq.c)
remove-references-to-removed-drivers.patch
FAILS 1 hunk (drivers/usb/misc/Makefile)
powerpc-g4-l2-flush-errata.patch
FAILS 1 hunk (arch/ppc/kernel/l2cr.S)
Complete list of Mark Hymers (not all of those where still in use).
Applied upstream
================
amd64-tlb-flush-sigsegv-fix.patch
Git commit: bc5e8fdfc622b03acf5ac974a1b8b26da6511c99
kernel-api-documentation-generation-fix.diff
Git commit: 9d01a82e46a8dd18233121a6bc140e5576649583
m68k-sonic.patch
Git commit: efcce839360fb3a7b6dedeacaec80f68b0f2d052
mempolicy-check-mode.patch
Git commit: ba17101b41977f124948e0a7797fdcbb59e19f3e
powerpc-pmac-sound-check.patch
Git commit: 4e6a06eec46067df3c30fe1fbc2e1a7cc37b9678
powerpc-ppc64-biarch-override.patch
Git commit: 723e2b35e43dcbcfd737c40453caa7d198092d23
Not applied upstream
====================
amd64-int3-fix.patch
APPLIES Offset
drivers-scsi-megaraid_splitup.patch
FAILS: 1 hunk (drivers/scsi/megaraid/Kconfig.megaraid)
fbdev-radeon-noaccel.patch
APPLIES Offset
fs-asfs-2.patch
APPLIES Offset
ia64-irq-affinity-upfix.patch
FAILS 1 hunk (arch/ia64/kernel/irq.c)
m68k-42_dma.patch
APPLIES Offset
modular-ide.patch
APPLIES Offset
modular-ide-pnp.patch
APPLIES Offset
powerpc-apus.patch
APPLIES Offset
powerpc-apus-todo.patch
FAILS 1 hunk (include/video/vga.h)
powerpc-calibrate-tau.patch
APPLIES Offset + fuzz
powerpc-fix-power3-ftbfs.patch
APPLIES
powerpc-g3-750cxe.patch
Claims to already be applied
Looks like patch is confused as a different but similar model was added
powerpc-g4-l2-flush-errata.patch
FAILS 1 hunk (arch/ppc/kernel/l2cr.S)
powerpc-mkvmlinuz-support.patch
APPLIES
powerpc-mv643xx-hotplug-support.patch
APPLIES
powerpc-pmac-cache-power34-fix.patch
APPLIES
powerpc-serial-of.patch
FAILS 1 hunk ignored (arch/ppc64/kernel/setup.c)
This hunk claims to already be applied
powerpc-serial.patch
APPLIES Offset
qla2xxx-removed.patch
APPLIES Offset
remove-references-to-removed-drivers.patch
FAILS 1 hunk (drivers/usb/misc/Makefile)
sparc64-hme-lockup.patch
APPLIES
tty-locking-fixes9.patch
APPLIES
version.patch
APPLIES OFFSET
==============

79
debian/patches-debian/powerpc-g3-750cxe.patch vendored
View File

@ -8,37 +8,43 @@
. $(dirname $0)/DPATCH
@DPATCH@
--- linux-2.6.11.orig/arch/ppc/kernel/cputable.c 2005-03-02 08:38:09.000000000 +0100
+++ linux-2.6.11_nico/arch/ppc/kernel/cputable.c 2005-03-04 15:39:11.032975088 +0100
@@ -198,20 +198,6 @@
--- linux-2.6.14-rc1/arch/ppc/kernel/cputable.c 2005-09-14 08:14:43.672219560 +0200
+++ linux-2.6.14-rc1_nico/arch/ppc/kernel/cputable.c 2005-09-23 17:01:40.355003000 +0200
@@ -198,6 +198,7 @@
.num_pmcs = 4,
.cpu_setup = __setup_cpu_750
},
- { /* 745/755 */
- .pvr_mask = 0xfffff000,
- .pvr_value = 0x00083000,
- .cpu_name = "745/755",
- .cpu_features = CPU_FTR_COMMON |
- CPU_FTR_SPLIT_ID_CACHE | CPU_FTR_MAYBE_CAN_DOZE |
- CPU_FTR_USE_TB | CPU_FTR_L2CR | CPU_FTR_TAU |
- CPU_FTR_HPTE_TABLE | CPU_FTR_MAYBE_CAN_NAP,
- .cpu_user_features = COMMON_PPC,
- .icache_bsize = 32,
- .dcache_bsize = 32,
- .num_pmcs = 4,
- .cpu_setup = __setup_cpu_750
- },
+ // For the 750CX familly see: http://www-306.ibm.com/chips/techlib/techlib.nsf/techdocs/291C8D0EF3EAEC1687256B72005C745C#C1
{ /* 750CX (80100 and 8010x?) */
.pvr_mask = 0xfffffff0,
.pvr_value = 0x00080100,
@@ -254,6 +240,34 @@
@@ -212,10 +213,10 @@
.num_pmcs = 4,
.cpu_setup = __setup_cpu_750cx
},
+ { /* 750CXe (00082311 or 00083311) revision 3.1 / 3.1 pre_GA */
+ .pvr_mask = 0xffff0fff,
+ .pvr_value = 0x00080311,
+ .cpu_name = "750CXe rev 3.1",
- { /* 750CX (82201 and 82202) */
- .pvr_mask = 0xfffffff0,
- .pvr_value = 0x00082200,
- .cpu_name = "750CX",
+ { /* 750CXe (82202) */
+ .pvr_mask = 0xffffffff,
+ .pvr_value = 0x00082202,
+ .cpu_name = "750CXe rev 2.2",
.cpu_features = CPU_FTR_COMMON |
CPU_FTR_SPLIT_ID_CACHE | CPU_FTR_MAYBE_CAN_DOZE |
CPU_FTR_USE_TB | CPU_FTR_L2CR | CPU_FTR_TAU |
@@ -226,10 +227,24 @@
.num_pmcs = 4,
.cpu_setup = __setup_cpu_750cx
},
- { /* 750CXe (82214) */
- .pvr_mask = 0xfffffff0,
- .pvr_value = 0x00082210,
- .cpu_name = "750CXe",
+ { /* 750CXe (82214 & 82314) */
+ .pvr_mask = 0xfffff0ff,
+ .pvr_value = 0x00082214,
+ .cpu_name = "750CXe rev 2.4",
+ .cpu_features = CPU_FTR_COMMON |
+ CPU_FTR_SPLIT_ID_CACHE | CPU_FTR_MAYBE_CAN_DOZE |
+ CPU_FTR_USE_TB | CPU_FTR_L2CR | CPU_FTR_TAU |
@ -49,10 +55,19 @@
+ .num_pmcs = 4,
+ .cpu_setup = __setup_cpu_750cx
+ },
+ { /* 745/755 */
+ .pvr_mask = 0xfffff000,
+ .pvr_value = 0x00083000,
+ .cpu_name = "745/755",
+ { /* 750CXe (00082311 or 00083311) revision 3.1 / 3.1 pre_GA */
+ .pvr_mask = 0xffff0fff,
+ .pvr_value = 0x00080311,
+ .cpu_name = "750CXe rev 3.1",
.cpu_features = CPU_FTR_COMMON |
CPU_FTR_SPLIT_ID_CACHE | CPU_FTR_MAYBE_CAN_DOZE |
CPU_FTR_USE_TB | CPU_FTR_L2CR | CPU_FTR_TAU |
@@ -243,7 +258,21 @@
{ /* 750CXe "Gekko" (83214) */
.pvr_mask = 0xffffffff,
.pvr_value = 0x00083214,
- .cpu_name = "750CXe",
+ .cpu_name = "750CXe 'Gekko'",
+ .cpu_features = CPU_FTR_COMMON |
+ CPU_FTR_SPLIT_ID_CACHE | CPU_FTR_MAYBE_CAN_DOZE |
+ CPU_FTR_USE_TB | CPU_FTR_L2CR | CPU_FTR_TAU |
@ -61,8 +76,12 @@
+ .icache_bsize = 32,
+ .dcache_bsize = 32,
+ .num_pmcs = 4,
+ .cpu_setup = __setup_cpu_750
+ .cpu_setup = __setup_cpu_750cx
+ },
{ /* 750FX rev 1.x */
.pvr_mask = 0xffffff00,
.pvr_value = 0x70000100,
+ { /* 750CX (82201 and 82202) */
+ .pvr_mask = 0xfffffff0,
+ .pvr_value = 0x00082200,
+ .cpu_name = "750CX",
.cpu_features = CPU_FTR_COMMON |
CPU_FTR_SPLIT_ID_CACHE | CPU_FTR_MAYBE_CAN_DOZE |
CPU_FTR_USE_TB | CPU_FTR_L2CR | CPU_FTR_TAU |

14
debian/patches-debian/series/2.6.13-1 → debian/patches-debian/series/2.6.13+2.6.14-rc4-1 vendored
View File

@ -1,28 +1,22 @@
+ patch-2.6.13.1
+ amd64-int3-fix.patch
+ drivers-scsi-megaraid_splitup.patch
#+ drivers-scsi-megaraid_splitup.patch
+ fbdev-radeon-noaccel.patch
+ fs-asfs-2.patch
+ ia64-irq-affinity-upfix.patch
#+ ia64-irq-affinity-upfix.patch
+ m68k-42_dma.patch
+ m68k-sonic.patch
+ modular-ide.patch
+ modular-ide-pnp.patch
+ powerpc-calibrate-tau.patch
+ powerpc-fix-power3-ftbfs.patch
+ powerpc-g3-750cxe.patch
+ powerpc-g4-l2-flush-errata.patch
#+ powerpc-g4-l2-flush-errata.patch
+ powerpc-mkvmlinuz-support.patch
+ powerpc-pmac-cache-power34-fix.patch
+ powerpc-serial.patch
+ qla2xxx-removed.patch
+ remove-references-to-removed-drivers.patch
#+ remove-references-to-removed-drivers.patch
+ sparc64-hme-lockup.patch
+ tty-locking-fixes9.patch
+ version.patch
+ powerpc-mv643xx-hotplug-support.patch
+ patch-2.6.13.2
+ amd64-tlb-flush-sigsegv-fix.patch
+ powerpc-apus.patch
+ patch-2.6.13.3
+ kernel-api-documentation-generation-fix.diff

1
debian/patches-debian/series/2.6.13-2 vendored
View File

@ -1 +0,0 @@
+ patch-2.6.13.4