MAINTAINERS | 2 +- Makefile | 2 +- arch/mips/Kbuild | 4 ++++ arch/mips/dec/Platform | 2 +- arch/mips/jz4740/Platform | 2 +- arch/mips/kernel/scall64-n32.S | 6 +++--- arch/mips/kernel/scall64-o32.S | 6 +++--- arch/x86/include/asm/kvm_host.h | 24 ------------------------ arch/x86/kvm/svm.c | 15 ++++++++++----- arch/x86/kvm/vmx.c | 24 +++++++++--------------- block/bsg.c | 2 +- drivers/char/virtio_console.c | 17 ++++++++++++++--- drivers/scsi/scsi.c | 4 ++-- drivers/serial/ioc3_serial.c | 1 + 14 files changed, 51 insertions(+), 60 deletions(-)
New commits: commit f6f94e2ab1b33f0082ac22d71f66385a60d8157f Author: Linus Torvalds <[email protected]> Date: Wed Oct 20 13:30:22 2010 -0700 Linux 2.6.36 commit 531295e63be8c2b8b909d7400739e8b8df60d61f Author: Amit Shah <[email protected]> Date: Wed Oct 20 13:45:43 2010 +1030 virtio: console: Don't block entire guest if host doesn't read data If the host is slow in reading data or doesn't read data at all, blocking write calls not only blocked the program that called write() but the entire guest itself. To overcome this, let's not block till the host signals it has given back the virtio ring element we passed it. Instead, send the buffer to the host and return to userspace. This operation then becomes similar to how non-blocking writes work, so let's use the existing code for this path as well. This code change also ensures blocking write calls do get blocked if there's not enough room in the virtio ring as well as they don't return -EAGAIN to userspace. Signed-off-by: Amit Shah <[email protected]> Acked-by: Hans de Goede <[email protected]> CC: [email protected] Signed-off-by: Rusty Russell <[email protected]> Signed-off-by: Linus Torvalds <[email protected]> commit e2cc502c3f71d8de812893527dc435e61b7fe604 Author: Michel Thebeau <[email protected]> Date: Tue Sep 28 14:15:37 2010 -0400 MIPS: O32 compat/N32: Fix to use compat syscall wrappers for AIO syscalls. [Ralf: Michel's original patch only fixed N32; I replicated the same fix for O32.] Signed-off-by: Michel Thebeau <[email protected]> Cc: [email protected] Cc: [email protected] Signed-off-by: Ralf Baechle <[email protected]> commit d39e072166493cbae3840ecfcf2b34bea0d2bebe Author: Ralf Baechle <[email protected]> Date: Tue Oct 19 18:32:41 2010 +0100 MAINTAINERS: Change list for ioc_serial to linux-serial. IOC3 is also being used on SGI MIPS systems but this particular driver is only being used on IA64 systems so linux-mips made no sense as a list. Pat also thinks [email protected] is the better list. Signed-off-by: Ralf Baechle <[email protected]> commit 6cc0cc4a35337b48e09c82c5f3fb83534884fca8 Author: Julia Lawall <[email protected]> Date: Fri Oct 15 15:00:09 2010 +0200 SERIAL: ioc3_serial: Return -ENOMEM on memory allocation failure In this code, 0 is returned on memory allocation failure, even though other failures return -ENOMEM or other similar values. A simplified version of the semantic match that finds this problem is as follows: (http://coccinelle.lip6.fr/) // <smpl> @@ expression ret; expression x,e1,e2,e3; @@ ret = 0 ... when != ret = e1 *x = \(kmalloc\|kcalloc\|kzalloc\)(...) ... when != ret = e2 if (x == NULL) { ... when != ret = e3 return ret; } // </smpl> Signed-off-by: Julia Lawall <[email protected]> To: Pat Gefre <[email protected]> Cc: [email protected] Cc: [email protected] Cc: [email protected] Cc: [email protected] Patchwork: https://patchwork.linux-mips.org/patch/1704/ Signed-off-by: Ralf Baechle <[email protected]> commit 08be7b2bc7393d5cf4beb00aecb5eb9e5cde5f85 Author: David Daney <[email protected]> Date: Mon Oct 18 18:05:49 2010 -0700 MIPS: jz4740: Fix Kbuild Platform file. The platform specific files should be included via the platform-y variable. Signed-off-by: David Daney <[email protected]> Cc: Lars-Peter Clausen <[email protected]> Patchwork: https://patchwork.linux-mips.org/patch/1719/ Signed-off-by: Ralf Baechle <[email protected]> commit ad4b2b627c8ac479e842bf586108c7a7fd63264b Author: David Daney <[email protected]> Date: Mon Oct 18 17:51:26 2010 -0700 MIPS: Repair Kbuild make clean breakage. When running make clean, Kbuild doesn't process the .config file, so nothing generates a platform-y variable. We can get it to descend into the platform directories by setting $(obj-). The dec Platform file was unconditionally setting platform-, obliterating its previous contents and preventing some directories from being cleaned. This is change to an append operation '+=' to allow cavium-octeon to be cleaned. Signed-off-by: David Daney <[email protected]> Cc: Sam Ravnborg <[email protected]> Patchwork: https://patchwork.linux-mips.org/patch/1718/ Signed-off-by: Ralf Baechle <[email protected]> commit 9581d442b9058d3699b4be568b6e5eae38a41493 Author: Avi Kivity <[email protected]> Date: Tue Oct 19 16:46:55 2010 +0200 KVM: Fix fs/gs reload oops with invalid ldt kvm reloads the host's fs and gs blindly, however the underlying segment descriptors may be invalid due to the user modifying the ldt after loading them. Fix by using the safe accessors (loadsegment() and load_gs_index()) instead of home grown unsafe versions. This is CVE-2010-3698. KVM-Stable-Tag. Signed-off-by: Avi Kivity <[email protected]> Signed-off-by: Marcelo Tosatti <[email protected]> commit 478971600e47cb83ff2d3c63c5c24f2b04b0d6a1 Author: FUJITA Tomonori <[email protected]> Date: Fri Sep 17 00:46:42 2010 +0900 [SCSI] bsg: fix incorrect device_status value bsg incorrectly returns sg's masked_status value for device_status. [jejb: fix up expression logic] Reported-by: Douglas Gilbert <[email protected]> Signed-off-by: FUJITA Tomonori <[email protected]> Cc: Stable Tree <[email protected]> Signed-off-by: James Bottomley <[email protected]> commit 16d3ea26f82271fef9b1c4523b5e1ea31fa39eec Author: Martin K. Petersen <[email protected]> Date: Fri Sep 10 01:20:27 2010 -0400 [SCSI] Fix VPD inquiry page wrapper Fix two bugs in the VPD page wrapper: - Don't return failure if the user asked for page 0 - The end of buffer check failed to account for the page header size and consequently didn't work Signed-off-by: Martin K. Petersen <[email protected]> Cc: Stable Tree <[email protected]> Signed-off-by: James Bottomley <[email protected]> http://suva.vyatta.com/git/?p=linux-vyatta.git;a=commitdiff;h=f6f94e2ab1b33f0082ac22d71f66385a60d8157f http://suva.vyatta.com/git/?p=linux-vyatta.git;a=commitdiff;h=531295e63be8c2b8b909d7400739e8b8df60d61f http://suva.vyatta.com/git/?p=linux-vyatta.git;a=commitdiff;h=e2cc502c3f71d8de812893527dc435e61b7fe604 http://suva.vyatta.com/git/?p=linux-vyatta.git;a=commitdiff;h=d39e072166493cbae3840ecfcf2b34bea0d2bebe http://suva.vyatta.com/git/?p=linux-vyatta.git;a=commitdiff;h=6cc0cc4a35337b48e09c82c5f3fb83534884fca8 http://suva.vyatta.com/git/?p=linux-vyatta.git;a=commitdiff;h=08be7b2bc7393d5cf4beb00aecb5eb9e5cde5f85 http://suva.vyatta.com/git/?p=linux-vyatta.git;a=commitdiff;h=ad4b2b627c8ac479e842bf586108c7a7fd63264b http://suva.vyatta.com/git/?p=linux-vyatta.git;a=commitdiff;h=9581d442b9058d3699b4be568b6e5eae38a41493 http://suva.vyatta.com/git/?p=linux-vyatta.git;a=commitdiff;h=478971600e47cb83ff2d3c63c5c24f2b04b0d6a1 http://suva.vyatta.com/git/?p=linux-vyatta.git;a=commitdiff;h=16d3ea26f82271fef9b1c4523b5e1ea31fa39eec _______________________________________________ svn mailing list [email protected] http://mailman.vyatta.com/mailman/listinfo/svn
