Menu
▾
▴
[LV-k25-commit] Linux for the VAX architecture: Changes to 'master'
|
From: Jan-Benedict G. <jb...@he...> - 2006-11-15 09:07:16
|
.gitignore | 1 Documentation/kernel-parameters.txt | 4 + Documentation/sound/alsa/ALSA-Configuration.txt | 2 MAINTAINERS | 10 +++ arch/i386/kernel/acpi/boot.c | 8 +++ arch/i386/kernel/acpi/earlyquirk.c | 8 ++- arch/i386/pci/irq.c | 4 - arch/ia64/Kconfig | 9 +++ arch/ia64/mm/hugetlbpage.c | 4 + arch/powerpc/Kconfig | 2 arch/powerpc/boot/wrapper | 4 - arch/powerpc/boot/zImage.lds.S | 5 + arch/powerpc/kernel/rtas_flash.c | 47 +++++++++++++---- arch/powerpc/mm/hugetlbpage.c | 8 ++- arch/powerpc/platforms/cell/spu_base.c | 41 ++++++++++++--- arch/x86_64/boot/setup.S | 5 - arch/x86_64/ia32/ptrace32.c | 2 arch/x86_64/kernel/e820.c | 4 + arch/x86_64/kernel/early-quirks.c | 8 +++ arch/x86_64/kernel/process.c | 3 - arch/x86_64/kernel/smp.c | 3 - arch/x86_64/kernel/time.c | 11 ---- arch/x86_64/kernel/vsyscall.c | 45 +++++++++------- arch/x86_64/mm/init.c | 15 +++++ arch/x86_64/pci/mmconfig.c | 32 ------------ block/scsi_ioctl.c | 2 drivers/ata/libata-core.c | 2 drivers/ata/libata-scsi.c | 2 drivers/ata/pata_artop.c | 2 drivers/ata/pata_hpt37x.c | 19 ++++++- drivers/block/cciss.c | 6 ++ drivers/block/cpqarray.c | 15 ++++- drivers/char/Kconfig | 8 --- drivers/char/ipmi/ipmi_msghandler.c | 4 - drivers/char/isicom.c | 3 - drivers/char/mspec.c | 8 ++- drivers/ide/ide-cd.c | 2 drivers/ide/legacy/hd.c | 2 drivers/infiniband/core/mad.c | 2 drivers/infiniband/hw/amso1100/c2.c | 3 - drivers/infiniband/hw/amso1100/c2_provider.c | 39 +++++++------- drivers/infiniband/hw/amso1100/c2_rnic.c | 4 - drivers/infiniband/hw/ehca/Kconfig | 1 drivers/infiniband/hw/ehca/ehca_av.c | 5 - drivers/infiniband/hw/ehca/ehca_hca.c | 17 +++--- drivers/infiniband/hw/ehca/ehca_irq.c | 17 +++--- drivers/infiniband/hw/ehca/ehca_iverbs.h | 8 +++ drivers/infiniband/hw/ehca/ehca_main.c | 56 +++++++++++++++++---- drivers/infiniband/hw/ehca/ehca_mrmw.c | 8 +-- drivers/infiniband/hw/ehca/ehca_qp.c | 10 +-- drivers/infiniband/hw/ehca/hipz_hw.h | 2 drivers/media/dvb/b2c2/flexcop-usb.c | 2 drivers/media/dvb/frontends/tda826x.c | 2 drivers/media/video/Kconfig | 2 drivers/media/video/bt8xx/bttv-cards.c | 2 drivers/media/video/cx88/cx88-input.c | 10 +++ drivers/media/video/saa7134/saa7134-cards.c | 5 + drivers/media/video/saa7134/saa7134-input.c | 11 +++- drivers/media/video/tveeprom.c | 2 drivers/mmc/mmc.c | 19 ++++++- drivers/net/arcnet/com20020.c | 7 +- drivers/net/bonding/bond_main.c | 5 + drivers/net/cris/eth_v10.c | 2 drivers/net/wireless/bcm43xx/bcm43xx_main.c | 22 +++++++- drivers/pci/pci-sysfs.c | 3 + drivers/pci/quirks.c | 27 ---------- drivers/scsi/scsi_scan.c | 18 +++++- drivers/serial/cpm_uart/cpm_uart.h | 2 drivers/serial/cpm_uart/cpm_uart_core.c | 16 +++--- drivers/serial/cpm_uart/cpm_uart_cpm1.c | 2 drivers/video/nvidia/nv_hw.c | 12 +++- drivers/video/nvidia/nv_setup.c | 20 ++++++- drivers/video/nvidia/nv_type.h | 1 drivers/video/nvidia/nvidia.c | 24 ++++----- fs/autofs/inode.c | 14 ++++- fs/autofs/waitq.c | 1 fs/autofs4/inode.c | 17 ++++++ fs/autofs4/waitq.c | 6 -- fs/cifs/file.c | 8 ++- fs/cifs/inode.c | 4 + fs/cifs/sess.c | 23 ++++---- fs/hugetlbfs/inode.c | 21 +++---- fs/xfs/Makefile-linux-2.6 | 17 ------ fs/xfs/linux-2.6/xfs_buf.c | 4 - fs/xfs/linux-2.6/xfs_dmapi_priv.h | 28 ++++++++++ fs/xfs/linux-2.6/xfs_ioctl.c | 5 + fs/xfs/linux-2.6/xfs_super.c | 4 - fs/xfs/support/debug.c | 4 - fs/xfs/support/move.c | 2 fs/xfs/support/move.h | 2 fs/xfs/xfs.h | 23 ++++++++ fs/xfs/xfs_dir2.c | 2 fs/xfs/xfs_dmapi.h | 22 -------- fs/xfs/xfs_iget.c | 51 +++++++++++++------ fs/xfs/xfs_inode.c | 64 ++++++++++-------------- fs/xfs/xfs_inode.h | 41 +++++++++++++++ fs/xfs/xfs_vnodeops.c | 33 +++++++----- include/asm-i386/acpi.h | 1 include/asm-ia64/sn/addrs.h | 6 +- include/asm-x86_64/acpi.h | 1 include/asm-x86_64/pda.h | 9 +++ include/asm-x86_64/vsyscall.h | 2 include/linux/hugetlb.h | 10 ++- include/linux/personality.h | 2 include/linux/vmalloc.h | 3 - include/net/ip_vs.h | 1 kernel/irq/manage.c | 9 ++- kernel/irq/spurious.c | 6 +- mm/mmap.c | 5 + mm/vmalloc.c | 26 ++++----- net/ipv4/ipvs/ip_vs_ftp.c | 2 net/ipv4/ipvs/ip_vs_proto_tcp.c | 2 net/ipv4/ipvs/ip_vs_proto_udp.c | 8 +-- scripts/kconfig/.gitignore | 2 sound/pci/hda/hda_intel.c | 8 +-- 115 files changed, 806 insertions(+), 441 deletions(-) New commits: commit 134a11f0c37c043d3ea557ea15b95b084e3cc2c8 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=134a11f0c37c043d3ea557ea15b95b084e3cc2c8 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=134a11f0c37c043d3ea557ea15b95b084e3cc2c8 Author: Takashi Iwai <ti...@su...> Date: Fri Nov 10 12:08:37 2006 +0100 [PATCH] ALSA: hda-intel - Disable MSI support by default Disable MSI support on HD-audio driver as default since there are too many broken devices. The module option is changed from disable_msi to enable_msi, too. For turning MSI support on, pass enable_msi=1, instead. Signed-off-by: Takashi Iwai <ti...@su...> Signed-off-by: Linus Torvalds <tor...@os...> commit c387fd85f84b9d89a75596325d8d6a0f730baf64 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=c387fd85f84b9d89a75596325d8d6a0f730baf64 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=c387fd85f84b9d89a75596325d8d6a0f730baf64 Author: Jiri Slaby <jir...@gm...> Date: Wed Nov 15 00:30:17 2006 +0100 [PATCH] Char: isicom, fix close bug port is dereferenced even if it is NULL. Dereference it _after_ the check if (!port)... Thanks Eric <ef...@ya...> for reporting this. This fixes http://bugzilla.kernel.org/show_bug.cgi?id=7527 Signed-off-by: Jiri Slaby <jir...@gm...> Signed-off-by: Linus Torvalds <tor...@os...> commit f5ad1a785f7fb9e6f65ba437ba0a64cad4e97dae gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=f5ad1a785f7fb9e6f65ba437ba0a64cad4e97dae gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=f5ad1a785f7fb9e6f65ba437ba0a64cad4e97dae Merge: 9a3a04ac386f44175b6a4142eaeab3d4170a57f3 9446868b5383eb87f76b2d4389dea4bb968a6657 Author: Linus Torvalds <tor...@wo...> Date: Tue Nov 14 15:23:17 2006 -0800 Merge branch 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6 * 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6: [PATCH] x86-64: Fix race in exit_idle [PATCH] x86-64: Fix vgetcpu when CONFIG_HOTPLUG_CPU is disabled [PATCH] x86: Add acpi_user_timer_override option for Asus boards [PATCH] x86-64: setup saved_max_pfn correctly (kdump) [PATCH] x86-64: Handle reserve_bootmem_generic beyond end_pfn [PATCH] x86-64: shorten the x86_64 boot setup GDT to what the comment says [PATCH] x86-64: Fix PTRACE_[SG]ET_THREAD_AREA regression with ia32 emulation. [PATCH] x86-64: Fix partial page check to ensure unusable memory is not being marked usable. Revert "[PATCH] MMCONFIG and new Intel motherboards" commit 9a3a04ac386f44175b6a4142eaeab3d4170a57f3 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=9a3a04ac386f44175b6a4142eaeab3d4170a57f3 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=9a3a04ac386f44175b6a4142eaeab3d4170a57f3 Author: Linus Torvalds <tor...@wo...> Date: Tue Nov 14 15:20:51 2006 -0800 Revert "[PATCH] fix Data Acess error in dup_fd" This reverts commit 0130b0b32ee53dc7add773fcea984f6a26ef1da3. Sergey Vlasov points out (and Vadim Lobanov concurs) that the bug it was supposed to fix must be some unrelated memory corruption, and the "fix" actually causes more problems: "However, the new code does not look safe in all cases. If some other task has opened more files while dup_fd() released oldf->file_lock, the new code will update open_files to the new larger value. But newf was allocated with the old smaller value of open_files, therefore subsequent accesses to newf may try to write into unallocated memory." so revert it. Cc: Sharyathi Nagesh <sha...@in...> Cc: Sergey Vlasov <vs...@al...> Cc: Vadim Lobanov <vlo...@sp...> Cc: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit dc791d479802a784836a236d4a77a5325be545c4 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=dc791d479802a784836a236d4a77a5325be545c4 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=dc791d479802a784836a236d4a77a5325be545c4 Merge: cd2579d7aa7bfc966cc271a88e77f8cfc3b0b7ba 253b92ecbd3d2e9f5a79fc7632c89ac74bff16c4 Author: Linus Torvalds <tor...@wo...> Date: Tue Nov 14 15:15:31 2006 -0800 Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev: libata: fix double-completion on error [PATCH] pata_artop: fix "& (1 >>" typo [PATCH] hpt37x: Check the enablebits commit cd2579d7aa7bfc966cc271a88e77f8cfc3b0b7ba gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=cd2579d7aa7bfc966cc271a88e77f8cfc3b0b7ba gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=cd2579d7aa7bfc966cc271a88e77f8cfc3b0b7ba Author: Hugh Dickins <hu...@ve...> Date: Tue Nov 14 13:43:38 2006 +0000 [PATCH] hugetlb: fix error return for brk() entering a hugepage region Commit cb07c9a1864a8eac9f3123e428100d5b2a16e65a causes the wrong return value. is_hugepage_only_range() is a boolean, so we should return -EINVAL rather than 1. Also - we can use "mm" instead of looking up "current->mm" again. Signed-off-by: Hugh Dickins <hu...@ve...> Signed-off-by: Linus Torvalds <tor...@os...> commit 1f794b6082a5ff88f7c48d1634056026acf806f4 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=1f794b6082a5ff88f7c48d1634056026acf806f4 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=1f794b6082a5ff88f7c48d1634056026acf806f4 Author: Jens Axboe <jen...@or...> Date: Tue Nov 14 12:36:45 2006 +0100 [PATCH] cpqarray: fix iostat cpqarray needs to call disk_stat_add() for iostat to work. Signed-off-by: Jens Axboe <jen...@or...> Signed-off-by: Linus Torvalds <tor...@os...> commit b369c2cfa47bc0ad495a95fe9a17c9888781d615 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=b369c2cfa47bc0ad495a95fe9a17c9888781d615 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=b369c2cfa47bc0ad495a95fe9a17c9888781d615 Author: Jens Axboe <jen...@or...> Date: Tue Nov 14 12:36:03 2006 +0100 [PATCH] cciss: fix iostat cciss needs to call disk_stat_add() for iostat to work. Signed-off-by: Jens Axboe <jen...@or...> Signed-off-by: Linus Torvalds <tor...@os...> commit a4625085445b86951d8482c0cdd6d52719f7c323 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=a4625085445b86951d8482c0cdd6d52719f7c323 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=a4625085445b86951d8482c0cdd6d52719f7c323 Author: Brian King <br...@us...> Date: Mon Nov 13 16:32:36 2006 -0600 [PATCH] libata: Convert from module_init to subsys_initcall When building a monolithic kernel, the load order of drivers does not work for SAS libata users, resulting in a kernel oops. Convert libata to use subsys_initcall instead of module_init, which ensures that libata gets loaded before any LLDD. This is the same thing that scsi core does to solve the problem. The load order problem was observed on ipr SAS adapters and should exist for other SAS users as well. Signed-off-by: Brian King <br...@us...> Acked-by: Jeff Garzik <jg...@po...> Signed-off-by: Linus Torvalds <tor...@os...> commit cb07c9a1864a8eac9f3123e428100d5b2a16e65a gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=cb07c9a1864a8eac9f3123e428100d5b2a16e65a gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=cb07c9a1864a8eac9f3123e428100d5b2a16e65a Author: David Gibson <da...@gi...> Date: Tue Nov 14 02:03:38 2006 -0800 [PATCH] hugetlb: check for brk() entering a hugepage region Unlike mmap(), the codepath for brk() creates a vma without first checking that it doesn't touch a region exclusively reserved for hugepages. On powerpc, this can allow it to create a normal page vma in a hugepage region, causing oopses and other badness. Add a test to prevent this. With this patch, brk() will simply fail if it attempts to move the break into a hugepage reserved region. Signed-off-by: David Gibson <da...@gi...> Cc: Adam Litke <ag...@us...> Cc: Hugh Dickins <hu...@ve...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 68589bc353037f233fe510ad9ff432338c95db66 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=68589bc353037f233fe510ad9ff432338c95db66 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=68589bc353037f233fe510ad9ff432338c95db66 Author: Hugh Dickins <hu...@ve...> Date: Tue Nov 14 02:03:32 2006 -0800 [PATCH] hugetlb: prepare_hugepage_range check offset too (David:) If hugetlbfs_file_mmap() returns a failure to do_mmap_pgoff() - for example, because the given file offset is not hugepage aligned - then do_mmap_pgoff will go to the unmap_and_free_vma backout path. But at this stage the vma hasn't been marked as hugepage, and the backout path will call unmap_region() on it. That will eventually call down to the non-hugepage version of unmap_page_range(). On ppc64, at least, that will cause serious problems if there are any existing hugepage pagetable entries in the vicinity - for example if there are any other hugepage mappings under the same PUD. unmap_page_range() will trigger a bad_pud() on the hugepage pud entries. I suspect this will also cause bad problems on ia64, though I don't have a machine to test it on. (Hugh:) prepare_hugepage_range() should check file offset alignment when it checks virtual address and length, to stop MAP_FIXED with a bad huge offset from unmapping before it fails further down. PowerPC should apply the same prepare_hugepage_range alignment checks as ia64 and all the others do. Then none of the alignment checks in hugetlbfs_file_mmap are required (nor is the check for too small a mapping); but even so, move up setting of VM_HUGETLB and add a comment to warn of what David Gibson discovered - if hugetlbfs_file_mmap fails before setting it, do_mmap_pgoff's unmap_region when unwinding from error will go the non-huge way, which may cause bad behaviour on architectures (powerpc and ia64) which segregate their huge mappings into a separate region of the address space. Signed-off-by: Hugh Dickins <hu...@ve...> Cc: "Luck, Tony" <ton...@in...> Cc: "David S. Miller" <da...@da...> Acked-by: Adam Litke <ag...@us...> Acked-by: David Gibson <da...@gi...> Cc: Paul Mackerras <pa...@sa...> Cc: Benjamin Herrenschmidt <be...@ke...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 69ae9e3ee4ce99140a7db424bebf55d8d180da2f gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=69ae9e3ee4ce99140a7db424bebf55d8d180da2f gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=69ae9e3ee4ce99140a7db424bebf55d8d180da2f Author: David Brownell <da...@pa...> Date: Tue Nov 14 02:03:31 2006 -0800 [PATCH] usb: MAINTAINERS updates Looks like I still take care of the USB gadget/peripheral framework. Signed-off-by: David Brownell <dbr...@us...> Acked-by: Greg KH <gr...@kr...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit d6e89cb6cd3a10eb203914093642f580c20476d4 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=d6e89cb6cd3a10eb203914093642f580c20476d4 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=d6e89cb6cd3a10eb203914093642f580c20476d4 Author: Nathan Lynch <nt...@po...> Date: Tue Nov 14 02:03:30 2006 -0800 [PATCH] nvidiafb: fix unreachable code in nv10GetConfig Fix binary/logical operator typo which leads to unreachable code. Noticed while looking at other issues; I don't have the relevant hardware to test this. Signed-off-by: Nathan Lynch <nt...@po...> Cc: "Antonino A. Daplas" <ad...@po...> Acked-by: James Simmons <jsi...@in...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit ba8df43c0ee93ec05fc526278a80aaf4cb5ab1fa gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=ba8df43c0ee93ec05fc526278a80aaf4cb5ab1fa gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=ba8df43c0ee93ec05fc526278a80aaf4cb5ab1fa Author: Ian Kent <ra...@th...> Date: Tue Nov 14 02:03:29 2006 -0800 [PATCH] autofs4: panic after mount fail Resolve the panic on failed mount of an autofs filesystem originally reported by Mao Bibo. It addresses two issues that happen after the mount fail. The first a NULL pointer reference to a field (pipe) in the autofs superblock info structure and second the lack of super block cleanup by the autofs and autofs4 modules. Signed-off-by: Ian Kent <ra...@th...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 6a34b57bec41c95f1e38f700cd9b81324baaffc7 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=6a34b57bec41c95f1e38f700cd9b81324baaffc7 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=6a34b57bec41c95f1e38f700cd9b81324baaffc7 Author: Nicolas Kaiser <ni...@ni...> Date: Tue Nov 14 02:03:28 2006 -0800 [PATCH] drivers/ide: stray bracket Stray bracket in debug code. Signed-off-by: Nicolas Kaiser <ni...@ni...> Cc: Alan Cox <al...@lx...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit d8f7975159f35846754d3845c9701b612c5c0624 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=d8f7975159f35846754d3845c9701b612c5c0624 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=d8f7975159f35846754d3845c9701b612c5c0624 Author: Andrew Morton <ak...@os...> Date: Tue Nov 14 02:03:26 2006 -0800 [PATCH] revert "PCI: quirk for IBM Dock II cardbus controllers" Fix http://bugzilla.kernel.org/show_bug.cgi?id=7264 We need to target this quirk a little more tightly, using the T20 DMI string. Cc: Pavel Kysilka <gol...@bs...> Acked-by: Kristen Carlson Accardi <kri...@in...> Cc: Greg Kroah-Hartman <gr...@su...> Cc: Dominik Brodowski <li...@do...> Cc: Daniel Ritz <dan...@gm...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit f3ac84324fd949f671e6cf5620add5de02498386 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=f3ac84324fd949f671e6cf5620add5de02498386 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=f3ac84324fd949f671e6cf5620add5de02498386 Author: Daniel Ritz <dan...@sw...> Date: Tue Nov 14 02:03:25 2006 -0800 [PATCH] fix via586 irq routing for pirq 5 Fix interrupt routing for via 586 bridges. pirq can be 5 which needs to be mapped to INTD. But currently the access functions can handle only pirq 1-4. this is similar to the other via chipsets where pirq 4 and 5 are both mapped to INTD. Fixes bugzilla #7490 Cc: Daniel Paschka <mon...@gm...> Cc: Adrian Bunk <bu...@su...> Signed-off-by: Daniel Ritz <dan...@gm...> Cc: <st...@ke...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 8b126b77536186eef69d408eb7959ce7f558f251 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=8b126b77536186eef69d408eb7959ce7f558f251 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=8b126b77536186eef69d408eb7959ce7f558f251 Author: Andrew Morton <ak...@os...> Date: Tue Nov 14 02:03:23 2006 -0800 [PATCH] setup_irq(): better mismatch debugging When we get a mismatch between handlers on the same IRQ, all we get is "IRQ handler type mismatch for IRQ n". Let's print the name of the presently-registered handler with which we got the mismatch. Cc: Ingo Molnar <mi...@el...> Cc: Thomas Gleixner <tg...@li...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 9446868b5383eb87f76b2d4389dea4bb968a6657 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=9446868b5383eb87f76b2d4389dea4bb968a6657 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=9446868b5383eb87f76b2d4389dea4bb968a6657 Author: Andi Kleen <ak...@su...> Date: Tue Nov 14 16:57:46 2006 +0100 [PATCH] x86-64: Fix race in exit_idle When another interrupt happens in exit_idle the exit idle notifier could be called an incorrect number of times. Add a test_and_clear_bit_pda and use it handle the bit atomically against interrupts to avoid this. Pointed out by Stephane Eranian Signed-off-by: Andi Kleen <ak...@su...> commit 8c131af1db510793f87dc43edbc8950a35370df3 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=8c131af1db510793f87dc43edbc8950a35370df3 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=8c131af1db510793f87dc43edbc8950a35370df3 Author: Andi Kleen <ak...@su...> Date: Tue Nov 14 16:57:46 2006 +0100 [PATCH] x86-64: Fix vgetcpu when CONFIG_HOTPLUG_CPU is disabled The vgetcpu per CPU initialization previously relied on CPU hotplug events for all CPUs to initialize the per CPU state. That only worked only on kernels with CONFIG_HOTPLUG_CPU enabled. On the others some CPUs didn't get their state initialized properly and vgetcpu wouldn't work. Change the initialization sequence to instead run in a normal initcall (which runs after the normal CPU bootup) and initialize all running CPUs there. Later hotplug CPUs are still handled with an hotplug notifier. This actually simplifies the code somewhat. Signed-off-by: Andi Kleen <ak...@su...> commit fa18f477d0987c011cce047a7c3cd1284f547a14 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=fa18f477d0987c011cce047a7c3cd1284f547a14 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=fa18f477d0987c011cce047a7c3cd1284f547a14 Author: Andi Kleen <ak...@su...> Date: Tue Nov 14 16:57:46 2006 +0100 [PATCH] x86: Add acpi_user_timer_override option for Asus boards Timer overrides are normally disabled on Nvidia board because they are commonly wrong, except on new ones with HPET support. Unfortunately there are quite some Asus boards around that don't have HPET, but need a timer override. We don't know yet how to handle this transparently, but at least add a command line option to force the timer override and let them boot. Cc: len...@in... Signed-off-by: Andi Kleen <ak...@su...> commit 15803a43288da434d34d41c4ed650c3c1728d42c gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=15803a43288da434d34d41c4ed650c3c1728d42c gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=15803a43288da434d34d41c4ed650c3c1728d42c Author: Magnus Damm <ma...@va...> Date: Tue Nov 14 16:57:46 2006 +0100 [PATCH] x86-64: setup saved_max_pfn correctly (kdump) x86_64: setup saved_max_pfn correctly 2.6.19-rc4 has broken CONFIG_CRASH_DUMP support on x86_64. It is impossible to read out the kernel contents from /proc/vmcore because saved_max_pfn is set to zero instead of the max_pfn value before the user map is setup. This happens because saved_max_pfn is initialized at parse_early_param() time, and at this time no active regions have been registered. save_max_pfn is setup from e820_end_of_ram(), more exact find_max_pfn_with_active_regions() which returns 0 because no regions exist. This patch fixes this by registering before and removing after the call to e820_end_of_ram(). Signed-off-by: Magnus Damm <ma...@va...> Signed-off-by: Andi Kleen <ak...@su...> commit 5e58a02a8f6a7a1c9ae41f39286bcd3aea0d6f24 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=5e58a02a8f6a7a1c9ae41f39286bcd3aea0d6f24 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=5e58a02a8f6a7a1c9ae41f39286bcd3aea0d6f24 Author: Andi Kleen <ak...@su...> Date: Tue Nov 14 16:57:46 2006 +0100 [PATCH] x86-64: Handle reserve_bootmem_generic beyond end_pfn This can happen on kexec kernels with some configurations, in particularly on Unisys ES7000 systems. Analysis by Amul Shah Cc: Amul Shah <amu...@un...> Signed-off-by: Andi Kleen <ak...@su...> commit 51d67a488b53a5cc8401460480c124eaec71e2d4 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=51d67a488b53a5cc8401460480c124eaec71e2d4 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=51d67a488b53a5cc8401460480c124eaec71e2d4 Author: Steven Rostedt <ro...@go...> Date: Tue Nov 14 16:57:46 2006 +0100 [PATCH] x86-64: shorten the x86_64 boot setup GDT to what the comment says Stephen Tweedie, Herbert Xu, and myself have been struggling with a very nasty bug in Xen. But it also pointed out a small bug in the x86_64 kernel boot setup. The GDT limit being setup by the initial bzImage code when entering into protected mode is way too big. The comment by the code states that the size of the GDT is 2048, but the actual size being set up is much bigger (32768). This happens simply because of one extra '0'. Instead of setting up a 0x800 size, 0x8000 is set up. On bare metal this is fine because the CPU wont load any segments unless they are explicitly used. But unfortunately, this breaks Xen on vmx FV, since it (for now) blindly loads all the segments into the VMCS if they are less than the gdt limit. Since the real mode segments are around 0x3000, we are getting junk into the VMCS and that later causes an exception. Stephen Tweedie has written up a patch to fix the Xen side and will be submitting that to those folks. But that doesn't excuse the GDT limit being a magnitude too big. AK: changed to compute true gdt size in assembler, fixed comment Signed-off-by: Steven Rostedt <ro...@go...> Signed-off-by: Andi Kleen <ak...@su...> commit 14679eb3c50897889ba62f9a37e3bcd8a205b5e7 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=14679eb3c50897889ba62f9a37e3bcd8a205b5e7 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=14679eb3c50897889ba62f9a37e3bcd8a205b5e7 Author: Andi Kleen <ak...@su...> Date: Tue Nov 14 16:57:46 2006 +0100 [PATCH] x86-64: Fix PTRACE_[SG]ET_THREAD_AREA regression with ia32 emulation. ptrace(PTRACE_[SG]ET_THREAD_AREA) calls from ia32 code should be passed onto the x86_64 implementation. The default case in sys32_ptrace used to call to sys_ptrace(), but is now EINVAL. This patch fixes a regression caused by that changed. Signed-off-by: Mike McCormack <mi...@co...> Signed-off-by: Andi Kleen <ak...@su...> commit 14f448e36192d6d2cd7dfd81cb044977b2f9dd9b gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=14f448e36192d6d2cd7dfd81cb044977b2f9dd9b gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=14f448e36192d6d2cd7dfd81cb044977b2f9dd9b Author: Aaron Durbin <ad...@go...> Date: Tue Nov 14 16:57:45 2006 +0100 [PATCH] x86-64: Fix partial page check to ensure unusable memory is not being marked usable. Fix partial page check in e820_register_active_regions to ensure partial pages are not being marked as active in the memory pool. Signed-off-by: Aaron Durbin <ad...@go...> Signed-off-by: Andi Kleen <ak...@su...> commit 64e72e41acae0dab733fb0d5d789b76d115210c0 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=64e72e41acae0dab733fb0d5d789b76d115210c0 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=64e72e41acae0dab733fb0d5d789b76d115210c0 Author: Andi Kleen <an...@ba...> Date: Tue Nov 14 16:56:33 2006 +0100 Revert "[PATCH] MMCONFIG and new Intel motherboards" This reverts 4c6e052adfe285ede5884e4e8c4d33af33932c13 commit. Following Linus' i386 change: revert resource reservation for mmcfg config now. Will be revisited in .20 hopefully. commit 253b92ecbd3d2e9f5a79fc7632c89ac74bff16c4 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=253b92ecbd3d2e9f5a79fc7632c89ac74bff16c4 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=253b92ecbd3d2e9f5a79fc7632c89ac74bff16c4 Author: Darrick J. Wong <dj...@us...> Date: Tue Nov 14 09:55:41 2006 -0500 libata: fix double-completion on error A curious thing happens, however, when ata_qc_new_init fails to get an ata_queued_cmd: First, ata_qc_new_init handles the failure like this: cmd->result = (DID_OK << 16) | (QUEUE_FULL << 1); done(cmd); Then, we return to ata_scsi_translate and do this: err_mem: cmd->result = (DID_ERROR << 16); done(cmd); It appears to me that first we set a status code indicating that we're ok but the device queue is full and finish the command, but then we blow away that status code and replace it with an error flag and finish the command a second time! That does not seem to be desirable behavior since we merely want the I/O to wait until a command slot frees up, not send errors up the block layer. In the err_mem case, we should simply exit out of ata_scsi_translate instead. Signed-off-by: Darrick J. Wong <dj...@us...> Signed-off-by: Jeff Garzik <je...@ga...> commit 3f9dd27a22ff79b6b6c4eccd19e4063bff0ddc7e gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=3f9dd27a22ff79b6b6c4eccd19e4063bff0ddc7e gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=3f9dd27a22ff79b6b6c4eccd19e4063bff0ddc7e Author: Alexey Dobriyan <ado...@op...> Date: Fri Nov 10 22:52:46 2006 +0300 [PATCH] pata_artop: fix "& (1 >>" typo Signed-off-by: Alexey Dobriyan <ado...@op...> Signed-off-by: Jeff Garzik <je...@ga...> commit b5bf24b94c65536d3cc2bf9039ab05b3967f7b7f gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=b5bf24b94c65536d3cc2bf9039ab05b3967f7b7f gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=b5bf24b94c65536d3cc2bf9039ab05b3967f7b7f Author: Alan Cox <al...@lx...> Date: Wed Nov 8 16:18:26 2006 +0000 [PATCH] hpt37x: Check the enablebits Helps for PATA but SATA bridged devices lie and always set all the bits so will need the error handling fixes from Tejun. Signed-off-by: Alan Cox <al...@re...> Signed-off-by: Jeff Garzik <je...@ga...> commit 0579e303553655245e8a6616bd8b4428b07d63a2 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=0579e303553655245e8a6616bd8b4428b07d63a2 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=0579e303553655245e8a6616bd8b4428b07d63a2 Merge: 0f66c08e9611b9a63f2f2fd5af0d12e486c4a02e 63ef731aa6a81e286de78dcc92241d123424ed39 Author: Linus Torvalds <tor...@g5...> Date: Mon Nov 13 11:50:28 2006 -0800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc: MMC: Do not set unsupported bits in OCR response MMC: Poll card status after rescanning cards commit 0f66c08e9611b9a63f2f2fd5af0d12e486c4a02e gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=0f66c08e9611b9a63f2f2fd5af0d12e486c4a02e gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=0f66c08e9611b9a63f2f2fd5af0d12e486c4a02e Merge: 4dd7406e9c7e7a5422425ef699780463490b8745 39798695b4bcc7b145f8910ca56195808d3a7637 Author: Linus Torvalds <tor...@g5...> Date: Mon Nov 13 09:52:04 2006 -0800 Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband * 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband: IB/mad: Fix race between cancel and receive completion RDMA/amso1100: Fix && typo RDMA/amso1100: Fix unitialized pseudo_netdev accessed in c2_register_device IB/ehca: Activate scaling code by default IB/ehca: Use named constant for max mtu IB/ehca: Assure 4K alignment for firmware control blocks commit 4dd7406e9c7e7a5422425ef699780463490b8745 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=4dd7406e9c7e7a5422425ef699780463490b8745 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=4dd7406e9c7e7a5422425ef699780463490b8745 Author: Linus Torvalds <tor...@g5...> Date: Mon Nov 13 09:50:11 2006 -0800 [dvb saa7134] Fix missing 'break' for avermedia card case Commit 450efcfd2e1d941e302a8c89322fbfcef237be98 broke Avermedia 777 support. Added obvious missing "break" statement. Cc: José Suárez <j.s...@gm...> Cc: Michael Krufky <mk...@li...> Cc: Mauro Carvalho Chehab <mc...@in...> Signed-off-by: Linus Torvalds <tor...@os...> commit b71567312976305cc1ce7e9b71e7378c8bfcb40f gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=b71567312976305cc1ce7e9b71e7378c8bfcb40f gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=b71567312976305cc1ce7e9b71e7378c8bfcb40f Author: Jens Axboe <jen...@or...> Date: Mon Nov 13 18:05:02 2006 +0100 [PATCH] ide-cd: only set rq->errors SCSI style for block pc requests We should only set ->errors to CHECK_CONDITION and so on for requests that use this field in the SCSI manner. Signed-off-by: Jens Axboe <jen...@or...> Signed-off-by: Linus Torvalds <tor...@os...> commit 616e8a091a035c0bd9b871695f4af191df123caa gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=616e8a091a035c0bd9b871695f4af191df123caa gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=616e8a091a035c0bd9b871695f4af191df123caa Author: Jens Axboe <jen...@or...> Date: Mon Nov 13 18:04:59 2006 +0100 [PATCH] Fix bad data direction in SG_IO Contrary to what the name misleads you to believe, SG_DXFER_TO_FROM_DEV is really just a normal read seen from the device side. This patch fixes http://lkml.org/lkml/2006/10/13/100 Signed-off-by: Jens Axboe <jen...@or...> Signed-off-by: Linus Torvalds <tor...@os...> commit 39798695b4bcc7b145f8910ca56195808d3a7637 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=39798695b4bcc7b145f8910ca56195808d3a7637 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=39798695b4bcc7b145f8910ca56195808d3a7637 Author: Roland Dreier <ro...@ci...> Date: Mon Nov 13 09:38:07 2006 -0800 IB/mad: Fix race between cancel and receive completion When ib_cancel_mad() is called, it puts the canceled send on a list and schedules a "flushed" callback from process context. However, this leaves a window where a receive completion could be processed before the send is fully flushed. This is fine, except that ib_find_send_mad() will find the MAD and return it to the receive processing, which results in the sender getting both a successful receive and a "flushed" send completion for the same request. Understandably, this confuses the sender, which is expecting only one of these two callbacks, and leads to grief such as a use-after-free in IPoIB. Fix this by changing ib_find_send_mad() to return a send struct only if the status is still successful (and not "flushed"). The search of the send_list already had this check, so this patch just adds the same check to the search of the wait_list. Signed-off-by: Roland Dreier <ro...@ci...> commit b26c791e9ca3365616d40836000285931ca033d0 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=b26c791e9ca3365616d40836000285931ca033d0 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=b26c791e9ca3365616d40836000285931ca033d0 Author: Jean Delvare <kh...@li...> Date: Thu Nov 9 21:02:26 2006 +0100 RDMA/amso1100: Fix && typo Fix the AMSO1100 firmware version computation, which was broken due to "&&" being used where "&" should have. Signed-off-by: Jean Delvare <kh...@li...> Signed-off-by: Roland Dreier <ro...@ci...> commit 2ffcab6ae44b02679229ca1852526d0a6e062dd2 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=2ffcab6ae44b02679229ca1852526d0a6e062dd2 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=2ffcab6ae44b02679229ca1852526d0a6e062dd2 Author: Tom Tucker <to...@op...> Date: Wed Nov 8 14:23:22 2006 -0600 RDMA/amso1100: Fix unitialized pseudo_netdev accessed in c2_register_device Rework some load-time error handling: c2_register_device() leaked when it failed, and the function that called it didn't check the return code. Signed-off-by: Tom Tucker <to...@op...> Signed-off-by: Roland Dreier <ro...@ci...> commit f2c238a0c5e155acd49752c5fb93fb8d8534232b gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=f2c238a0c5e155acd49752c5fb93fb8d8534232b gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=f2c238a0c5e155acd49752c5fb93fb8d8534232b Author: Hoang-Nam Nguyen <hn...@de...> Date: Sun Nov 5 21:42:20 2006 +0100 IB/ehca: Activate scaling code by default Change ehca's Kconfig to activates scaling code as default. After several measurements we saw that this feature prevents dropped packets (UD) in stress situation. Thus, enabling it helps to improve ehca's bandwidth through IPoIB. Signed-off-by: Hoang-Nam Nguyen <hn...@de...> Signed-off-by: Roland Dreier <ro...@ci...> commit c58121143f87930621c1a6fa9683b6862f2b42c9 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=c58121143f87930621c1a6fa9683b6862f2b42c9 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=c58121143f87930621c1a6fa9683b6862f2b42c9 Author: Hoang-Nam Nguyen <hn...@de...> Date: Sun Nov 5 21:42:56 2006 +0100 IB/ehca: Use named constant for max mtu Define and use a constant EHCA_MAX_MTU instead hardcoded value. Signed-off-by: Hoang-Nam Nguyen <hn...@de...> Signed-off-by: Roland Dreier <ro...@ci...> commit bf2b3de2a8e66e5f554c2113fac688bcaaca77fb gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=bf2b3de2a8e66e5f554c2113fac688bcaaca77fb gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=bf2b3de2a8e66e5f554c2113fac688bcaaca77fb Merge: 239fd45938f9ddf64f120e0260c7b76eb73bd5a7 6f36fbb242442184d314e305199bb9a449be4f67 Author: Linus Torvalds <tor...@g5...> Date: Mon Nov 13 08:27:17 2006 -0800 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb * 'master' of master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb: V4L/DVB (4818): Flexcop-usb: fix debug printk V4L/DVB (4817): Fix uses of "&&" where "&" was intended V4L/DVB (4816): Change tuner type for Avermedia A16AR V4L/DVB (4815): Remote support for Avermedia A16AR V4L/DVB (4814): Remote support for Avermedia 777 V4L/DVB (4804): Fix missing i2c dependency for saa7110 V4L/DVB (4802): Cx88: fix remote control on WinFast 2000XP Expert V4L/DVB (4795): Tda826x: use correct max frequency commit 239fd45938f9ddf64f120e0260c7b76eb73bd5a7 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=239fd45938f9ddf64f120e0260c7b76eb73bd5a7 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=239fd45938f9ddf64f120e0260c7b76eb73bd5a7 Merge: eea2078eaf2bcd4e5e8b2e08798071efedac5e17 36b600f2649e3be49039efe31edeeb64277dbd99 Author: Linus Torvalds <tor...@g5...> Date: Mon Nov 13 08:20:38 2006 -0800 Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: [POWERPC] cell: set ARCH_SPARSEMEM_DEFAULT in Kconfig [POWERPC] Fix cell "new style" mapping and add debug [POWERPC] pseries: Force 4k update_flash block and list sizes [POWERPC] CPM_UART: Fix non-console initialisation [POWERPC] CPM_UART: Fix non-console transmit [POWERPC] Make sure initrd and dtb sections get into zImage correctly commit eea2078eaf2bcd4e5e8b2e08798071efedac5e17 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=eea2078eaf2bcd4e5e8b2e08798071efedac5e17 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=eea2078eaf2bcd4e5e8b2e08798071efedac5e17 Merge: ea991f06d851d58268eac6ce5c2152397757c958 050e714eb2bc662e9df6bf048ce86b4fbdd9bcd3 Author: Linus Torvalds <tor...@g5...> Date: Mon Nov 13 08:15:30 2006 -0800 Merge git://oss.sgi.com:8090/xfs/xfs-2.6 * git://oss.sgi.com:8090/xfs/xfs-2.6: [XFS] Remove KERNEL_VERSION macros from xfs_dmapi.h [XFS] Prevent a deadlock when xfslogd unpins inodes. [XFS] Clean up i_flags and i_flags_lock handling. [XFS] 956664: dm_read_invis() changes i_atime [XFS] rename uio_read() to xfs_uio_read() [XFS] Keep lockdep happy. [XFS] 956618: Linux crashes on boot with XFS-DMAPI filesystem when commit ea991f06d851d58268eac6ce5c2152397757c958 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=ea991f06d851d58268eac6ce5c2152397757c958 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=ea991f06d851d58268eac6ce5c2152397757c958 Merge: 170926993a320cd7b53c388e6ffc759de4fac472 bb831eb2027c12a740ad4e4ad78f2a0e841ae808 Author: Linus Torvalds <tor...@g5...> Date: Mon Nov 13 08:14:13 2006 -0800 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [IPVS]: More endianness fixed. [IPVS]: Compile fix for annotations in userland. commit 170926993a320cd7b53c388e6ffc759de4fac472 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=170926993a320cd7b53c388e6ffc759de4fac472 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=170926993a320cd7b53c388e6ffc759de4fac472 Merge: 189e7cc1e092a31183febe598f8e37385ff9936e f7b2e8c76b3423a1d2501b9399261e9c9a33e100 Author: Linus Torvalds <tor...@g5...> Date: Mon Nov 13 08:09:49 2006 -0800 Merge master.kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6: [CIFS] Fix minor problem with previous patch [CIFS] Fix mount failure when domain not specified [CIFS] Explicitly set stat->blksize [CIFS] NFS stress test generates flood of "close with pending write" messages commit 189e7cc1e092a31183febe598f8e37385ff9936e gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=189e7cc1e092a31183febe598f8e37385ff9936e gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=189e7cc1e092a31183febe598f8e37385ff9936e Merge: 09123d230a294cd3b860f4ea042235b988277f0a 1f10bec3ef9d9d97999c72e19625432836820221 Author: Linus Torvalds <tor...@g5...> Date: Mon Nov 13 08:03:32 2006 -0800 Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: [PATCH] drivers cris: return on NULL dev_alloc_skb() [PATCH] com20020 build fix [PATCH] bonding: lockdep annotation [PATCH] bcm43xx: Add error checking in bcm43xx_sprom_write() [PATCH] bcm43xx: Drain TX status before starting IRQs commit 09123d230a294cd3b860f4ea042235b988277f0a gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=09123d230a294cd3b860f4ea042235b988277f0a gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=09123d230a294cd3b860f4ea042235b988277f0a Author: Alan Stern <st...@ro...> Date: Fri Nov 10 12:27:57 2006 -0800 [PATCH] SCSI core: always store >= 36 bytes of INQUIRY data This patch (as810c) copies a minimum of 36 bytes of INQUIRY data, even if the device claims that not all of them are valid. Often badly behaved devices put plausible data in the Vendor, Product, and Revision strings but set the Additional Length byte to a small value. Using potentially valid data is certainly better than allocating a short buffer and then reading beyond the end of it, which is what we do now. Signed-off-by: Alan Stern <st...@ro...> Cc: James Bottomley <Jam...@st...> Cc: Greg KH <gr...@kr...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit f72fa707604c015a6625e80f269506032d5430dc gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=f72fa707604c015a6625e80f269506032d5430dc gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=f72fa707604c015a6625e80f269506032d5430dc Author: Pavel Emelianov <xe...@op...> Date: Fri Nov 10 12:27:56 2006 -0800 [PATCH] Fix misrouted interrupts deadlocks While testing kernel on machine with "irqpoll" option I've caught such a lockup: __do_IRQ() spin_lock(&desc->lock); desc->chip->ack(); /* IRQ is ACKed */ note_interrupt() misrouted_irq() handle_IRQ_event() if (...) local_irq_enable_in_hardirq(); /* interrupts are enabled from now */ ... __do_IRQ() /* same IRQ we've started from */ spin_lock(&desc->lock); /* LOCKUP */ Looking at misrouted_irq() code I've found that a potential deadlock like this can also take place: 1CPU: __do_IRQ() spin_lock(&desc->lock); /* irq = A */ misrouted_irq() for (i = 1; i < NR_IRQS; i++) { spin_lock(&desc->lock); /* irq = B */ if (desc->status & IRQ_INPROGRESS) { 2CPU: __do_IRQ() spin_lock(&desc->lock); /* irq = B */ misrouted_irq() for (i = 1; i < NR_IRQS; i++) { spin_lock(&desc->lock); /* irq = A */ if (desc->status & IRQ_INPROGRESS) { As the second lock on both CPUs is taken before checking that this irq is being handled in another processor this may cause a deadlock. This issue is only theoretical. I propose the attached patch to fix booth problems: when trying to handle misrouted IRQ active desc->lock may be unlocked. Acked-by: Ingo Molnar <mi...@re...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 0130b0b32ee53dc7add773fcea984f6a26ef1da3 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=0130b0b32ee53dc7add773fcea984f6a26ef1da3 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=0130b0b32ee53dc7add773fcea984f6a26ef1da3 Author: Sharyathi Nagesh <sha...@in...> Date: Fri Nov 10 12:27:54 2006 -0800 [PATCH] fix Data Acess error in dup_fd On running the Stress Test on machine for more than 72 hours following error message was observed. 0:mon> e cpu 0x0: Vector: 300 (Data Access) at [c00000007ce2f7f0] pc: c000000000060d90: .dup_fd+0x240/0x39c lr: c000000000060d6c: .dup_fd+0x21c/0x39c sp: c00000007ce2fa70 msr: 800000000000b032 dar: ffffffff00000028 dsisr: 40000000 current = 0xc000000074950980 paca = 0xc000000000454500 pid = 27330, comm = bash 0:mon> t [c00000007ce2fa70] c000000000060d28 .dup_fd+0x1d8/0x39c (unreliable) [c00000007ce2fb30] c000000000060f48 .copy_files+0x5c/0x88 [c00000007ce2fbd0] c000000000061f5c .copy_process+0x574/0x1520 [c00000007ce2fcd0] c000000000062f88 .do_fork+0x80/0x1c4 [c00000007ce2fdc0] c000000000011790 .sys_clone+0x5c/0x74 [c00000007ce2fe30] c000000000008950 .ppc_clone+0x8/0xc The problem is because of race window. When if(expand) block is executed in dup_fd unlocking of oldf->file_lock give a window for fdtable in oldf to be modified. So actual open_files in oldf may not match with open_files variable. Cc: Vadim Lobanov <vlo...@sp...> Cc: <st...@ke...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 5fd934a9a1b72c718ad5c388fd2e0fd90486cbf3 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=5fd934a9a1b72c718ad5c388fd2e0fd90486cbf3 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=5fd934a9a1b72c718ad5c388fd2e0fd90486cbf3 Author: Franck Bui-Huu <fb...@gm...> Date: Fri Nov 10 12:27:53 2006 -0800 [PATCH] .gitignore: add miscellaneous files Prevent git from reporting this useless status: On branch refs/heads/master Untracked files: (use "git add" to add to commit) TAGS scripts/kconfig/lkc_defs.h scripts/kconfig/qconf.moc nothing to commit Signed-off-by: Franck Bui-Huu <fb...@gm...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit d8b295f29091310d746509bb6d5828aaf4907a18 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=d8b295f29091310d746509bb6d5828aaf4907a18 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=d8b295f29091310d746509bb6d5828aaf4907a18 Author: Russell King <rmk...@ar...> Date: Fri Nov 10 12:27:53 2006 -0800 [PATCH] Fix missing parens in set_personality() If you call set_personality() with an expression such as: set_personality(foo ? PERS_FOO1 : PERS_FOO2); then this evaluates to: ((current->personality == foo ? PERS_FOO1 : PERS_FOO2) ? ... which is obviously not the intended result. Add the missing parents to ensure this gets evaluated as expected: ((current->personality == (foo ? PERS_FOO1 : PERS_FOO2)) ? ... Signed-off-by: Russell King <rmk...@ar...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit e40c67597eac7a0b0e676867517b01a5a57f7b4b gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=e40c67597eac7a0b0e676867517b01a5a57f7b4b gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=e40c67597eac7a0b0e676867517b01a5a57f7b4b Author: Wink Saville <wi...@sa...> Date: Fri Nov 10 12:27:52 2006 -0800 [PATCH] Patch for nvidia divide by zero error for 7600 pci-express card The following patch resolves the divide by zero error I encountered on my system: http://marc.10east.com/?l=linux-fbdev-devel&m=116058257024413&w=2 I accomplished this by merging what I thought was appropriate from: http://webcvs.freedesktop.org/xorg/driver/xf86-video-nv/src/ Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 7947d2cc2c2e01125a393de83862d02b621999fe gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=7947d2cc2c2e01125a393de83862d02b621999fe gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=7947d2cc2c2e01125a393de83862d02b621999fe Author: Corey Minyard <mi...@ac...> Date: Fri Nov 10 12:27:50 2006 -0800 [PATCH] IPMI: Fix more && typos Fix improper use of "&&" when "&" was intended. Signed-off-by: Jean Delvare <kh...@li...> Signed-off-by: Corey Minyard <mi...@ac...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 1a4b0fc503ff4149f5915be4aeb179b9453cf485 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=1a4b0fc503ff4149f5915be4aeb179b9453cf485 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=1a4b0fc503ff4149f5915be4aeb179b9453cf485 Author: Jes Sorensen <je...@sg...> Date: Fri Nov 10 12:27:49 2006 -0800 [PATCH] mspec driver build fix Fix MSPEC driver to build for non SN2 enabled configs as the driver should work in cached and uncached modes (no fetchop) on these systems. In addition make MSPEC select IA64_UNCACHED_ALLOCATOR, which is required for it and move it to arch/ia64/Kconfig to avoid warnings on non ia64 architectures running allmodconfig. Once the Kconfig code is fixed, we can move it back. Signed-off-by: Jes Sorensen <je...@sg...> Cc: Fernando Luis Vzquez Cao <fer...@os...> Cc: "Luck, Tony" <ton...@in...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit d67afe5ed00070de0965bfc98de5f6ed3a80a73e gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=d67afe5ed00070de0965bfc98de5f6ed3a80a73e gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=d67afe5ed00070de0965bfc98de5f6ed3a80a73e Author: David Miller <da...@da...> Date: Fri Nov 10 12:27:48 2006 -0800 [PATCH] pci: don't try to remove sysfs files before they are setup. The PCI sysfs attributes are created after the initial PCI bus s... [truncated message content] |
