* debian/changelog: Update to 2.6.17-rc6.
* debian/patches/series/0experimental.1: Remove merged patches. * debian/patches/mips-sb1-pass1fpu.patch, debian/patches/s390-arch-kernel-time.patch: Remove. svn path=/dists/trunk/linux-2.6/; revision=6784
This commit is contained in:
parent
227637e674
commit
924f695819
|
@ -1,4 +1,4 @@
|
|||
linux-2.6 (2.6.16+2.6.17-rc5-0experimental.1) UNRELEASED; urgency=low
|
||||
linux-2.6 (2.6.16+2.6.17-rc6-0experimental.1) UNRELEASED; urgency=low
|
||||
|
||||
[ Frederik Schüler ]
|
||||
* New upstream release candidate.
|
||||
|
@ -13,7 +13,7 @@ linux-2.6 (2.6.16+2.6.17-rc5-0experimental.1) UNRELEASED; urgency=low
|
|||
[ Kyle McMartin ]
|
||||
* [hppa] Disable CONFIG_DETECT_SOFTLOCKUP to fix pa8800 boot.
|
||||
|
||||
-- Bastian Blank <waldi@debian.org> Thu, 25 May 2006 14:13:12 +0200
|
||||
-- Bastian Blank <waldi@debian.org> Wed, 7 Jun 2006 00:09:08 +0200
|
||||
|
||||
linux-2.6 (2.6.16+2.6.17-rc3-0experimental.1) experimental; urgency=low
|
||||
|
||||
|
|
|
@ -1,11 +0,0 @@
|
|||
--- linux-orig/arch/mips/kernel/cpu-probe.c 2006-05-15 02:07:55.000000000 +0100
|
||||
+++ linux-work-stable/arch/mips/kernel/cpu-probe.c 2006-05-28 23:59:12.000000000 +0100
|
||||
@@ -652,7 +648,7 @@ static inline void cpu_probe_sibyte(stru
|
||||
case PRID_IMP_SB1:
|
||||
c->cputype = CPU_SB1;
|
||||
/* FPU in pass1 is known to have issues. */
|
||||
- if ((c->processor_id & 0xff) < 0x20)
|
||||
+ if ((c->processor_id & 0xff) < 0x02)
|
||||
c->options &= ~(MIPS_CPU_FPU | MIPS_CPU_32FPR);
|
||||
break;
|
||||
case PRID_IMP_SB1A:
|
|
@ -1,13 +0,0 @@
|
|||
diff --git a/arch/s390/kernel/time.c b/arch/s390/kernel/time.c
|
||||
index ce19ad4..07c203b 100644
|
||||
--- a/arch/s390/kernel/time.c
|
||||
+++ b/arch/s390/kernel/time.c
|
||||
@@ -272,7 +272,7 @@ static inline void stop_hz_timer(void)
|
||||
next = next_timer_interrupt();
|
||||
do {
|
||||
seq = read_seqbegin_irqsave(&xtime_lock, flags);
|
||||
- timer = (__u64 next) - (__u64 jiffies) + jiffies_64;
|
||||
+ timer = (__u64) next - (__u64) jiffies + jiffies_64;
|
||||
} while (read_seqretry_irqrestore(&xtime_lock, seq, flags));
|
||||
todval = -1ULL;
|
||||
/* Be careful about overflows. */
|
|
@ -21,6 +21,4 @@
|
|||
+ s390-drivers-ccw-uevent-modalias.patch
|
||||
+ s390-drivers-ccw-uevent-cleanup.patch
|
||||
+ mips-sb1-duart-tts.patch
|
||||
+ s390-arch-kernel-time.patch
|
||||
#FIXME + powerpc-mkvmlinuz-support-2.patch
|
||||
+ mips-sb1-pass1fpu.patch
|
||||
|
|
Loading…
Reference in New Issue