login
Search
We (the -stable team) are announcing the release of the 2.6.23.8 kernel.
It contains a few serious security fixes, as well as a raft of other
bugfixes and stuff from the last 2.6.23.1 kernel release.Wait, what happened to versions 2.6.23.2 - 7 you might ask? Well, they
too are released, and I'll be responding to this message with those
individual changelogs and diffs. They corrispond to the different patch
groups that I sent out for review of the stable tree in order to handle
the huge number of overall patches. This way, if problems occur, it
will be easier for people to track down where the regression might have
happened.I'll also be replying to this message with a copy of the patch between
2.6.23.7 and 2.6.23.8The updated 2.6.23.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.23.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.23.y.git;a=su...thanks,
greg k-h
--------
Makefile | 2 +-
kernel/exit.c | 3 +--
net/ipv4/tcp_input.c | 5 +++++
3 files changed, 7 insertions(+), 3 deletions(-)Summary of changes from v2.6.23.7 to v2.6.23.8
==============================================Greg Kroah-Hartman (1):
Linux 2.6.23.8Ilpo Järvinen (1):
TCP: Make sure write_queue_from does not begin with NULL ptr (CVE-2007-5501)Roland McGrath (1):
wait_task_stopped: Check p->exit_state instead of TASK_TRACED (CVE-2007-5500)-
We (the -stable team) are announcing the release of the 2.6.23.7 kernel.
It contains a number of bugfixes filesystem specific issus.I'll also be replying to this message with a copy of the patch between
2.6.23.6 and 2.6.23.7The updated 2.6.23.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.23.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.23.y.git;a=su...thanks,
greg k-h
--------
Makefile | 2 +-
fs/minix/itree_v1.c | 9 +++++++--
fs/minix/itree_v2.c | 9 +++++++--
fs/nfs/write.c | 17 +++++++++++++----
fs/ocfs2/aops.c | 22 ++++++++++++++++++++++
5 files changed, 50 insertions(+), 9 deletions(-)Summary of changes from v2.6.23.6 to v2.6.23.7
==============================================Eric Sandeen (1):
minixfs: limit minixfs printks on corrupted dir i_size (CVE-2006-6058)Greg Kroah-Hartman (1):
Linux 2.6.23.7Mark Fasheh (1):
ocfs2: fix write() performance regressionTrond Myklebust (1):
NFS: Fix a writeback race...-
diff --git a/Makefile b/Makefile
index 798ffe9..c0feac2 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
VERSION = 2
PATCHLEVEL = 6
SUBLEVEL = 23
-EXTRAVERSION = .6
+EXTRAVERSION = .7
NAME = Arr Matey! A Hairy Bilge Rat!# *DOCUMENTATION*
diff --git a/fs/minix/itree_v1.c b/fs/minix/itree_v1.c
index 1a5f3bf..82d6554 100644
--- a/fs/minix/itree_v1.c
+++ b/fs/minix/itree_v1.c
@@ -23,11 +23,16 @@ static inline block_t *i_data(struct inode *inode)
static int block_to_path(struct inode * inode, long block, int offsets[DEPTH])
{
int n = 0;
+ char b[BDEVNAME_SIZE];if (block < 0) {
- printk("minix_bmap: block<0\n");
+ printk("MINIX-fs: block_to_path: block %ld < 0 on dev %s\n",
+ block, bdevname(inode->i_sb->s_bdev, b));
} else if (block >= (minix_sb(inode->i_sb)->s_max_size/BLOCK_SIZE)) {
- printk("minix_bmap: block>big\n");
+ if (printk_ratelimit())
+ printk("MINIX-fs: block_to_path: "
+ "block %ld too big on dev %s\n",
+ block, bdevname(inode->i_sb->s_bdev, b));
} else if (block < 7) {
offsets[n++] = block;
} else if ((block -= 7) < 512) {
diff --git a/fs/minix/itree_v2.c b/fs/minix/itree_v2.c
index ad8f0de..f230109 100644
--- a/fs/minix/itree_v2.c
+++ b/fs/minix/itree_v2.c
@@ -23,12 +23,17 @@ static inline block_t *i_data(struct inode *inode)
static int block_to_path(struct inode * inode, long block, int offsets[DEPTH])
{
int n = 0;
+ char b[BDEVNAME_SIZE];
struct super_block *sb = inode->i_sb;if (block < 0) {
- printk("minix_bmap: block<0\n");
+ printk("MINIX-fs: block_to_path: block %ld < 0 on dev %s\n",
+ block, bdevname(sb->s_bdev, b));
} else if (block >= (minix_sb(inode->i_sb)->s_max_size/sb->s_blocksize)) {
- printk("minix_bmap: block>big\n");
+ if (printk_ratelimit())
+ printk("MINIX-fs: block_to_path: "
+ "block %ld too big on dev %s\n",
+ block, bdevname(sb->s_bdev, b));
} else if (block < 7) {
...
We (the -stable team) are announcing the release of the 2.6.23.6 kernel.
It contains a number of bugfixes for drivers other than networking
(networking driver fixes were in 2.6.23.5).I'll also be replying to this message with a copy of the patch between
2.6.23.5 and 2.6.23.6The updated 2.6.23.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.23.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.23.y.git;a=su...thanks,
greg k-h
--------
Makefile | 2
drivers/acpi/sleep/main.c | 5 -
drivers/ata/ahci.c | 143 ++++++++++++++++++++++++++++++++
drivers/ata/libata-core.c | 9 +-
drivers/ata/libata-eh.c | 32 +++++--
drivers/char/drm/i915_irq.c | 2
drivers/char/drm/radeon_cp.c | 5 -
drivers/char/drm/radeon_drv.h | 1
drivers/char/moxa.c | 4
drivers/char/rocket.c | 14 ++-
drivers/hwmon/lm87.c | 4
drivers/hwmon/w83627hf.c | 78 +++++++++--------
drivers/ide/pci/cs5535.c | 2
drivers/ide/pci/serverworks.c | 1
drivers/ide/pci/siimage.c | 2
drivers/infiniband/core/uverbs_cmd.c | 8 +
drivers/infiniband/hw/mthca/mthca_cmd.c | 6 +
drivers/isdn/hardware/avm/b1.c | 28 ++----
drivers/isdn/hardware/avm/c4.c | 14 ++-
drivers/md/bitmap.c | 2
drivers/md/dm-delay.c | 2
drivers/md/dm.c | 4
drivers/md/raid5.c | 17 +++
drivers/pci/msi.c | 2
drivers/scsi/hptiop.c | 5 -
drivers/usb/core/hcd.h | 8 +
drivers/usb/core/hub.c | 15 +++
drivers/usb/co...
diff --git a/Makefile b/Makefile
index e11814e..798ffe9 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
VERSION = 2
PATCHLEVEL = 6
SUBLEVEL = 23
-EXTRAVERSION = .5
+EXTRAVERSION = .6
NAME = Arr Matey! A Hairy Bilge Rat!# *DOCUMENTATION*
diff --git a/drivers/acpi/sleep/main.c b/drivers/acpi/sleep/main.c
index 2cbb9aa..37b651e 100644
--- a/drivers/acpi/sleep/main.c
+++ b/drivers/acpi/sleep/main.c
@@ -170,8 +170,8 @@ static int acpi_pm_finish(suspend_state_t pm_state)
{
u32 acpi_state = acpi_target_sleep_state;- acpi_leave_sleep_state(acpi_state);
acpi_disable_wakeup_device(acpi_state);
+ acpi_leave_sleep_state(acpi_state);/* reset firmware waking vector */
acpi_set_firmware_waking_vector((acpi_physical_address) 0);
@@ -256,8 +256,8 @@ static int acpi_hibernation_enter(void)static void acpi_hibernation_finish(void)
{
- acpi_leave_sleep_state(ACPI_STATE_S4);
acpi_disable_wakeup_device(ACPI_STATE_S4);
+ acpi_leave_sleep_state(ACPI_STATE_S4);/* reset firmware waking vector */
acpi_set_firmware_waking_vector((acpi_physical_address) 0);
@@ -389,6 +389,7 @@ static void acpi_power_off(void)
/* acpi_sleep_prepare(ACPI_STATE_S5) should have already been called */
printk("%s called\n", __FUNCTION__);
local_irq_disable();
+ acpi_enable_wakeup_device(ACPI_STATE_S5);
acpi_enter_sleep_state(ACPI_STATE_S5);
}diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index c168203..d684208 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -41,6 +41,7 @@
#include <linux/interrupt.h>
#include <linux/dma-mapping.h>
#include <linux/device.h>
+#include <linux/dmi.h>
#include <scsi/scsi_host.h>
#include <scsi/scsi_cmnd.h>
#include <linux/libata.h>
@@ -231,6 +232,7 @@ static void ahci_freeze(struct ata_port *ap);
static void ahci_thaw(struct ata_port *ap);
static void ahci_error_handler(struct ata_port *ap);
static void ahci_vt8251_error_handler(struct ata_port *ap);
+sta...
We (the -stable team) are announcing the release of the 2.6.23.5 kernel.
It contains a number of bugfixes for networking drivers.I'll also be replying to this message with a copy of the patch between
2.6.23.4 and 2.6.23.5The updated 2.6.23.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.23.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.23.y.git;a=su...thanks,
greg k-h
--------
Makefile | 2
drivers/net/ehea/ehea_qmr.c | 20 ++-----
drivers/net/ehea/ehea_qmr.h | 2
drivers/net/forcedeth.c | 35 +++++++++---
drivers/net/pppol2tp.c | 25 ++++++---
drivers/net/skge.c | 90 +++++++++++++++++----------------
drivers/net/skge.h | 6 --
drivers/net/sky2.c | 87 +++++++++++++++++++++++++------
drivers/net/tg3.c | 10 ++-
drivers/net/wireless/ipw2100.c | 39 ++++++++++++++
drivers/net/wireless/ipw2100.h | 4 +
drivers/net/wireless/libertas/11d.c | 2
drivers/net/wireless/libertas/cmd.c | 6 --
drivers/net/wireless/libertas/wext.c | 8 +-
drivers/net/wireless/rtl8187_dev.c | 31 +++++------
drivers/net/wireless/zd1201.c | 4 -
drivers/net/wireless/zd1211rw/zd_usb.c | 7 +-
include/linux/pci_ids.h | 4 +
18 files changed, 260 insertions(+), 122 deletions(-)Summary of changes from v2.6.23.4 to v2.6.23.5
==============================================Al Viro (2):
libertas: more endianness breakage
libertas: fix endianness breakageAyaz Abdulla (1):
forcedeth: add MCP77 device IDsDan Williams (1):
ipw2100: send WEXT scan eventsGreg Kroah-Hartman (1):
Linux 2.6.23.5James Chapman (1):
Fix L2TP oopses.Jan-Bernd Themann (1...
diff --git a/Makefile b/Makefile
index 0c34409..e11814e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
VERSION = 2
PATCHLEVEL = 6
SUBLEVEL = 23
-EXTRAVERSION = .4
+EXTRAVERSION = .5
NAME = Arr Matey! A Hairy Bilge Rat!# *DOCUMENTATION*
diff --git a/drivers/net/ehea/ehea_qmr.c b/drivers/net/ehea/ehea_qmr.c
index c82e245..329a252 100644
--- a/drivers/net/ehea/ehea_qmr.c
+++ b/drivers/net/ehea/ehea_qmr.c
@@ -563,8 +563,7 @@ int ehea_destroy_qp(struct ehea_qp *qp)
int ehea_create_busmap( void )
{
u64 vaddr = EHEA_BUSMAP_START;
- unsigned long abs_max_pfn = 0;
- unsigned long sec_max_pfn;
+ unsigned long high_section_index = 0;
int i;/*
@@ -574,14 +573,10 @@ int ehea_create_busmap( void )
ehea_bmap.valid_sections = 0;for (i = 0; i < NR_MEM_SECTIONS; i++)
- if (valid_section_nr(i)) {
- sec_max_pfn = section_nr_to_pfn(i);
- if (sec_max_pfn > abs_max_pfn)
- abs_max_pfn = sec_max_pfn;
- ehea_bmap.valid_sections++;
- }
+ if (valid_section_nr(i))
+ high_section_index = i;- ehea_bmap.entries = abs_max_pfn / EHEA_PAGES_PER_SECTION + 1;
+ ehea_bmap.entries = high_section_index + 1;
ehea_bmap.vaddr = vmalloc(ehea_bmap.entries * sizeof(*ehea_bmap.vaddr));if (!ehea_bmap.vaddr)
@@ -593,6 +588,7 @@ int ehea_create_busmap( void )
if (pfn_valid(pfn)) {
ehea_bmap.vaddr[i] = vaddr;
vaddr += EHEA_SECTSIZE;
+ ehea_bmap.valid_sections++;
} else
ehea_bmap.vaddr[i] = 0;
}
@@ -637,7 +633,7 @@ int ehea_reg_kernel_mr(struct ehea_adapter *adapter, struct ehea_mr *mr)mr_len = ehea_bmap.valid_sections * EHEA_SECTSIZE;
- pt = kzalloc(EHEA_MAX_RPAGE * sizeof(u64), GFP_KERNEL);
+ pt = kzalloc(PAGE_SIZE, GFP_KERNEL);
if (!pt) {
ehea_error("no mem");
ret = -ENOMEM;
@@ -660,8 +656,8 @@ int ehea_reg_kernel_mr(struct ehea_adapter *adapter, struct ehea_mr *mr)
void *sectbase = __va(i << SECTION_SIZE_BITS);
unsigned long k = 0;- for (j = 0; j < (PAGES_PER_SECTION / EHEA_...
We (the -stable team) are announcing the release of the 2.6.23.4 kernel.
It contains a number of bugfixes for the core networking and wireless
code.I'll also be replying to this message with a copy of the patch between
2.6.23.3 and 2.6.23.4The updated 2.6.23.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.23.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.23.y.git;a=su...thanks,
greg k-h
--------
Makefile | 2
include/linux/netlink.h | 2
include/linux/skbuff.h | 3
include/net/9p/9p.h | 12 ++
include/net/sock.h | 10 +-
ipc/mqueue.c | 6 -
net/8021q/vlan.c | 5 +
net/ieee80211/ieee80211_crypt_tkip.c | 2
net/ieee80211/softmac/ieee80211softmac_wx.c | 2
net/ipv4/ipcomp.c | 3
net/ipv6/ipcomp6.c | 3
net/mac80211/ieee80211.c | 55 +++++++-----
net/mac80211/ieee80211_ioctl.c | 11 ++
net/mac80211/ieee80211_sta.c | 128 +++++++++++-----------------
net/netfilter/nf_conntrack_proto_tcp.c | 38 +++-----
net/netlink/af_netlink.c | 10 +-
net/sched/cls_u32.c | 4
net/sched/sch_api.c | 5 -
net/sched/sch_teql.c | 3
net/socket.c | 6 +
20 files changed, 168 insertions(+), 142 deletions(-)Summary of changes from v2.6.23.3 to v2.6.23.4
==============================================Andy Green (2):
mac80211: Improve sanity checks on injected packets
Add get_unaligned to ieee80211_get_radiotap_lenBill Moss (1):
mac80211: honor IW_SCAN_THIS_ES...
diff --git a/Makefile b/Makefile
index b0c2c32..0c34409 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
VERSION = 2
PATCHLEVEL = 6
SUBLEVEL = 23
-EXTRAVERSION = .3
+EXTRAVERSION = .4
NAME = Arr Matey! A Hairy Bilge Rat!# *DOCUMENTATION*
diff --git a/include/linux/netlink.h b/include/linux/netlink.h
index 83d8239..63af986 100644
--- a/include/linux/netlink.h
+++ b/include/linux/netlink.h
@@ -175,7 +175,7 @@ extern int netlink_unregister_notifier(struct notifier_block *nb);
/* finegrained unicast helpers: */
struct sock *netlink_getsockbyfilp(struct file *filp);
int netlink_attachskb(struct sock *sk, struct sk_buff *skb, int nonblock,
- long timeo, struct sock *ssk);
+ long *timeo, struct sock *ssk);
void netlink_detachskb(struct sock *sk, struct sk_buff *skb);
int netlink_sendskb(struct sock *sk, struct sk_buff *skb, int protocol);diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index a656cec..ed2c458 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -41,8 +41,7 @@
#define SKB_DATA_ALIGN(X) (((X) + (SMP_CACHE_BYTES - 1)) & \
~(SMP_CACHE_BYTES - 1))
#define SKB_WITH_OVERHEAD(X) \
- (((X) - sizeof(struct skb_shared_info)) & \
- ~(SMP_CACHE_BYTES - 1))
+ ((X) - SKB_DATA_ALIGN(sizeof(struct skb_shared_info)))
#define SKB_MAX_ORDER(X, ORDER) \
SKB_WITH_OVERHEAD((PAGE_SIZE << (ORDER)) - (X))
#define SKB_MAX_HEAD(X) (SKB_MAX_ORDER((X), 0))
diff --git a/include/net/9p/9p.h b/include/net/9p/9p.h
index 88884d3..7726ff4 100644
--- a/include/net/9p/9p.h
+++ b/include/net/9p/9p.h
@@ -412,6 +412,18 @@ int p9_idpool_check(int id, struct p9_idpool *p);int p9_error_init(void);
int p9_errstr2errno(char *, int);
+
+#ifdef CONFIG_SYSCTL
int __init p9_sysctl_register(void);
void __exit p9_sysctl_unregister(void);
+#else
+static inline int p9_sysctl_register(void)
+{
+ return 0;
+}
+static inline void p9_sysctl_unregister(void)
+{
+}
+#endif
+
#endif /* NET_9P_H */
diff --git a/in...
We (the -stable team) are announcing the release of the 2.6.23.3 kernel.
It contains a number of bugfixes for a number of architecture specific
issues.I'll also be replying to this message with a copy of the patch between
2.6.23.2 and 2.6.23.3The updated 2.6.23.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.23.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.23.y.git;a=su...thanks,
greg k-h
--------
Makefile | 2 -
arch/i386/boot/boot.h | 8 ++--
arch/i386/boot/header.S | 62 +++++++++++++++++++++++----------
arch/i386/boot/video-bios.c | 2 -
arch/i386/boot/video-vesa.c | 2 -
arch/i386/boot/video.c | 2 -
arch/i386/kernel/tsc.c | 5 +-
arch/i386/xen/enlighten.c | 57 ++++++++++++++++++++----------
arch/i386/xen/mmu.c | 29 +++++++++++++--
arch/i386/xen/multicalls.c | 29 +++++++++++++--
arch/i386/xen/multicalls.h | 3 +
arch/i386/xen/xen-ops.h | 1
arch/mips/mm/c-r4k.c | 21 +++++++++--
arch/powerpc/math-emu/math.c | 13 ++++--
arch/powerpc/platforms/cell/axon_msi.c | 4 +-
arch/sparc64/kernel/sys_sparc.c | 2 -
arch/sparc64/lib/xor.S | 12 +++---
arch/um/Makefile | 3 +
arch/um/include/common-offsets.h | 1
arch/um/include/sysdep-i386/stub.h | 3 -
arch/um/kernel/skas/clone.c | 1
arch/um/os-Linux/main.c | 1
arch/um/os-Linux/skas/mem.c | 1
arch/um/os-Linux/skas/process.c | 2 -
arch/um/os-Linux/start_up.c | 1
arch/um/os-Linux/tt.c | 1
arch/um/os-Linux/util.c | 38 ++++++++++++++++++++
ar...
[.4, .5, .6 and .7 follows after .2 and .3]
I've seen the bunch of patches posted for review - split to several
series. But - out of curiocity - what's the reason to roll each
series into each own stable release? Can't all .2...7 be combined
into a single release (not counting .8 wich contains urgent security
fixes)? (I mean, not with already rolled out stuff, but the original
reasoning for split-releasing them (as opposed to split-reviewing))Thanks.
/mjt
-
Is there something "sacred" about version numbers that we need to be
stingy with them as they are a finite resource? :)This way, we have specific, easy to identify points in the development
process to help users in case they report problems to let the developers
easily narrow down the potential problem.That, and I couldn't think of some other way to name the -rc patches, so
I used the minor version number. Because of that, I was forced to name
the final releases with the same minor number to keep everyone sane over
time.thanks,
greg k-h
-
diff --git a/Makefile b/Makefile
index c6d545c..b0c2c32 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
VERSION = 2
PATCHLEVEL = 6
SUBLEVEL = 23
-EXTRAVERSION = .2
+EXTRAVERSION = .3
NAME = Arr Matey! A Hairy Bilge Rat!# *DOCUMENTATION*
diff --git a/arch/i386/boot/boot.h b/arch/i386/boot/boot.h
index 20bab94..3eeb9e5 100644
--- a/arch/i386/boot/boot.h
+++ b/arch/i386/boot/boot.h
@@ -17,6 +17,8 @@
#ifndef BOOT_BOOT_H
#define BOOT_BOOT_H+#define STACK_SIZE 512 /* Minimum number of bytes for stack */
+
#ifndef __ASSEMBLY__#include <stdarg.h>
@@ -198,8 +200,6 @@ static inline int isdigit(int ch)
}/* Heap -- available for dynamic lists. */
-#define STACK_SIZE 512 /* Minimum number of bytes for stack */
-
extern char _end[];
extern char *HEAP;
extern char *heap_end;
@@ -216,9 +216,9 @@ static inline char *__get_heap(size_t s, size_t a, size_t n)
#define GET_HEAP(type, n) \
((type *)__get_heap(sizeof(type),__alignof__(type),(n)))-static inline int heap_free(void)
+static inline bool heap_free(size_t n)
{
- return heap_end-HEAP;
+ return (int)(heap_end-HEAP) >= (int)n;
}/* copy.S */
diff --git a/arch/i386/boot/header.S b/arch/i386/boot/header.S
index f3140e5..fff7059 100644
--- a/arch/i386/boot/header.S
+++ b/arch/i386/boot/header.S
@@ -173,7 +173,8 @@ ramdisk_size: .long 0 # its size in bytes
bootsect_kludge:
.long 0 # obsolete-heap_end_ptr: .word _end+1024 # (Header version 0x0201 or later)
+heap_end_ptr: .word _end+STACK_SIZE-512
+ # (Header version 0x0201 or later)
# space from here (exclusive) down to
# end of setup code can be used by setup
# for local heap purposes.
@@ -225,28 +226,53 @@ start_of_setup:
int $0x13
#endif-# We will have entered with %cs = %ds+0x20, normalize %cs so
-# it is on par with the other segments.
- pushw %ds
- pushw $setup2
- lretw
-
-setup2:
# Force %es = %ds
movw %ds, %ax
movw %ax, %es
cld-# Stack paranoia: align th...
We (the -stable team) are announcing the release of the 2.6.23.2 kernel.
It contains a number of bugfixes for the core kernel code.I'll also be replying to this message with a copy of the patch between
2.6.23.1 and 2.6.23.2The updated 2.6.23.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.23.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.23.y.git;a=su...thanks,
greg k-h
--------
Documentation/ja_JP/HOWTO | 84 ++++++++++++++++++++++++----------------------
Makefile | 2 -
block/ll_rw_blk.c | 8 +---
fs/locks.c | 11 ++++++
fs/proc/array.c | 6 ++-
fs/splice.c | 2 -
include/linux/blkdev.h | 2 -
include/linux/sched.h | 1
kernel/fork.c | 2 +
kernel/futex_compat.c | 27 ++++++++++----
kernel/lockdep.c | 10 ++---
kernel/params.c | 9 +++-
kernel/softlockup.c | 7 ++-
mm/filemap.c | 13 +------
mm/page-writeback.c | 4 +-
mm/shmem.c | 15 ++++++++
mm/slub.c | 22 ------------
17 files changed, 125 insertions(+), 100 deletions(-)Summary of changes from v2.6.23.1 to v2.6.23.2
==============================================Andrew Morton (1):
writeback: don't propagate AOP_WRITEPAGE_ACTIVATEChristoph Lameter (1):
SLUB: Fix memory leak by not reusing cpu_slabDave Young (1):
param_sysfs_builtin memchr argument fixDavid Miller (1):
Fix compat futex hangs.Frans Pop (1):
sched: keep utime/stime monotonicGreg Kroah-Hartman (1):
Linux 2.6.23.2Gregory Haskins (1):
lockdep: fix mismatched lockdep_depth/curr_chain_hashHugh Dickins (1):
fix tmpfs BUG and AOP_WRITEPAGE_ACTIVATEIngo Molnar (1):
fix the softlockup watchdog to actually workJ. B...
..
So what is the magic command to apply this patch successfully?
It keeps rejecting the Documentation/ja_JP/HOWTO updates here.
-
Hammer GIT coders into sensibility to add proper MIME headers
on these patch post. Then, perhaps, things will just work.
(and postmaster won't get tons of rejects..)/Matti Aarnio -- one of <postmaster@vger.kernel.org>
-
GIT was only involved in creating the raw patch, which was then
compressed with gzip, then uncompressed and directly included in vim
into a raw email message when then mutt sent out.So, if the mime headers were wrong on the patch that I sent out, it is
mutts fault, not git.If you are trying to apply the patch directly from somewhere else, where
did it come from?thanks,
greg k-h
-
What is the proper encoding for a patch that contains hunks in
multiple character sets?--
Mathematics is the supreme nostalgia of our time.
-
8-bit binary encoding, the same for single charset patch - we don't
want mail systems to change the encoding.
Unfortunately you can't display anything like that inline I think.
That means email may be unreliable in such cases (except maybe when
both sides use UTF-8 and the patch contains only UTF-8), git/ftp/etc.
will be fine.
--
Krzysztof Halasa
-
That should only happen when we're fixing legacy crap to become UTF-8 --
and in that case, it's probably best to just handle it with a git-pull
rather than mailing patches around.Normally, we should see only UTF-8 in patches.
--
dwmw2-
diff --git a/Documentation/ja_JP/HOWTO b/Documentation/ja_JP/HOWTO
index 9f08dab..d9d832c 100644
--- a/Documentation/ja_JP/HOWTO
+++ b/Documentation/ja_JP/HOWTO
@@ -1,4 +1,4 @@
-NOTE:
+NOTE:
This is a version of Documentation/HOWTO translated into Japanese.
This document is maintained by Tsugikazu Shibata <tshibata@ab.jp.nec.com>
and the JF Project team <www.linux.or.jp/JF>.
@@ -11,14 +11,14 @@ for non English (read: Japanese) speakers and is not intended as a
fork. So if you have any comments or updates for this file, please try
to update the original English file first.-Last Updated: 2007/07/18
+Last Updated: 2007/09/23
==================================
ããã¯ã
-linux-2.6.22/Documentation/HOWTO
+linux-2.6.23/Documentation/HOWTO
ã®å訳ã§ãã翻訳å£ä½ï¼ JF ããã¸ã§ã¯ã < http://www.linux.or.jp/JF/ >
-翻訳æ¥ï¼ 2007/07/16
+翻訳æ¥ï¼ 2007/09/19
翻訳è ï¼ Tsugikazu Shibata <tshibata at ab dot jp dot nec dot com>
æ ¡æ£è ï¼ æ¾åãã <nbh--mats at nifty dot com>
å°æ é å ¸ãã (Masanori Kobayasi) <zap03216 at nifty dot ne dot jp>
@@ -27,6 +27,7 @@ linux-2.6.22/Documentation/HOWTO
éå£ãã (Kenji Noguchi) <tokyo246 at gmail dot com>
æ²³å ãã (Takayoshi Kochi) <t-kochi at bq dot jp dot nec dot com>
岩æ¬ãã (iwamoto) <iwamoto.kn at ncos dot nec dot co dot jp>
+ å ç°ãã (Satoshi Uchida) <s-uchida at ap dot jp dot nec dot com>
==================================Linux ã«ã¼ãã«éçºã®ããæ¹
@@ -40,7 +41,7 @@ Linux ã«ã¼ãã«éçºã³ãã¥ããã£ã¨å ±ã«æ´»åããããæ¹ãå¦ã
æå©...
diff --git a/Makefile b/Makefile
index c0feac2..435a3d7 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
VERSION = 2
PATCHLEVEL = 6
SUBLEVEL = 23
-EXTRAVERSION = .7
+EXTRAVERSION = .8
NAME = Arr Matey! A Hairy Bilge Rat!# *DOCUMENTATION*
diff --git a/kernel/exit.c b/kernel/exit.c
index 993369e..096c27d 100644
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -1362,8 +1362,7 @@ static int wait_task_stopped(struct task_struct *p, int delayed_group_leader,
int why = (p->ptrace & PT_PTRACED) ? CLD_TRAPPED : CLD_STOPPED;exit_code = p->exit_code;
- if (unlikely(!exit_code) ||
- unlikely(p->state & TASK_TRACED))
+ if (unlikely(!exit_code) || unlikely(p->exit_state))
goto bail_ref;
return wait_noreap_copyout(p, pid, uid,
why, (exit_code << 8) | 0x7f,
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index f893e90..c9298a7 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -1012,6 +1012,9 @@ tcp_sacktag_write_queue(struct sock *sk, struct sk_buff *ack_skb, u32 prior_snd_
if (before(TCP_SKB_CB(ack_skb)->ack_seq, prior_snd_una - tp->max_window))
return 0;+ if (!tp->packets_out)
+ goto out;
+
/* SACK fastpath:
* if the only SACK change is the increase of the end_seq of
* the first block then only apply that SACK block
@@ -1280,6 +1283,8 @@ tcp_sacktag_write_queue(struct sock *sk, struct sk_buff *ack_skb, u32 prior_snd_
(!tp->frto_highmark || after(tp->snd_una, tp->frto_highmark)))
tcp_update_reordering(sk, ((tp->fackets_out + 1) - reord), 0);+out:
+
#if FASTRETRANS_DEBUG > 0
BUG_TRAP((int)tp->sacked_out >= 0);
BUG_TRAP((int)tp->lost_out >= 0);
-
| Al Viro | Re: Dual-Licensing Linux Kernel with GPL V2 and GPL V3 |
| Greg KH | [2.6.22.2 review 05/84] Fix deadlocks in sparc serial console. |
| Linus Torvalds | Linux 2.6.27-rc8 |
| Greg Kroah-Hartman | [PATCH 006/196] Chinese: add translation of oops-tracing.txt |
git: | |
| Natalie Protasevich | [BUG] New Kernel Bugs |
| Jarek Poplawski | Re: [PATCH] pkt_sched: Destroy gen estimators under rtnl_lock(). |
| Linus Torvalds | Re: [GIT]: Networking |
| Gerrit Renker | [PATCH 0/37] dccp: Feature negotiation - last call for comments |
| Manuel Bouyer | Re: Interactive performance in -current |
| YAMAMOTO Takashi | Re: statvfs(2) replacement for statfs(2) patch |
| Nathan Langford | microkernels |
| Garrett D'Amore | Re: wsmux inject |
