1. 06 10月, 2012 35 次提交
  2. 05 10月, 2012 5 次提交
    • L
      Merge tag 'kvm-3.7-1' of git://git.kernel.org/pub/scm/virt/kvm/kvm · ecefbd94
      Linus Torvalds 提交于
      Pull KVM updates from Avi Kivity:
       "Highlights of the changes for this release include support for vfio
        level triggered interrupts, improved big real mode support on older
        Intels, a streamlines guest page table walker, guest APIC speedups,
        PIO optimizations, better overcommit handling, and read-only memory."
      
      * tag 'kvm-3.7-1' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (138 commits)
        KVM: s390: Fix vcpu_load handling in interrupt code
        KVM: x86: Fix guest debug across vcpu INIT reset
        KVM: Add resampling irqfds for level triggered interrupts
        KVM: optimize apic interrupt delivery
        KVM: MMU: Eliminate pointless temporary 'ac'
        KVM: MMU: Avoid access/dirty update loop if all is well
        KVM: MMU: Eliminate eperm temporary
        KVM: MMU: Optimize is_last_gpte()
        KVM: MMU: Simplify walk_addr_generic() loop
        KVM: MMU: Optimize pte permission checks
        KVM: MMU: Update accessed and dirty bits after guest pagetable walk
        KVM: MMU: Move gpte_access() out of paging_tmpl.h
        KVM: MMU: Optimize gpte_access() slightly
        KVM: MMU: Push clean gpte write protection out of gpte_access()
        KVM: clarify kvmclock documentation
        KVM: make processes waiting on vcpu mutex killable
        KVM: SVM: Make use of asm.h
        KVM: VMX: Make use of asm.h
        KVM: VMX: Make lto-friendly
        KVM: x86: lapic: Clean up find_highest_vector() and count_vectors()
        ...
      
      Conflicts:
      	arch/s390/include/asm/processor.h
      	arch/x86/kvm/i8259.c
      ecefbd94
    • L
      firmware: use 'kernel_read()' to read firmware into kernel buffer · ce57e981
      Linus Torvalds 提交于
      Fengguang correctly points out that the firmware reading should not use
      vfs_read(), since the buffer is in kernel space.
      
      The vfs_read() just happened to work for kernel threads, but sparse
      warns about the incorrect address spaces, and it's definitely incorrect
      and could fail for other users of the firmware loading.
      Reported-by: NFengguang Wu <fengguang.wu@intel.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      ce57e981
    • L
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs · e1cc4852
      Linus Torvalds 提交于
      Pull ext3 & udf fixes from Jan Kara:
       "Shortlog pretty much says it all.
      
        The interesting bits are UDF support for direct IO and ext3 fix for a
        long standing oops in data=journal mode."
      
      * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
        jbd: Fix assertion failure in commit code due to lacking transaction credits
        UDF: Add support for O_DIRECT
        ext3: Replace 0 with NULL for pointer in super.c file
        udf: add writepages support for udf
        ext3: don't clear orphan list on ro mount with errors
        reiserfs: Make reiserfs_xattr_handlers static
      e1cc4852
    • L
      Merge tag 'remoteproc-for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc · 4d6d3672
      Linus Torvalds 提交于
      Pull remoteproc update from Ohad Ben-Cohen:
      
       - Remoteproc Recovery - by Fernando Guzman Lugo
      
         When a remote processor crash is detected, this mechanism will remove
         all virtio children devices, wait until their drivers let go, hard
         reset the remote processor and reload the firmware (resulting in the
         relevant virtio children devices re-added).  Essentially the entire
         software stack is reset, together with the relevant hardware, so
         users don't have to reset the entire phone.
      
       - STE Modem driver is added - by Sjur Brændeland
      
       - OMAP DSP boot address support is added - by Juan Gutierrez
      
       - A handful of fixes/cleanups - Sjur Brændeland, Dan Carpenter, Emil
         Goode
      
      * tag 'remoteproc-for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc:
        remoteproc: Fix use of format specifyer
        remoteproc: fix a potential NULL-dereference on cleanup
        remoteproc: select VIRTIO to avoid build breakage
        remoteproc: return -EFAULT on copy_from_user failure
        remoteproc: snprintf() can return more than was printed
        remoteproc: Add STE modem driver
        remtoteproc: maintain max notifyid
        remoteproc: create a 'recovery' debugfs entry
        remoteproc: add actual recovery implementation
        remoteproc: add rproc_report_crash function to notify rproc crashes
        remoteproc: Add dependency to HAS_DMA
        remoteproc/omap: set bootaddr support
      4d6d3672
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 · d66e6737
      Linus Torvalds 提交于
      Pull crypto update from Herbert Xu:
       - Optimised AES/SHA1 for ARM.
       - IPsec ESN support in talitos and caam.
       - x86_64/avx implementation of cast5/cast6.
       - Add/use multi-algorithm registration helpers where possible.
       - Added IBM Power7+ in-Nest support.
       - Misc fixes.
      
      Fix up trivial conflicts in crypto/Kconfig due to the sparc64 crypto
      config options being added next to the new ARM ones.
      
      [ Side note: cut-and-paste duplicate help texts make those conflicts
        harder to read than necessary, thanks to git being smart about
        minimizing conflicts and maximizing the common parts... ]
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (71 commits)
        crypto: x86/glue_helper - fix storing of new IV in CBC encryption
        crypto: cast5/avx - fix storing of new IV in CBC encryption
        crypto: tcrypt - add missing tests for camellia and ghash
        crypto: testmgr - make test_aead also test 'dst != src' code paths
        crypto: testmgr - make test_skcipher also test 'dst != src' code paths
        crypto: testmgr - add test vectors for CTR mode IV increasement
        crypto: testmgr - add test vectors for partial ctr(cast5) and ctr(cast6)
        crypto: testmgr - allow non-multi page and multi page skcipher tests from same test template
        crypto: caam - increase TRNG clocks per sample
        crypto, tcrypt: remove local_bh_disable/enable() around local_irq_disable/enable()
        crypto: tegra-aes - fix error return code
        crypto: crypto4xx - fix error return code
        crypto: hifn_795x - fix error return code
        crypto: ux500 - fix error return code
        crypto: caam - fix error IDs for SEC v5.x RNG4
        hwrng: mxc-rnga - Access data via structure
        hwrng: mxc-rnga - Adapt clocks to new i.mx clock framework
        crypto: caam - add IPsec ESN support
        crypto: 842 - remove .cra_list initialization
        Revert "[CRYPTO] cast6: inline bloat--"
        ...
      d66e6737