We (the -stable team) are announcing the release of the 2.6.22.14 kernel.
It fixes a bunch of issues, so any user of the 2.6.22 series is
encouraged to upgrade.I'll also be replying to this message with a copy of the patch between
2.6.22.13 and 2.6.22.14The updated 2.6.22.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.22.y.git
and can be browsed at the normal kernel.org git web browser:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-2.6.22.y.git;a=su...thanks,
greg k-h
--------
Makefile | 2
arch/i386/kernel/tsc.c | 5
drivers/i2c/busses/i2c-pasemi.c | 5
drivers/i2c/chips/eeprom.c | 37 ++++---
drivers/ide/pci/serverworks.c | 1
drivers/isdn/hardware/avm/b1.c | 28 ++---
drivers/isdn/hardware/avm/c4.c | 14 ++
drivers/net/forcedeth.c | 19 ++-
drivers/scsi/hptiop.c | 5
drivers/usb/core/hcd.h | 8 +
drivers/usb/core/hub.c | 15 ++
drivers/usb/host/ehci-hcd.c | 8 +
drivers/usb/serial/generic.c | 7 -
drivers/usb/serial/kobil_sct.c | 170 +++++++++++++--------------------
fs/ocfs2/aops.c | 24 ++++
include/linux/netlink.h | 2
ipc/mqueue.c | 6 -
kernel/futex_compat.c | 24 +++-
kernel/params.c | 15 +-
mm/page-writeback.c | 4
mm/shmem.c | 15 ++
mm/slub.c | 22 ----
net/ipv4/ipcomp.c | 3
net/ipv6/ipcomp6.c | 3
net/netfilter/nf_conntrack_proto_tcp.c | 38 +++----
net/netlink/af_netlink.c | 10 -
net/sched/cls_u32.c | 4
net/sched/sch_teql.c | 3
net/socket.c ...
diff --git a/Makefile b/Makefile
index 500f6a8..873c786 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
VERSION = 2
PATCHLEVEL = 6
SUBLEVEL = 22
-EXTRAVERSION = .13
+EXTRAVERSION = .14
NAME = Holy Dancing Manatees, Batman!# *DOCUMENTATION*
diff --git a/arch/i386/kernel/tsc.c b/arch/i386/kernel/tsc.c
index f64b81f..8e02ed6 100644
--- a/arch/i386/kernel/tsc.c
+++ b/arch/i386/kernel/tsc.c
@@ -122,7 +122,7 @@ unsigned long native_calculate_cpu_khz(void)
{
unsigned long long start, end;
unsigned long count;
- u64 delta64;
+ u64 delta64 = (u64)ULLONG_MAX;
int i;
unsigned long flags;@@ -134,6 +134,7 @@ unsigned long native_calculate_cpu_khz(void)
rdtscll(start);
mach_countup(&count);
rdtscll(end);
+ delta64 = min(delta64, (end - start));
}
/*
* Error: ECTCNEVERSET
@@ -144,8 +145,6 @@ unsigned long native_calculate_cpu_khz(void)
if (count <= 1)
goto err;- delta64 = end - start;
-
/* cpu freq too fast: */
if (delta64 > (1ULL<<32))
goto err;
diff --git a/drivers/i2c/busses/i2c-pasemi.c b/drivers/i2c/busses/i2c-pasemi.c
index 58e3271..dcf5dec 100644
--- a/drivers/i2c/busses/i2c-pasemi.c
+++ b/drivers/i2c/busses/i2c-pasemi.c
@@ -51,6 +51,7 @@ struct pasemi_smbus {
#define MRXFIFO_DATA_M 0x000000ff#define SMSTA_XEN 0x08000000
+#define SMSTA_MTN 0x00200000#define CTL_MRR 0x00000400
#define CTL_MTR 0x00000200
@@ -98,6 +99,10 @@ static unsigned int pasemi_smb_waitready(struct pasemi_smbus *smbus)
status = reg_read(smbus, REG_SMSTA);
}+ /* Got NACK? */
+ if (status & SMSTA_MTN)
+ return -ENXIO;
+
if (timeout < 0) {
dev_warn(&smbus->dev->dev, "Timeout, status 0x%08x\n", status);
reg_write(smbus, REG_SMSTA, status);
diff --git a/drivers/i2c/chips/eeprom.c b/drivers/i2c/chips/eeprom.c
index bfce13c..5ad36ab 100644
--- a/drivers/i2c/chips/eeprom.c
+++ b/drivers/i2c/chips/eeprom.c
@@ -125,13 +125,20 @@ static ssize_t eeprom_read(struct kobject *kobj...
Hi Greg,
I think this hunk in the 2.6.22.14 stable patch may be a mis-patch --
compared to Linus's current git -- the new code should be inserted below
the while loop that follows.Also see commit 9f96cb1e8bca179a92afa40dfc3c49990f1cfc71
Sven
-
But this one does rearrange things quite a bit and is not included. That
is why things look out of order compared to current git.
-
Hm, I'm confused. Why is this a mis-patch?
Care to send me a fix against 2.6.22.14 that solves this issue?
thanks,
greg k-h
-
The implementation in 2.6.22.14 is just divergent in from mainline's,
and looked peculiar in context of what some RT bugfix was doing.Sorry for the noise.
--
