1. 23 7月, 2011 40 次提交
    • O
      virtio: expose for non-virtualization users too · e7254219
      Ohad Ben-Cohen 提交于
      virtio has been so far used only in the context of virtualization,
      and the virtio Kconfig was sourced directly by the relevant arch
      Kconfigs when VIRTUALIZATION was selected.
      
      Now that we start using virtio for inter-processor communications,
      we need to source the virtio Kconfig outside of the virtualization
      scope too.
      
      Moreover, some architectures might use virtio for both virtualization
      and inter-processor communications, so directly sourcing virtio
      might yield unexpected results due to conflicting selections.
      
      The simple solution offered by this patch is to always source virtio's
      Kconfig in drivers/Kconfig, and remove it from the appropriate arch
      Kconfigs. Additionally, a virtio menu entry has been added so virtio
      drivers don't show up in the general drivers menu.
      
      This way anyone can use virtio, though it's arguably less accessible
      (and neat!) for virtualization users now.
      
      Note: some architectures (mips and sh) seem to have a VIRTUALIZATION
      menu merely for sourcing virtio's Kconfig, so that menu is removed too.
      Signed-off-by: NOhad Ben-Cohen <ohad@wizery.com>
      Signed-off-by: NRusty Russell <rusty@rustcorp.com.au>
      e7254219
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6 · bbd9d6f7
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6: (107 commits)
        vfs: use ERR_CAST for err-ptr tossing in lookup_instantiate_filp
        isofs: Remove global fs lock
        jffs2: fix IN_DELETE_SELF on overwriting rename() killing a directory
        fix IN_DELETE_SELF on overwriting rename() on ramfs et.al.
        mm/truncate.c: fix build for CONFIG_BLOCK not enabled
        fs:update the NOTE of the file_operations structure
        Remove dead code in dget_parent()
        AFS: Fix silly characters in a comment
        switch d_add_ci() to d_splice_alias() in "found negative" case as well
        simplify gfs2_lookup()
        jfs_lookup(): don't bother with . or ..
        get rid of useless dget_parent() in btrfs rename() and link()
        get rid of useless dget_parent() in fs/btrfs/ioctl.c
        fs: push i_mutex and filemap_write_and_wait down into ->fsync() handlers
        drivers: fix up various ->llseek() implementations
        fs: handle SEEK_HOLE/SEEK_DATA properly in all fs's that define their own llseek
        Ext4: handle SEEK_HOLE/SEEK_DATA generically
        Btrfs: implement our own ->llseek
        fs: add SEEK_HOLE and SEEK_DATA flags
        reiserfs: make reiserfs default to barrier=flush
        ...
      
      Fix up trivial conflicts in fs/xfs/linux-2.6/xfs_super.c due to the new
      shrinker callout for the inode cache, that clashed with the xfs code to
      start the periodic workers later.
      bbd9d6f7
    • L
      Merge branch 'x86-vdso-for-linus' of... · 8e204874
      Linus Torvalds 提交于
      Merge branch 'x86-vdso-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'x86-vdso-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86-64, vdso: Do not allocate memory for the vDSO
        clocksource: Change __ARCH_HAS_CLOCKSOURCE_DATA to a CONFIG option
        x86, vdso: Drop now wrong comment
        Document the vDSO and add a reference parser
        ia64: Replace clocksource.fsys_mmio with generic arch data
        x86-64: Move vread_tsc and vread_hpet into the vDSO
        clocksource: Replace vread with generic arch data
        x86-64: Add --no-undefined to vDSO build
        x86-64: Allow alternative patching in the vDSO
        x86: Make alternative instruction pointers relative
        x86-64: Improve vsyscall emulation CS and RIP handling
        x86-64: Emulate legacy vsyscalls
        x86-64: Fill unused parts of the vsyscall page with 0xcc
        x86-64: Remove vsyscall number 3 (venosys)
        x86-64: Map the HPET NX
        x86-64: Remove kernel.vsyscall64 sysctl
        x86-64: Give vvars their own page
        x86-64: Document some of entry_64.S
        x86-64: Fix alignment of jiffies variable
      8e204874
    • L
      Merge branch 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip · 3e0b8df7
      Linus Torvalds 提交于
      * 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86, UV: Correct UV2 BAU destination timeout
        x86, UV: Correct failed topology memory leak
        x86, UV: Remove cpumask_t from the stack
        x86, UV: Rename hubmask to pnmask
        x86, UV: Correct reset_with_ipi()
        x86, UV: Allow for non-consecutive sockets
        x86, UV: Inline header file functions
        x86, UV: Fix smp_processor_id() use in a preemptable region
        x66, UV: Enable 64-bit ACPI MFCG support for SGI UV2 platform
        x86, UV: Clean up uv_mmrs.h
      3e0b8df7
    • L
      Merge branch 'x86-signal-for-linus' of... · 80512079
      Linus Torvalds 提交于
      Merge branch 'x86-signal-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'x86-signal-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86: Kill handle_signal()->set_fs()
        x86, do_signal: Simplify the TS_RESTORE_SIGMASK logic
        x86, signals: Convert the X86_32 code to use set_current_blocked()
        x86, signals: Convert the IA32_EMULATION code to use set_current_blocked()
      80512079
    • L
      Merge branch 'x86-numa-for-linus' of... · 9e39264e
      Linus Torvalds 提交于
      Merge branch 'x86-numa-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'x86-numa-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86, numa: Implement pfn -> nid mapping granularity check
        x86, mm: s/PAGES_PER_ELEMENT/PAGES_PER_SECTION/
      9e39264e
    • L
      Merge branch 'x86-mtrr-for-linus' of... · dc43d9fa
      Linus Torvalds 提交于
      Merge branch 'x86-mtrr-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'x86-mtrr-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86, mtrr: Use pci_dev->revision
        x86, mtrr: use stop_machine APIs for doing MTRR rendezvous
        stop_machine: implement stop_machine_from_inactive_cpu()
        stop_machine: reorganize stop_cpus() implementation
        x86, mtrr: lock stop machine during MTRR rendezvous sequence
      dc43d9fa
    • L
      Merge branch 'x86-microcode-for-linus' of... · 80775068
      Linus Torvalds 提交于
      Merge branch 'x86-microcode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'x86-microcode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86, microcode, AMD: Fix section header size check
        x86, microcode, AMD: Correct buf references
      80775068
    • L
      Merge branch 'x86-mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip · 7c6582b2
      Linus Torvalds 提交于
      * 'x86-mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86, mce: Use mce_sysdev_ prefix to group functions
        x86, mce: Use mce_chrdev_ prefix to group functions
        x86, mce: Cleanup mce_read()
        x86, mce: Cleanup mce_create()/remove_device()
        x86, mce: Check the result of ancient_init()
        x86, mce: Introduce mce_gather_info()
        x86, mce: Replace MCM_ with MCI_MISC_
        x86, mce: Replace MCE_SELF_VECTOR by irq_work
        x86, mce, severity: Clean up trivial coding style problems
        x86, mce, severity: Cleanup severity table
        x86, mce, severity: Make formatting a bit more readable
        x86, mce, severity: Fix two severities table signatures
      7c6582b2
    • L
      Merge branch 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip · 227ad9bc
      Linus Torvalds 提交于
      * 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86, efi: Properly pre-initialize table pointers
        x86, efi: Add infrastructure for UEFI 2.0 runtime services
        x86, efi: Fix argument types for SetVariable()
      227ad9bc
    • L
      Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip · 35b004cc
      Linus Torvalds 提交于
      * 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86, intel, power: Correct the MSR_IA32_ENERGY_PERF_BIAS message
        x86, msr: Fix typo in ENERGY_PERF_BIAS_POWERSAVE
        x86, intel, power: Initialize MSR_IA32_ENERGY_PERF_BIAS
      35b004cc
    • L
      Merge branch 'x86-cleanups-for-linus' of... · 0a613b64
      Linus Torvalds 提交于
      Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86, smpboot: Mark the names[] array in __inquire_remote_apic() as const
        x86: Convert vmalloc()+memset() to vzalloc()
      0a613b64
    • L
      Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip · eb47418d
      Linus Torvalds 提交于
      * 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86: Fix write lock scalability 64-bit issue
        x86: Unify rwsem assembly implementation
        x86: Unify rwlock assembly implementation
        x86, asm: Fix binutils 2.16 issue with __USER32_CS
        x86, asm: Cleanup thunk_64.S
        x86, asm: Flip RESTORE_ARGS arguments logic
        x86, asm: Flip SAVE_ARGS arguments logic
        x86, asm: Thin down SAVE/RESTORE_* asm macros
      eb47418d
    • L
      Merge branch 'x86-apic-for-linus' of... · 2c9e88a1
      Linus Torvalds 提交于
      Merge branch 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86, ioapic: Print IR_IO_APIC_route_entry when IR is enabled
        x86, ioapic: Print IRTE when IR is enabled
        x86, x2apic: Preserve high 32-bits of IA32_APIC_BASE MSR
        x86, ioapic: Also print Dest field
        x86, ioapic: Format clean up for IOAPIC output
        x86: print APIC data a little later during boot
      2c9e88a1
    • L
      Merge branch 'timers-rtc-for-linus' of... · 52de84f3
      Linus Torvalds 提交于
      Merge branch 'timers-rtc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'timers-rtc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86: Serialize EFI time accesses on rtc_lock
        x86: Serialize SMP bootup CMOS accesses on rtc_lock
        rtc: stmp3xxx: Remove UIE handlers
        rtc: stmp3xxx: Get rid of mach-specific accessors
        rtc: stmp3xxx: Initialize drvdata before registering device
        rtc: stmp3xxx: Port stmp-functions to mxs-equivalents
        rtc: stmp3xxx: Restore register definitions
        rtc: vt8500: Use define instead of hardcoded value for status bit
      52de84f3
    • L
      Merge branch 'timers-core-for-linus' of... · 112ec469
      Linus Torvalds 提交于
      Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        time: Fix stupid KERN_WARN compile issue
        rtc: Avoid accumulating time drift in suspend/resume
        time: Avoid accumulating time drift in suspend/resume
        time: Catch invalid timespec sleep values in __timekeeping_inject_sleeptime
      112ec469
    • L
      Merge branch 'timers-cleanup-for-linus' of... · a99a7d14
      Linus Torvalds 提交于
      Merge branch 'timers-cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'timers-cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        mips: Fix i8253 clockevent fallout
        i8253: Cleanup outb/inb magic
        arm: Footbridge: Use common i8253 clockevent
        mips: Use common i8253 clockevent
        x86: Use common i8253 clockevent
        i8253: Create common clockevent implementation
        i8253: Export i8253_lock unconditionally
        pcpskr: MIPS: Make config dependencies finer grained
        pcspkr: Cleanup Kconfig dependencies
        i8253: Move remaining content and delete asm/i8253.h
        i8253: Consolidate definitions of PIT_LATCH
        x86: i8253: Consolidate definitions of global_clock_event
        i8253: Alpha, PowerPC: Remove unused asm/8253pit.h
        alpha: i8253: Cleanup remaining users of i8253pit.h
        i8253: Remove I8253_LOCK config
        i8253: Make pcsp sound driver use the shared i8253_lock
        i8253: Make pcspkr input driver use the shared i8253_lock
        i8253: Consolidate all kernel definitions of i8253_lock
        i8253: Unify all kernel declarations of i8253_lock
        i8253: Create linux/i8253.h and use it in all 8253 related files
      a99a7d14
    • L
      Merge branch 'sched-core-for-linus' of... · bdc7ccfc
      Linus Torvalds 提交于
      Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (24 commits)
        sched: Cleanup duplicate local variable in [enqueue|dequeue]_task_fair
        sched: Replace use of entity_key()
        sched: Separate group-scheduling code more clearly
        sched: Reorder root_domain to remove 64 bit alignment padding
        sched: Do not attempt to destroy uninitialized rt_bandwidth
        sched: Remove unused function cpu_cfs_rq()
        sched: Fix (harmless) typo 'CONFG_FAIR_GROUP_SCHED'
        sched, cgroup: Optimize load_balance_fair()
        sched: Don't update shares twice on on_rq parent
        sched: update correct entity's runtime in check_preempt_wakeup()
        xtensa: Use generic config PREEMPT definition
        h8300: Use generic config PREEMPT definition
        m32r: Use generic PREEMPT config
        sched: Skip autogroup when looking for all rt sched groups
        sched: Simplify mutex_spin_on_owner()
        sched: Remove rcu_read_lock() from wake_affine()
        sched: Generalize sleep inside spinlock detection
        sched: Make sleeping inside spinlock detection working in !CONFIG_PREEMPT
        sched: Isolate preempt counting in its own config option
        sched: Remove pointless in_atomic() definition check
        ...
      bdc7ccfc
    • L
      Merge branch 'perf-core-for-linus' of... · 4d4abdcb
      Linus Torvalds 提交于
      Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (123 commits)
        perf: Remove the nmi parameter from the oprofile_perf backend
        x86, perf: Make copy_from_user_nmi() a library function
        perf: Remove perf_event_attr::type check
        x86, perf: P4 PMU - Fix typos in comments and style cleanup
        perf tools: Make test use the preset debugfs path
        perf tools: Add automated tests for events parsing
        perf tools: De-opt the parse_events function
        perf script: Fix display of IP address for non-callchain path
        perf tools: Fix endian conversion reading event attr from file header
        perf tools: Add missing 'node' alias to the hw_cache[] array
        perf probe: Support adding probes on offline kernel modules
        perf probe: Add probed module in front of function
        perf probe: Introduce debuginfo to encapsulate dwarf information
        perf-probe: Move dwarf library routines to dwarf-aux.{c, h}
        perf probe: Remove redundant dwarf functions
        perf probe: Move strtailcmp to string.c
        perf probe: Rename DIE_FIND_CB_FOUND to DIE_FIND_CB_END
        tracing/kprobe: Update symbol reference when loading module
        tracing/kprobes: Support module init function probing
        kprobes: Return -ENOENT if probe point doesn't exist
        ...
      4d4abdcb
    • L
      Merge branch 'core-rcu-for-linus' of... · 0342cbcf
      Linus Torvalds 提交于
      Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        rcu: Fix wrong check in list_splice_init_rcu()
        net,rcu: Convert call_rcu(xt_rateest_free_rcu) to kfree_rcu()
        sysctl,rcu: Convert call_rcu(free_head) to kfree
        vmalloc,rcu: Convert call_rcu(rcu_free_vb) to kfree_rcu()
        vmalloc,rcu: Convert call_rcu(rcu_free_va) to kfree_rcu()
        ipc,rcu: Convert call_rcu(ipc_immediate_free) to kfree_rcu()
        ipc,rcu: Convert call_rcu(free_un) to kfree_rcu()
        security,rcu: Convert call_rcu(sel_netport_free) to kfree_rcu()
        security,rcu: Convert call_rcu(sel_netnode_free) to kfree_rcu()
        ia64,rcu: Convert call_rcu(sn_irq_info_free) to kfree_rcu()
        block,rcu: Convert call_rcu(disk_free_ptbl_rcu_cb) to kfree_rcu()
        scsi,rcu: Convert call_rcu(fc_rport_free_rcu) to kfree_rcu()
        audit_tree,rcu: Convert call_rcu(__put_tree) to kfree_rcu()
        security,rcu: Convert call_rcu(whitelist_item_free) to kfree_rcu()
        md,rcu: Convert call_rcu(free_conf) to kfree_rcu()
      0342cbcf
    • L
      Merge branch 'core-printk-for-linus' of... · 391d6276
      Linus Torvalds 提交于
      Merge branch 'core-printk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'core-printk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        lockdep: Fix trace_[soft,hard]irqs_[on,off]() recursion
        printk: Fix console_sem vs logbuf_lock unlock race
        printk: Release console_sem after logbuf_lock
      391d6276
    • L
      Merge branch 'core-locking-for-linus' of... · 75b56ec2
      Linus Torvalds 提交于
      Merge branch 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        lockdep: Fix lockdep_no_validate against IRQ states
        mutex: Make mutex_destroy() an inline function
        plist: Remove the need to supply locks to plist heads
        lockup detector: Fix reference to the non-existent CONFIG_DETECT_SOFTLOCKUP option
      75b56ec2
    • K
      vfs: use ERR_CAST for err-ptr tossing in lookup_instantiate_filp · 5a9a4364
      Konstantin Khlebnikov 提交于
      Replace unclear (struct dentry *) to (struct file *) typecast with ERR_CAST() macro.
      Signed-off-by: NKonstantin Khlebnikov <khlebnikov@openvz.org>
      Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
      5a9a4364
    • J
      isofs: Remove global fs lock · d769b3c2
      Jan Kara 提交于
      sbi->s_mutex isn't needed for isofs at all so we can just remove it. Generally,
      since isofs is always mounted read-only, filesystem structure cannot change
      under us.  So buffer_head contents stays constant after it's filled in. That
      leaves us with possible changes of global data structures. Superblock changes
      only during filesystem mount (even remount does not change it), inodes are only
      filled in during reading from disk. So there are no changes of these structures
      to bother about.
      
      Arguments why sbi->s_mutex can be removed at each place:
      isofs_readdir: Accesses sb, inode, filp, local variables => s_mutex not needed
      isofs_lookup: Protected by directory's i_mutex. Accesses sb, inode, dentry,
        local variables => s_mutex not needed
      rock_ridge_symlink_readpage: Protected by page lock. Accesses sb, inode,
        local variables => s_mutex not needed.
      Signed-off-by: NJan Kara <jack@suse.cz>
      Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
      d769b3c2
    • A
      jffs2: fix IN_DELETE_SELF on overwriting rename() killing a directory · 22ba747f
      Al Viro 提交于
      We don't generate IN_DELETE_SELF on victim of overwriting rename() if
      it happens to be a directory.  Trivially fixed by doing to ->i_nlink
      what we do ->pino_nlink a couple of lines later in jffs2_rename().
      Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
      22ba747f
    • A
      fix IN_DELETE_SELF on overwriting rename() on ramfs et.al. · 841590ce
      Al Viro 提交于
      On ramfs and other simple_rename() users IN_DELETE_SELF is not generated
      for victim of overwriting rename() if it's is a directory.  Works on
      most of the local filesystems and really trivial to fix...
      Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
      841590ce
    • R
      mm/truncate.c: fix build for CONFIG_BLOCK not enabled · ed70afcd
      Randy Dunlap 提交于
      Fix build error when CONFIG_BLOCK is not enabled by providing a stub
      inode_dio_wait() function.
      
      mm/truncate.c:612: error: implicit declaration of function 'inode_dio_wait'
      Signed-off-by: NRandy Dunlap <rdunlap@xenotime.net>
      Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
      ed70afcd
    • L
      Merge branch 'core-iommu-for-linus' of... · 6d16d6d9
      Linus Torvalds 提交于
      Merge branch 'core-iommu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'core-iommu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        iommu/core: Fix build with INTR_REMAP=y && CONFIG_DMAR=n
        iommu/amd: Don't use MSI address range for DMA addresses
        iommu/amd: Move missing parts to drivers/iommu
        iommu: Move iommu Kconfig entries to submenu
        x86/ia64: intel-iommu: move to drivers/iommu/
        x86: amd_iommu: move to drivers/iommu/
        msm: iommu: move to drivers/iommu/
        drivers: iommu: move to a dedicated folder
        x86/amd-iommu: Store device alias as dev_data pointer
        x86/amd-iommu: Search for existind dev_data before allocting a new one
        x86/amd-iommu: Allow dev_data->alias to be NULL
        x86/amd-iommu: Use only dev_data in low-level domain attach/detach functions
        x86/amd-iommu: Use only dev_data for dte and iotlb flushing routines
        x86/amd-iommu: Store ATS state in dev_data
        x86/amd-iommu: Store devid in dev_data
        x86/amd-iommu: Introduce global dev_data_list
        x86/amd-iommu: Remove redundant device_flush_dte() calls
        iommu-api: Add missing header file
      
      Fix up trivial conflicts (independent additions close to each other) in
      drivers/Makefile and include/linux/pci.h
      6d16d6d9
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6 · 431bf99d
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6: (51 commits)
        PM: Improve error code of pm_notifier_call_chain()
        PM: Add "RTC" to PM trace time stamps to avoid confusion
        PM / Suspend: Export suspend_set_ops, suspend_valid_only_mem
        PM / Suspend: Add .suspend_again() callback to suspend_ops
        PM / OPP: Introduce function to free cpufreq table
        ARM / shmobile: Return -EBUSY from A4LC power off if A3RV is active
        PM / Domains: Take .power_off() error code into account
        ARM / shmobile: Use genpd_queue_power_off_work()
        ARM / shmobile: Use pm_genpd_poweroff_unused()
        PM / Domains: Introduce function to power off all unused PM domains
        OMAP: PM: disable idle on suspend for GPIO and UART
        OMAP: PM: omap_device: add API to disable idle on suspend
        OMAP: PM: omap_device: add system PM methods for PM domain handling
        OMAP: PM: omap_device: conditionally use PM domain runtime helpers
        PM / Runtime: Add new helper function: pm_runtime_status_suspended()
        PM / Domains: Queue up power off work only if it is not pending
        PM / Domains: Improve handling of wakeup devices during system suspend
        PM / Domains: Do not restore all devices on power off error
        PM / Domains: Allow callbacks to execute all runtime PM helpers
        PM / Domains: Do not execute device callbacks under locks
        ...
      431bf99d
    • L
      Merge branch 'for-linus-core' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending · 72f96e0e
      Linus Torvalds 提交于
      * 'for-linus-core' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending: (38 commits)
        target: Bump version to v4.1.0-rc1-ml
        target: remove custom hex2bin() implementation
        target: fix typo Assoication -> Association
        target: Update QUEUE ALGORITHM MODIFIER control page default
        target: ->map_task_SG conversion to ->map_control_SG and ->map_data_SG
        target: Follow up core updates from AGrover and HCH (round 4)
        target: Eliminate usage of struct se_mem
        target: Pass 2nd param of transport_split_cdb by value
        target: Enforce 1 page max for control cdb buffer sizes
        target: Make all control CDBs scatter-gather
        target: Implement Block Device Characteristics VPD page
        target: Fix reporting of supported VPD pages
        target: Allow for built-in target modules
        tcm_fc: Convert to wake_up_process and schedule_timeout_interruptible
        tcm_fc: Makefile cleanups
        loopback: Fix memory leak in tcm_loop_make_scsi_hba()
        loopback: Remove duplicate scsi/scsi_tcq.h include
        loopback: off by one in tcm_loop_make_naa_tpg()
        target/iblock: Remove unused iblock_dev members
        target/iblock: Use request_queue->nr_request for se_device defaults
        ...
      72f96e0e
    • L
      Merge branch 'for-3.1' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu · 17413f5a
      Linus Torvalds 提交于
      * 'for-3.1' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu:
        percpu: Fixup __this_cpu_xchg* operations
      17413f5a
    • L
      Merge branch 'for-3.1' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq · 5a791ea4
      Linus Torvalds 提交于
      * 'for-3.1' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:
        workqueue: separate out drain_workqueue() from destroy_workqueue()
        workqueue: remove cancel_rearming_delayed_work[queue]()
      5a791ea4
    • L
      Merge branch 'ptrace' of git://git.kernel.org/pub/scm/linux/kernel/git/oleg/misc · 8209f53d
      Linus Torvalds 提交于
      * 'ptrace' of git://git.kernel.org/pub/scm/linux/kernel/git/oleg/misc: (39 commits)
        ptrace: do_wait(traced_leader_killed_by_mt_exec) can block forever
        ptrace: fix ptrace_signal() && STOP_DEQUEUED interaction
        connector: add an event for monitoring process tracers
        ptrace: dont send SIGSTOP on auto-attach if PT_SEIZED
        ptrace: mv send-SIGSTOP from do_fork() to ptrace_init_task()
        ptrace_init_task: initialize child->jobctl explicitly
        has_stopped_jobs: s/task_is_stopped/SIGNAL_STOP_STOPPED/
        ptrace: make former thread ID available via PTRACE_GETEVENTMSG after PTRACE_EVENT_EXEC stop
        ptrace: wait_consider_task: s/same_thread_group/ptrace_reparented/
        ptrace: kill real_parent_is_ptracer() in in favor of ptrace_reparented()
        ptrace: ptrace_reparented() should check same_thread_group()
        redefine thread_group_leader() as exit_signal >= 0
        do not change dead_task->exit_signal
        kill task_detached()
        reparent_leader: check EXIT_DEAD instead of task_detached()
        make do_notify_parent() __must_check, update the callers
        __ptrace_detach: avoid task_detached(), check do_notify_parent()
        kill tracehook_notify_death()
        make do_notify_parent() return bool
        ptrace: s/tracehook_tracer_task()/ptrace_parent()/
        ...
      8209f53d
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid · 22a3b977
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (31 commits)
        HID: fix support for Microsoft comfort mouse 4500
        HID: hid-multitouch: add one new multitouch device's VID/PID
        HID: prodikeys: remove a redundant forward declaration of struct pcmidi_snd
        HID: prodikeys: make needlessly global symbols static
        HID: emsff: properly handle emsff_init failure
        HID: ACRUX - add missing hid_hw_stop() in ax_probe() error path
        HID: fix horizontal wheel for ms comfort mouse 4500
        HID: uclogic: Add support for UC-Logic WP1062
        HID: wiimote: Add sysfs support to wiimote driver
        HID: wiimote: Cache wiimote led state
        HID: wiimote: Add wiimote led request
        HID: wiimote: Add wiimote input button parser
        HID: wiimote: Add wiimote event handler
        HID: wiimote: Add output queue for wiimote driver
        HID: wiimote: Add wiimote send function
        HID: wiimote: Synchronize wiimote input and hid event handling
        HID: wiimote: Register input device in wiimote hid driver
        HID: wiimote: Add wiimote device structure
        HID: wiimote: Register wiimote hid driver stub
        HID: wiimote: Add Nintendo Wii Remote driver stub
        ...
      22a3b977
    • L
      Merge branch 'of-pci' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc · acb41c0f
      Linus Torvalds 提交于
      * 'of-pci' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
        pci/of: Consolidate pci_bus_to_OF_node()
        pci/of: Consolidate pci_device_to_OF_node()
        x86/devicetree: Use generic PCI <-> OF matching
        microblaze/pci: Move the remains of pci_32.c to pci-common.c
        microblaze/pci: Remove powermac originated cruft
        pci/of: Match PCI devices to OF nodes dynamically
      acb41c0f
    • L
      Merge branch 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6 · 8181780c
      Linus Torvalds 提交于
      * 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6:
        dt: include linux/errno.h in linux/of_address.h
        of/address: Add of_find_matching_node_by_address helper
        dt: remove extra xsysace platform_driver registration
        tty/serial: Add devicetree support for nVidia Tegra serial ports
        dt: add empty of_property_read_u32[_array] for non-dt
        dt: bindings: move SEC node under new crypto/
        dt: add helper function to read u32 arrays
        tty/serial: change of_serial to use new of_property_read_u32() api
        dt: add 'const' for of_property_read_string parameter **out_string
        dt: add helper functions to read u32 and string property values
        tty: of_serial: support for 32 bit accesses
        dt: document the of_serial bindings
        dt/platform: allow device name to be overridden
        drivers/amba: create devices from device tree
        dt: add of_platform_populate() for creating device from the device tree
        dt: Add default match table for bus ids
      8181780c
    • L
      Merge branch 'spi/next' of git://git.secretlab.ca/git/linux-2.6 · 7235dd74
      Linus Torvalds 提交于
      * 'spi/next' of git://git.secretlab.ca/git/linux-2.6: (34 commits)
        spi/imx: add device tree probe support
        spi/imx: copy gpio number passed by platform data into driver private data
        spi/imx: use soc name in spi device type naming scheme
        spi/imx: merge type SPI_IMX_VER_0_7 into SPI_IMX_VER_0_4
        spi/imx: do not use spi_imx2_3 to name SPI_IMX_VER_2_3 function and macro
        spi/imx: use mx21 to name SPI_IMX_VER_0_0 function and macro
        spi/imx: do not make copy of spi_imx_devtype_data
        spi/dw: Add spi number into spi irq desc
        spi/tegra: Use engineering names in DT compatible property
        spi/fsl_spi: fix CPM spi driver
        mach-s3c2410: remove unused spi-gpio.h file
        spi: remove obsolete spi-s3c24xx-gpio driver
        mach-gta2: remove unused spi-gpio.h include
        mach-qt2410: convert to spi_gpio
        mach-jive: convert to spi_gpio
        spi/pxa2xx: Remove unavailable ssp_type from documentation
        spi/bfin_spi: uninline fat queue funcs
        spi/bfin_spi: constify pin array
        spi/bfin_spi: use structs for accessing hardware regs
        spi/topcliff-pch: Support new device ML7223 IOH
        ...
      
      Fix up trivial conflict in arch/arm/mach-ep93xx/Makefile
      7235dd74
    • L
      Merge branch 'gpio/next' of git://git.secretlab.ca/git/linux-2.6 · c7c85184
      Linus Torvalds 提交于
      * 'gpio/next' of git://git.secretlab.ca/git/linux-2.6: (61 commits)
        gpio/mxc/mxs: fix build error introduced by the irq_gc_ack() renaming
        mcp23s08: add i2c support
        mcp23s08: isolate spi specific parts
        mcp23s08: get rid of setup/teardown callbacks
        gpio/tegra: dt: add binding for gpio polarity
        mcp23s08: remove unused work queue
        gpio/da9052: remove a redundant assignment for gpio->da9052
        gpio/mxc: add device tree probe support
        ARM: mxc: use ARCH_NR_GPIOS to define gpio number
        gpio/mxc: get rid of the uses of cpu_is_mx()
        gpio/mxc: add missing initialization of basic_mmio_gpio shadow variables
        gpio: Move mpc5200 gpio driver to drivers/gpio
        GPIO: DA9052 GPIO module v3
        gpio/tegra: Use engineering names in DT compatible property
        of/gpio: Add new method for getting gpios under different property names
        gpio/dt: Refine GPIO device tree binding
        gpio/ml-ioh: fix off-by-one for displaying variable i in dev_err
        gpio/pca953x: Deprecate meaningless device-tree bindings
        gpio/pca953x: Remove dynamic platform data pointer
        gpio/pca953x: Fix IRQ support.
        ...
      c7c85184
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband · ece236ce
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: (26 commits)
        IB/qib: Defer HCA error events to tasklet
        mlx4_core: Bump the driver version to 1.0
        RDMA/cxgb4: Use printk_ratelimited() instead of printk_ratelimit()
        IB/mlx4: Support PMA counters for IBoE
        IB/mlx4: Use flow counters on IBoE ports
        IB/pma: Add include file for IBA performance counters definitions
        mlx4_core: Add network flow counters
        mlx4_core: Fix location of counter index in QP context struct
        mlx4_core: Read extended capabilities into the flags field
        mlx4_core: Extend capability flags to 64 bits
        IB/mlx4: Generate GID change events in IBoE code
        IB/core: Add GID change event
        RDMA/cma: Don't allow IPoIB port space for IBoE
        RDMA: Allow for NULL .modify_device() and .modify_port() methods
        IB/qib: Update active link width
        IB/qib: Fix potential deadlock with link down interrupt
        IB/qib: Add sysfs interface to read free contexts
        IB/mthca: Remove unnecessary read of PCI_CAP_ID_EXP
        IB/qib: Remove double define
        IB/qib: Remove unnecessary read of PCI_CAP_ID_EXP
        ...
      ece236ce
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6 · 441c196e
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
        firewire: document the sysfs ABIs
        firewire: cdev: ABI documentation enhancements
        firewire: cdev: prevent race between first get_info ioctl and bus reset event queuing
        firewire: cdev: return -ENOTTY for unimplemented ioctls, not -EINVAL
        firewire: ohci: skip soft reset retries after card ejection
        firewire: ohci: fix PHY reg access after card ejection
        firewire: ohci: add a comment on PHY reg access serialization
        firewire: ohci: reduce potential context_stop latency
        firewire: ohci: remove superfluous posted write flushes
        firewire: net: replacing deprecated __attribute__((packed)) with __packed
      441c196e