1. 01 8月, 2011 11 次提交
  2. 31 7月, 2011 2 次提交
  3. 26 7月, 2011 4 次提交
  4. 25 7月, 2011 9 次提交
    • L
      Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm · b6844e8f
      Linus Torvalds 提交于
      * 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (237 commits)
        ARM: 7004/1: fix traps.h compile warnings
        ARM: 6998/2: kernel: use proper memory barriers for bitops
        ARM: 6997/1: ep93xx: increase NR_BANKS to 16 for support of 128MB RAM
        ARM: Fix build errors caused by adding generic macros
        ARM: CPU hotplug: ensure we migrate all IRQs off a downed CPU
        ARM: CPU hotplug: pass in proper affinity mask on IRQ migration
        ARM: GIC: avoid routing interrupts to offline CPUs
        ARM: CPU hotplug: fix abuse of irqdesc->node
        ARM: 6981/2: mmci: adjust calculation of f_min
        ARM: 7000/1: LPAE: Use long long printk format for displaying the pud
        ARM: 6999/1: head, zImage: Always Enter the kernel in ARM state
        ARM: btc: avoid invalidating the branch target cache on kernel TLB maintanence
        ARM: ARM_DMA_ZONE_SIZE is no more
        ARM: mach-shark: move ARM_DMA_ZONE_SIZE to mdesc->dma_zone_size
        ARM: mach-sa1100: move ARM_DMA_ZONE_SIZE to mdesc->dma_zone_size
        ARM: mach-realview: move from ARM_DMA_ZONE_SIZE to mdesc->dma_zone_size
        ARM: mach-pxa: move from ARM_DMA_ZONE_SIZE to mdesc->dma_zone_size
        ARM: mach-ixp4xx: move from ARM_DMA_ZONE_SIZE to mdesc->dma_zone_size
        ARM: mach-h720x: move from ARM_DMA_ZONE_SIZE to mdesc->dma_zone_size
        ARM: mach-davinci: move from ARM_DMA_ZONE_SIZE to mdesc->dma_zone_size
        ...
      b6844e8f
    • S
      Documentation: Update augmented rbtree documentation · 2f175074
      Sasha Levin 提交于
      Current documentation referred to the old method of handling augmented
      trees.  Update documentation to correspond with the changes done in
      commit b945d6b2 ("rbtree: Undo augmented trees performance damage
      and regression").
      
      Cc: Pekka Enberg <penberg@cs.helsinki.fi>
      Cc: David Woodhouse <David.Woodhouse@intel.com>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Acked-by: NIngo Molnar <mingo@elte.hu>
      Acked-by: NPeter Zijlstra <a.p.zijlstra@chello.nl>
      Signed-off-by: NSasha Levin <levinsasha928@gmail.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      2f175074
    • L
      XZ: Fix missing <linux/kernel.h> include · 81d67439
      Lasse Collin 提交于
      <linux/kernel.h> is needed for min_t. The old version
      happened to work on x86 because <asm/unaligned.h>
      indirectly includes <linux/kernel.h>, but it didn't
      work on ARM.
      
      <linux/kernel.h> includes <asm/byteorder.h> so it's
      not necessary to include it explicitly anymore.
      Signed-off-by: NLasse Collin <lasse.collin@tukaani.org>
      Cc: stable <stable@kernel.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      81d67439
    • L
      Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6 · 21c7075f
      Linus Torvalds 提交于
      * 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6: (21 commits)
        [S390] use siginfo for sigtrap signals
        [S390] dasd: add enhanced DASD statistics interface
        [S390] kvm: make sigp emerg smp capable
        [S390] disable cpu measurement alerts on a dying cpu
        [S390] initial cr0 bits
        [S390] iucv cr0 enablement bit
        [S390] race safe external interrupt registration
        [S390] remove tape block docu
        [S390] ap: toleration support for ap device type 10
        [S390] cleanup program check handler prototypes
        [S390] remove kvm mmu reload on s390
        [S390] Use gmap translation for accessing guest memory
        [S390] use gmap address spaces for kvm guest images
        [S390] kvm guest address space mapping
        [S390] fix s390 assembler code alignments
        [S390] move sie code to entry.S
        [S390] kvm: handle tprot intercepts
        [S390] qdio: clear shared DSCI before scheduling the queue handler
        [S390] reference bit testing for unmapped pages
        [S390] irqs: Do not trace arch_local_{*,irq_*} functions
        ...
      21c7075f
    • L
      Merge branch 'for-upstream' of git://openrisc.net/jonas/linux · ff0c4ad2
      Linus Torvalds 提交于
      * 'for-upstream' of git://openrisc.net/jonas/linux: (24 commits)
        OpenRISC: Add MAINTAINERS entry
        OpenRISC: Miscellaneous
        OpenRISC: Library routines
        OpenRISC: Headers
        OpenRISC: Traps
        OpenRISC: Module support
        OpenRISC: GPIO
        OpenRISC: Scheduling/Process management
        OpenRISC: Idle/Power management
        OpenRISC: System calls
        OpenRISC: IRQ
        OpenRISC: Timekeeping
        OpenRISC: DMA
        OpenRISC: PTrace
        OpenRISC: Build infrastructure
        OpenRISC: Signal handling
        OpenRISC: Memory management
        OpenRISC: Device tree
        OpenRISC: Boot code
        iomap: make IOPORT/PCI mapping functions conditional
        ...
      ff0c4ad2
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus · fcda12e7
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
        modpost: Fix modpost's license checking V3
        module: add /sys/module/<name>/uevent files
        module: change attr callbacks to take struct module_kobject
        modules: make arch's use default loader hooks
        modules: add default loader hook implementations
        param: fix return value handling in param_set_*
      fcda12e7
    • L
      Merge branch 'kvm-updates/3.1' of git://git.kernel.org/pub/scm/virt/kvm/kvm · 5fabc487
      Linus Torvalds 提交于
      * 'kvm-updates/3.1' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (143 commits)
        KVM: IOMMU: Disable device assignment without interrupt remapping
        KVM: MMU: trace mmio page fault
        KVM: MMU: mmio page fault support
        KVM: MMU: reorganize struct kvm_shadow_walk_iterator
        KVM: MMU: lockless walking shadow page table
        KVM: MMU: do not need atomicly to set/clear spte
        KVM: MMU: introduce the rules to modify shadow page table
        KVM: MMU: abstract some functions to handle fault pfn
        KVM: MMU: filter out the mmio pfn from the fault pfn
        KVM: MMU: remove bypass_guest_pf
        KVM: MMU: split kvm_mmu_free_page
        KVM: MMU: count used shadow pages on prepareing path
        KVM: MMU: rename 'pt_write' to 'emulate'
        KVM: MMU: cleanup for FNAME(fetch)
        KVM: MMU: optimize to handle dirty bit
        KVM: MMU: cache mmio info on page fault path
        KVM: x86: introduce vcpu_mmio_gva_to_gpa to cleanup the code
        KVM: MMU: do not update slot bitmap if spte is nonpresent
        KVM: MMU: fix walking shadow page table
        KVM guest: KVM Steal time registration
        ...
      5fabc487
    • L
      Merge branch 'upstream/xen-tracing2' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen · c61264f9
      Linus Torvalds 提交于
      * 'upstream/xen-tracing2' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen:
        xen/trace: use class for multicall trace
        xen/trace: convert mmu events to use DECLARE_EVENT_CLASS()/DEFINE_EVENT()
        xen/multicall: move *idx fields to start of mc_buffer
        xen/multicall: special-case singleton hypercalls
        xen/multicalls: add unlikely around slowpath in __xen_mc_entry()
        xen/multicalls: disable MC_DEBUG
        xen/mmu: tune pgtable alloc/release
        xen/mmu: use extend_args for more mmuext updates
        xen/trace: add tlb flush tracepoints
        xen/trace: add segment desc tracing
        xen/trace: add xen_pgd_(un)pin tracepoints
        xen/trace: add ptpage alloc/release tracepoints
        xen/trace: add mmu tracepoints
        xen/trace: add multicall tracing
        xen/trace: set up tracepoint skeleton
        xen/multicalls: remove debugfs stats
        trace/xen: add skeleton for Xen trace events
      c61264f9
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 · a23a334b
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (34 commits)
        crypto: caam - ablkcipher support
        crypto: caam - faster aead implementation
        crypto: caam - structure renaming
        crypto: caam - shorter names
        crypto: talitos - don't bad_key in ablkcipher setkey
        crypto: talitos - remove unused giv from ablkcipher methods
        crypto: talitos - don't set done notification in hot path
        crypto: talitos - ensure request ordering within a single tfm
        crypto: gf128mul - fix call to memset()
        crypto: s390 - support hardware accelerated SHA-224
        crypto: algif_hash - Handle initial af_alg_make_sg error correctly
        crypto: sha1_generic - use SHA1_BLOCK_SIZE
        hwrng: ppc4xx - add support for ppc4xx TRNG
        crypto: crypto4xx - Perform read/modify/write on device control register
        crypto: caam - fix build warning when DEBUG_FS not configured
        crypto: arc4 - Fixed coding style issues
        crypto: crc32c - Fixed coding style issue
        crypto: omap-sham - do not schedule tasklet if there is no active requests
        crypto: omap-sham - clear device flags when finishing request
        crypto: omap-sham - irq handler must not clear error code
        ...
      a23a334b
  5. 24 7月, 2011 14 次提交