1. 05 Oct, 2012 30 commits
  2. 04 Oct, 2012 7 commits
    • Linus Torvalds's avatar
      Merge tag 'kvm-3.7-1' of git://git.kernel.org/pub/scm/virt/kvm/kvm · ecefbd94
      Linus Torvalds authored
      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
    • Linus Torvalds's avatar
      firmware: use 'kernel_read()' to read firmware into kernel buffer · ce57e981
      Linus Torvalds authored
      
      
      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: default avatarFengguang Wu <fengguang.wu@intel.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      ce57e981
    • Linus Torvalds's avatar
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs · e1cc4852
      Linus Torvalds authored
      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
    • Linus Torvalds's avatar
      Merge tag 'remoteproc-for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc · 4d6d3672
      Linus Torvalds authored
      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
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 · d66e6737
      Linus Torvalds authored
      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
    • Jussi Kivilinna's avatar
      crypto: x86/glue_helper - fix storing of new IV in CBC encryption · c9f97a27
      Jussi Kivilinna authored
      
      
      Glue_helper incorrectly XORs new IV over old IV at end of CBC encryption
      function when it should store. This causes CBC encryption to give
      incorrect output on multi-page encryption requests.
      Signed-off-by: default avatarJussi Kivilinna <jussi.kivilinna@mbnet.fi>
      Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
      c9f97a27
    • Linus Torvalds's avatar
      Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux · 612a9aab
      Linus Torvalds authored
      Pull drm merge (part 1) from Dave Airlie:
       "So first of all my tree and uapi stuff has a conflict mess, its my
        fault as the nouveau stuff didn't hit -next as were trying to rebase
        regressions out of it before we merged.
      
        Highlights:
         - SH mobile modesetting driver and associated helpers
         - some DRM core documentation
         - i915 modesetting rework, haswell hdmi, haswell and vlv fixes, write
           combined pte writing, ilk rc6 support,
         - nouveau: major driver rework into a hw core driver, makes features
           like SLI a lot saner to implement,
         - psb: add eDP/DP support for Cedarview
         - radeon: 2 layer page tables, async VM pte updates, better PLL
           selection for > 2 screens, better ACPI interactions
      
        The rest is general grab bag of fixes.
      
        So why part 1? well I have the exynos pull req which came in a bit
        late but was waiting for me to do something they shouldn't have and it
        looks fairly safe, and David Howells has some more header cleanups
        he'd like me to pull, that seem like a good idea, but I'd like to get
        this merge out of the way so -next dosen't get blocked."
      
      Tons of conflicts mostly due to silly include line changes, but mostly
      mindless.  A few other small semantic conflicts too, noted from Dave's
      pre-merged branch.
      
      * 'drm-next' of git://people.freedesktop.org/~airlied/linux: (447 commits)
        drm/nv98/crypt: fix fuc build with latest envyas
        drm/nouveau/devinit: fixup various issues with subdev ctor/init ordering
        drm/nv41/vm: fix and enable use of "real" pciegart
        drm/nv44/vm: fix and enable use of "real" pciegart
        drm/nv04/dmaobj: fixup vm target handling in preparation for nv4x pcie
        drm/nouveau: store supported dma mask in vmmgr
        drm/nvc0/ibus: initial implementation of subdev
        drm/nouveau/therm: add support for fan-control modes
        drm/nouveau/hwmon: rename pwm0* to pmw1* to follow hwmon's rules
        drm/nouveau/therm: calculate the pwm divisor on nv50+
        drm/nouveau/fan: rewrite the fan tachometer driver to get more precision, faster
        drm/nouveau/therm: move thermal-related functions to the therm subdev
        drm/nouveau/bios: parse the pwm divisor from the perf table
        drm/nouveau/therm: use the EXTDEV table to detect i2c monitoring devices
        drm/nouveau/therm: rework thermal table parsing
        drm/nouveau/gpio: expose the PWM/TOGGLE parameter found in the gpio vbios table
        drm/nouveau: fix pm initialization order
        drm/nouveau/bios: check that fixed tvdac gpio data is valid before using it
        drm/nouveau: log channel debug/error messages from client object rather than drm client
        drm/nouveau: have drm debugging macros build on top of core macros
        ...
      612a9aab
  3. 03 Oct, 2012 3 commits