1. 27 3月, 2009 21 次提交
    • L
      Merge branch 'kvm-updates/2.6.30' of git://git.kernel.org/pub/scm/virt/kvm/kvm · d3f12d36
      Linus Torvalds 提交于
      * 'kvm-updates/2.6.30' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (113 commits)
        KVM: VMX: Don't allow uninhibited access to EFER on i386
        KVM: Correct deassign device ioctl to IOW
        KVM: ppc: e500: Fix the bug that KVM is unstable in SMP
        KVM: ppc: e500: Fix the bug that mas0 update to wrong value when read TLB entry
        KVM: Fix missing smp tlb flush in invlpg
        KVM: Get support IRQ routing entry counts
        KVM: fix sparse warnings: Should it be static?
        KVM: fix sparse warnings: context imbalance
        KVM: is_long_mode() should check for EFER.LMA
        KVM: VMX: Update necessary state when guest enters long mode
        KVM: ia64: Fix the build errors due to lack of macros related to MSI.
        ia64: Move the macro definitions related to MSI to one header file.
        KVM: fix kvm_vm_ioctl_deassign_device
        KVM: define KVM_CAP_DEVICE_DEASSIGNMENT
        KVM: ppc: Add emulation of E500 register mmucsr0
        KVM: Report IRQ injection status for MSI delivered interrupts
        KVM: MMU: Fix another largepage memory leak
        KVM: SVM: set accessed bit for VMCB segment selectors
        KVM: Report IRQ injection status to userspace.
        KVM: MMU: remove assertion in kvm_mmu_alloc_page
        ...
      d3f12d36
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband · 39b566ee
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: (30 commits)
        RDMA/cxgb3: Enforce required firmware
        IB/mlx4: Unregister IB device prior to CLOSE PORT command
        mlx4_core: Add link type autosensing
        mlx4_core: Don't perform SET_PORT command for Ethernet ports
        RDMA/nes: Handle MPA Reject message properly
        RDMA/nes: Improve use of PBLs
        RDMA/nes: Remove LLTX
        RDMA/nes: Inform hardware that asynchronous event has been handled
        RDMA/nes: Fix tmp_addr compilation warning
        RDMA/nes: Report correct vendor_id and vendor_part_id
        RDMA/nes: Update copyright to new legal entity and year
        RDMA/nes: Account for freed PBL after HW operation
        IB: Remove useless ibdev_is_alive() tests from sysfs code
        IB/sa_query: Fix AH leak due to update_sm_ah() race
        IB/mad: Fix ib_post_send_mad() returning 0 with no generate send comp
        IB/mad: initialize mad_agent_priv before putting on lists
        IB/mad: Fix null pointer dereference in local_completions()
        IB/mad: Fix RMPP header RRespTime manipulation
        IB/iser: Remove hard setting of path MTU
        mlx4_core: Add device IDs for MT25458 10GigE devices
        ...
      39b566ee
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 · 39f15003
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
        [CIFS] Fix memory overwrite when saving nativeFileSystem field during mount
        [CIFS]  Rename compose_mount_options to cifs_compose_mount_options.
        [CIFS] work around bug in Samba server handling for posix open
        [CIFS] Use posix open on file open when server supports it
        cifs: fix buffer format byte on NT Rename/hardlink
        [CIFS] Add definitions for remoteably fsctl calls
        [CIFS] add extra null attr check
        [CIFS] fix build error
        [CIFS] reopen file via newer posix open protocol operation if available
        [CIFS] Add new nostrictsync cifs mount option to avoid slow SMB flush
        [CIFS] DFS no longer experimental
        [CIFS] Send SMB flush in cifs_fsync
      39f15003
    • A
      dontdiff: Fix asm exclude · 7676b8fd
      Alan Cox 提交于
      Now that the headers are in arch/foo/include/asm we don't want to exclude
      them when preparing diff files.
      
      Closes-bug: 12921
      Signed-off-by: NAlan Cox <alan@lxorguk.ukuu.org.uk>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      7676b8fd
    • J
      ext3: Avoid starting a transaction in writepage when not necessary · 9e80d407
      Jan Kara 提交于
      We don't have to start a transaction in writepage() when all the blocks
      are a properly allocated. Even in ordered mode either the data has been
      written via write() and they are thus already added to transaction's list
      or the data was written via mmap and then it's random in which transaction
      they get written anyway.
      
      This should help VM to pageout dirty memory without blocking on transaction
      commits.
      Signed-off-by: NJan Kara <jack@suse.cz>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      9e80d407
    • L
      Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev · 0384e295
      Linus Torvalds 提交于
      * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev: (35 commits)
        [libata] Improve timeout handling
        [libata] Drain data on errors
        pata_sc1200: Activate secondary channel
        pata_artop: Serializing support
        [libata] ahci: correct enclosure LED state save
        [libata] More robust parsing for IDENTIFY DEVICE multi_count field
        sata_mv: fix LED blinking for SoC+NCQ
        sata_mv: optimize IRQ coalescing for 8-port chips
        sata_mv: implement IRQ coalescing (v2)
        sata_mv: cosmetic preparations for IRQ coalescing
        pata-rb532-cf: platform_get_irq() fix ignored failure
        pata_efar: fix *dma_mask
        pata_radisys: fix mwdma_mask to exclude mwdma0
        [libata] convert drivers to use ata.h mode mask defines
        include/linux/ata.h: add some more transfer masks
        ahci: Blacklist HP Compaq 6720s that spins off disks during ACPI power off
        [libata] sata_mv: Implement direct FIS transmission via mv_qc_issue_fis().
        [libata] Export ata_pio_queue_task() so that it can be used from sata_mv.
        [libata] sata_mv: Add a new mv_sff_check_status() function to sata_mv.
        [libata] sata_mv: Tighten up interrupt masking in mv_qc_issue()
        ...
      0384e295
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 · 61a09182
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (97 commits)
        USB: qcserial: add device id for HP devices
        USB: isp1760: Add a delay before reading the SKIPMAP registers in isp1760-hcd.c
        USB: allow malformed LANGID descriptors
        USB: pxa27x_udc: typo fixes and code cleanups
        USB: gadget: gadget zero uses new suspend/resume hooks
        USB: gadget: composite device-level suspend/resume hooks
        USB: r8a66597-hcd: suspend/resume support
        USB: more u32 conversion after transfer_buffer_length and actual_length
        USB: Fix cp2101 USB serial device driver termios functions for console use
        USB: CP2101 New Device ID
        USB: ipaq: handle 4 endpoint devices
        USB: S3C: Move usb-control.h to platform include
        USB: ohci-hcd: Add ARCH_S3C24XX to the ohci-s3c2410.c glue
        USB: pedantic: spelling correction in comment for ch9.h
        USB: host: fix sparse warning: Using plain integer as NULL pointer
        USB: ohci-s3c2410: fix name of bus clock
        USB: ohci-s3c2410: remove <mach/hardware.h> include
        USB: serial: rename cp2101 driver to cp210x
        USB: CP2101 Reduce Error Logging
        USB: CP2101 Support AN205 baud rates
        ...
      61a09182
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6 · 0c93ea40
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6: (61 commits)
        Dynamic debug: fix pr_fmt() build error
        Dynamic debug: allow simple quoting of words
        dynamic debug: update docs
        dynamic debug: combine dprintk and dynamic printk
        sysfs: fix some bin_vm_ops errors
        kobject: don't block for each kobject_uevent
        sysfs: only allow one scheduled removal callback per kobj
        Driver core: Fix device_move() vs. dpm list ordering, v2
        Driver core: some cleanup on drivers/base/sys.c
        Driver core: implement uevent suppress in kobject
        vcs: hook sysfs devices into object lifetime instead of "binding"
        driver core: fix passing platform_data
        driver core: move platform_data into platform_device
        sysfs: don't block indefinitely for unmapped files.
        driver core: move knode_bus into private structure
        driver core: move knode_driver into private structure
        driver core: move klist_children into private structure
        driver core: create a private portion of struct device
        driver core: remove polling for driver_probe_done(v5)
        sysfs: reference sysfs_dirent from sysfs inodes
        ...
      
      Fixed conflicts in drivers/sh/maple/maple.c manually
      0c93ea40
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6 · bc2fd381
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: (53 commits)
        ide: use try_to_identify() in ide_driveid_update()
        ide: clear drive IRQ after re-enabling local IRQs in ide_driveid_update()
        ide: sanitize SELECT_MASK() usage in ide_driveid_update()
        ide: classify device type in do_probe()
        ide: remove broken EXABYTENEST support
        ide: shorten timeout value in ide_driveid_update()
        ide: propagate AltStatus workarounds to ide_driveid_update()
        ide: fix kmalloc() failure handling in ide_driveid_update()
        mn10300: remove <asm/ide.h>
        frv: remove <asm/ide.h>
        ide: remove pciirq argument from ide_pci_setup_ports()
        ide: fix ->init_chipset method to return 'int' value
        ide: remove try_to_identify() wrapper
        ide: remove no longer needed IRQ auto-probing from try_to_identify() (v2)
        ide: remove no longer needed IRQ fallback code from hwif_init()
        amd74xx: remove no longer needed ->init_hwif method
        ide: remove no longer needed IDE_HFLAG[_FORCE]_LEGACY_IRQS
        ide: use ide_pci_is_in_compatibility_mode() in ide_pci_init_{one,two}()
        ide: use pci_get_legacy_ide_irq() in ide_pci_init_{one,two}()
        ide: handle IDE_HFLAG[_FORCE]_LEGACY_IRQS in ide_pci_init_{one,two}()
        ...
      bc2fd381
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 · 928a726b
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (96 commits)
        sh: add support for SMSC Polaris platform
        sh: fix the HD64461 level-triggered interrupts handling
        sh: sh-rtc wakeup support
        sh: sh-rtc invalid time rework
        sh: sh-rtc carry interrupt rework
        sh: disallow kexec virtual entry
        sh: kexec jump: fix for ftrace.
        sh: kexec: Drop SR.BL bit toggling.
        sh: add kexec jump support
        sh: rework kexec segment code
        sh: simplify kexec vbr code
        sh: Flush only the needed range when unmapping a VMA.
        sh: Update debugfs ASID dumping for 16-bit ASID support.
        sh: tlb-pteaex: Kill off legacy PTEA updates.
        sh: Support for extended ASIDs on PTEAEX-capable SH-X3 cores.
        sh: sh7763rdp: Change IRQ number for sh_eth of sh7763rdp
        sh: espt-giga board support
        sh: dma: Make G2 DMA configurable.
        sh: dma: Make PVR2 DMA configurable.
        sh: Move IRQ multi definition of DMAC to defconfig
        ...
      928a726b
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw · 8ff64b53
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw:
        GFS2: Fix freeze issue
        Fix a minor bug in the previous patch
        GFS2: Clean up of glops.c
        GFS2: Fix locking bug in failed shared to exclusive conversion
        GFS2: Pagecache usage optimization on GFS2
        GFS2: fix sparse warning: Should it be static?
        GFS2: fix sparse warnings: constant is so big it is ...
        GFS2: Support quota/noquota mount arguments
        GFS2: Fix alignment issue and tidy gfs2_bitfit
        GFS2: Add a "demote a glock" interface to sysfs
        GFS2: Expose UUID via sysfs/uevent
        GFS2: Support generation of discard requests
        GFS2: Fix deadlock on journal flush
        GFS2: Fix error path ref counting for root inode
        GFS2: Remove unused field from glock
        GFS2: Merge lock_dlm module into GFS2
        GFS2: Remove "double" locking in quota
        GFS2: change gfs2_quota_scan into a shrinker
        GFS2: Bring back lvb-related stuff to lock_nolock to support quotas
        GFS2: Fix remount argument parsing
      8ff64b53
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6 · 61a9dc26
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6:
        avr32: remove duplicated #include
        avr32: fix out-of-range rjmp instruction on large kernels
        avr32: Fix out-of-range rcalls in large kernels
      61a9dc26
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 · 50201253
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: (430 commits)
        ALSA: hda - Add quirk for Acer Ferrari 5000
        ALSA: hda - Use cached calls to get widget caps and pin caps
        ALSA: hda - Don't create empty/single-item input source
        ALSA: hda - Fix the wrong pin-cap check in patch_realtek.c
        ALSA: hda - Cache pin-cap values
        ALSA: hda - Avoid output amp manipulation to digital mic pins
        ALSA: hda - Add function id to proc output
        ALSA: pcm - Safer boundary checks
        ALSA: hda - Detect digital-mic inputs on ALC663 / ALC272
        ALSA: sound/ali5451: typo: s/resouces/resources/
        ALSA: hda - Don't show the current connection for power widgets
        ALSA: Fix wrong pointer to dev_err() in arm/pxa2xx-ac97-lib.c
        ASoC: Declare Headset as Mic and Headphone widgets for SDP3430
        ASoC: OMAP: N810: Add more jack functions
        ASoC: OMAP: N810: Mark not connected input pins
        ASoC: Add FLL support for WM8400
        ALSA: hda - Don't reset stream at each prepare callback
        ALSA: hda - Don't reset BDL unnecessarily
        ALSA: pcm - Fix delta calculation at boundary overlap
        ALSA: pcm - Reset invalid position even without debug option
        ...
      50201253
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 · 562f477a
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (29 commits)
        crypto: sha512-s390 - Add missing block size
        hwrng: timeriomem - Breaks an allyesconfig build on s390:
        nlattr: Fix build error with NET off
        crypto: testmgr - add zlib test
        crypto: zlib - New zlib crypto module, using pcomp
        crypto: testmgr - Add support for the pcomp interface
        crypto: compress - Add pcomp interface
        netlink: Move netlink attribute parsing support to lib
        crypto: Fix dead links
        hwrng: timeriomem - New driver
        crypto: chainiv - Use kcrypto_wq instead of keventd_wq
        crypto: cryptd - Per-CPU thread implementation based on kcrypto_wq
        crypto: api - Use dedicated workqueue for crypto subsystem
        crypto: testmgr - Test skciphers with no IVs
        crypto: aead - Avoid infinite loop when nivaead fails selftest
        crypto: skcipher - Avoid infinite loop when cipher fails selftest
        crypto: api - Fix crypto_alloc_tfm/create_create_tfm return convention
        crypto: api - crypto_alg_mod_lookup either tested or untested
        crypto: amcc - Add crypt4xx driver
        crypto: ansi_cprng - Add maintainer
        ...
      562f477a
    • L
      Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq · ada19a31
      Linus Torvalds 提交于
      * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq: (35 commits)
        [CPUFREQ] Prevent p4-clockmod from auto-binding to the ondemand governor.
        [CPUFREQ] Make cpufreq-nforce2 less obnoxious
        [CPUFREQ] p4-clockmod reports wrong frequency.
        [CPUFREQ] powernow-k8: Use a common exit path.
        [CPUFREQ] Change link order of x86 cpufreq modules
        [CPUFREQ] conservative: remove 10x from def_sampling_rate
        [CPUFREQ] conservative: fixup governor to function more like ondemand logic
        [CPUFREQ] conservative: fix dbs_cpufreq_notifier so freq is not locked
        [CPUFREQ] conservative: amend author's email address
        [CPUFREQ] Use swap() in longhaul.c
        [CPUFREQ] checkpatch cleanups for acpi-cpufreq
        [CPUFREQ] powernow-k8: Only print error message once, not per core.
        [CPUFREQ] ondemand/conservative: sanitize sampling_rate restrictions
        [CPUFREQ] ondemand/conservative: deprecate sampling_rate{min,max}
        [CPUFREQ] powernow-k8: Always compile powernow-k8 driver with ACPI support
        [CPUFREQ] Introduce /sys/devices/system/cpu/cpu*/cpufreq/cpuinfo_transition_latency
        [CPUFREQ] checkpatch cleanups for powernow-k8
        [CPUFREQ] checkpatch cleanups for ondemand governor.
        [CPUFREQ] checkpatch cleanups for powernow-k7
        [CPUFREQ] checkpatch cleanups for speedstep related drivers.
        ...
      ada19a31
    • L
      Merge branch 'for-linus' of... · 8d80ce80
      Linus Torvalds 提交于
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6: (71 commits)
        SELinux: inode_doinit_with_dentry drop no dentry printk
        SELinux: new permission between tty audit and audit socket
        SELinux: open perm for sock files
        smack: fixes for unlabeled host support
        keys: make procfiles per-user-namespace
        keys: skip keys from another user namespace
        keys: consider user namespace in key_permission
        keys: distinguish per-uid keys in different namespaces
        integrity: ima iint radix_tree_lookup locking fix
        TOMOYO: Do not call tomoyo_realpath_init unless registered.
        integrity: ima scatterlist bug fix
        smack: fix lots of kernel-doc notation
        TOMOYO: Don't create securityfs entries unless registered.
        TOMOYO: Fix exception policy read failure.
        SELinux: convert the avc cache hash list to an hlist
        SELinux: code readability with avc_cache
        SELinux: remove unused av.decided field
        SELinux: more careful use of avd in avc_has_perm_noaudit
        SELinux: remove the unused ae.used
        SELinux: check seqno when updating an avc_node
        ...
      8d80ce80
    • L
      Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus · 1646df40
      Linus Torvalds 提交于
      * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
        MIPS: R2: Fix problem with code that incorrectly modifies ebase.
        MIPS: Change {set,clear,change}_c0_<foo> to return old value.
        MIPS: compat: Remove duplicated #include
        MIPS: VR5500: Enable prefetch
        MIPS: Fix oops in dma_unmap_page on not coherent mips platforms
      1646df40
    • W
      writeback: double the dirty thresholds · 1b5e62b4
      Wu Fengguang 提交于
      Enlarge default dirty ratios from 5/10 to 10/20.  This fixes [Bug
      #12809] iozone regression with 2.6.29-rc6.
      
      The iozone benchmarks are performed on a 1200M file, with 8GB ram.
      
        iozone -i 0 -i 1 -i 2 -i 3 -i 4 -r 4k -s 64k -s 512m -s 1200m -b tmp.xls
        iozone -B -r 4k -s 64k -s 512m -s 1200m -b tmp.xls
      
      The performance regression is triggered by commit 1cf6e7d8(mm: task
      dirty accounting fix), which makes more correct/thorough dirty
      accounting.
      
      The default 5/10 dirty ratios were picked (a) with the old dirty logic
      and (b) largely at random and (c) designed to be aggressive.  In
      particular, that (a) means that having fixed some of the dirty
      accounting, maybe the real bug is now that it was always too aggressive,
      just hidden by an accounting issue.
      
      The enlarged 10/20 dirty ratios are just about enough to fix the regression.
      
      [ We will have to look at how this affects the old fsync() latency issue,
        but that probably will need independent work.  - Linus ]
      
      Cc: Nick Piggin <npiggin@suse.de>
      Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
      Reported-by: N"Lin, Ming M" <ming.m.lin@intel.com>
      Tested-by: N"Lin, Ming M" <ming.m.lin@intel.com>
      Signed-off-by: NWu Fengguang <fengguang.wu@intel.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      1b5e62b4
    • M
      Make relatime default · 0a1c01c9
      Matthew Garrett 提交于
      Change the default behaviour of the kernel to use relatime for all
      filesystems. This can be overridden with the "strictatime" mount
      option.
      Signed-off-by: NMatthew Garrett <mjg@redhat.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      0a1c01c9
    • M
      Add a strictatime mount option · d0adde57
      Matthew Garrett 提交于
      Add support for explicitly requesting full atime updates. This makes it
      possible for kernels to default to relatime but still allow userspace to
      override it.
      Signed-off-by: NMatthew Garrett <mjg@redhat.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      d0adde57
    • M
      Allow relatime to update atime once a day · 11ff6f05
      Matthew Garrett 提交于
      Allow atime to be updated once per day even with relatime. This lets
      utilities like tmpreaper (which delete files based on last access time)
      continue working, making relatime a plausible default for distributions.
      Signed-off-by: NMatthew Garrett <mjg@redhat.com>
      Reviewed-by: NMatthew Wilcox <willy@linux.intel.com>
      Acked-by: NValerie Aurora Henson <vaurora@redhat.com>
      Acked-by: NAlan Cox <alan@redhat.com>
      Acked-by: NIngo Molnar <mingo@elte.hu>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      11ff6f05
  2. 25 3月, 2009 19 次提交