1. 08 Dec, 2009 7 commits
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6 · dad3de7d
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
        PM: Add flag for devices capable of generating run-time wake-up events
        PM / Runtime: Remove unnecessary braces in __pm_runtime_set_status()
        PM / Runtime: Make documentation of runtime_idle() agree with the code
        PM / Runtime: Ensure timer_expires is nonzero in pm_schedule_suspend()
        PM / Runtime: Use deferred_resume flag in pm_request_resume
        PM / Runtime: Export the PM runtime workqueue
        PM / Runtime: Fix lockdep warning in __pm_runtime_set_status()
        PM / Hibernate: Swap, use KERN_CONT
        PM / Hibernate: Shift remaining code from swsusp.c to hibernate.c
        PM / Hibernate: Move swap functions to kernel/power/swap.c.
        PM / freezer: Don't get over-anxious while waiting
      dad3de7d
    • Linus Torvalds's avatar
      Merge branch 'kvm-updates/2.6.33' of git://git.kernel.org/pub/scm/virt/kvm/kvm · ed9216c1
      Linus Torvalds authored
      * 'kvm-updates/2.6.33' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (84 commits)
        KVM: VMX: Fix comparison of guest efer with stale host value
        KVM: s390: Fix prefix register checking in arch/s390/kvm/sigp.c
        KVM: Drop user return notifier when disabling virtualization on a cpu
        KVM: VMX: Disable unrestricted guest when EPT disabled
        KVM: x86 emulator: limit instructions to 15 bytes
        KVM: s390: Make psw available on all exits, not just a subset
        KVM: x86: Add KVM_GET/SET_VCPU_EVENTS
        KVM: VMX: Report unexpected simultaneous exceptions as internal errors
        KVM: Allow internal errors reported to userspace to carry extra data
        KVM: Reorder IOCTLs in main kvm.h
        KVM: x86: Polish exception injection via KVM_SET_GUEST_DEBUG
        KVM: only clear irq_source_id if irqchip is present
        KVM: x86: disallow KVM_{SET,GET}_LAPIC without allocated in-kernel lapic
        KVM: x86: disallow multiple KVM_CREATE_IRQCHIP
        KVM: VMX: Remove vmx->msr_offset_efer
        KVM: MMU: update invlpg handler comment
        KVM: VMX: move CR3/PDPTR update to vmx_set_cr3
        KVM: remove duplicated task_switch check
        KVM: powerpc: Fix BUILD_BUG_ON condition
        KVM: VMX: Use shared msr infrastructure
        ...
      
      Trivial conflicts due to new Kconfig options in arch/Kconfig and kernel/Makefile
      ed9216c1
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 · d7fc02c7
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1815 commits)
        mac80211: fix reorder buffer release
        iwmc3200wifi: Enable wimax core through module parameter
        iwmc3200wifi: Add wifi-wimax coexistence mode as a module parameter
        iwmc3200wifi: Coex table command does not expect a response
        iwmc3200wifi: Update wiwi priority table
        iwlwifi: driver version track kernel version
        iwlwifi: indicate uCode type when fail dump error/event log
        iwl3945: remove duplicated event logging code
        b43: fix two warnings
        ipw2100: fix rebooting hang with driver loaded
        cfg80211: indent regulatory messages with spaces
        iwmc3200wifi: fix NULL pointer dereference in pmkid update
        mac80211: Fix TX status reporting for injected data frames
        ath9k: enable 2GHz band only if the device supports it
        airo: Fix integer overflow warning
        rt2x00: Fix padding bug on L2PAD devices.
        WE: Fix set events not propagated
        b43legacy: avoid PPC fault during resume
        b43: avoid PPC fault during resume
        tcp: fix a timewait refcnt race
        ...
      
      Fix up conflicts due to sysctl cleanups (dead sysctl_check code and
      CTL_UNNUMBERED removed) in
      	kernel/sysctl_check.c
      	net/ipv4/sysctl_net_ipv4.c
      	net/ipv6/addrconf.c
      	net/sctp/sysctl.c
      d7fc02c7
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6 · ee1262db
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6:
        sparc: Set UTS_MACHINE correctly.
        sparc,leon: init_leon srmmu cleanup
        sparc32: Remove early interrupt enable.
        sparc, leon: Added Aeroflex Gaisler entry in manufacturer_info structure
        sparc64: Faster early-boot framebuffer console.
        Revert "sparc: Make atomic locks raw"
        sparc: remove unused nfsd #includes
        sparc: Fixup last users of irq_chip->typename
        Added sparc_leon3_snooping_enabled() and converted extern inline to static inline
        No auxio on LEON
        apbuart: Use of_find_node_by_path to find root node.
        sparc: Replace old style lock initializer
        sparc: Make atomic locks raw
        apbuart: Fix build and missing driver unregister.
        apbuart: Kill dependency on deprecated Sparc-only PROM interfaces.
        apbuart: Fix build warning.
        sparc: Support for GRLIB APBUART serial port
        watchdog: Remove BKL from rio watchdog driver
        sparc: Remove BKL from apc
        sparc,leon: Sparc-Leon SMP support
      ee1262db
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 · a421018e
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: (294 commits)
        S3C64XX: Staticise platform data for PCM devices
        ASoC: Rename controls with a / in wm_hubs
        snd-fm801: autodetect SF64-PCR (tuner-only) card
        ALSA: tea575x-tuner: fix mute
        ASoC: au1x: dbdma2: plug memleak in pcm device creation error path
        ASoC: au1x: dbdma2: fix oops on soc device removal.
        ALSA: hda - Fix memory leaks in the previous patch
        ALSA: hda - Add ALC661/259, ALC892/888VD support
        ALSA: opti9xx: remove snd_opti9xx fields
        ALSA: aaci - Clean up duplicate code
        ALSA: usb - Fix mixer map for Hercules Gamesurround Muse Pocket LT
        ALSA: hda - Add position_fix quirk for HP dv3
        ALSA: hda - Add a pin-fix for FSC Amilo Pi1505
        ALSA: hda - Fix Cxt5047 test mode
        ASoC: pxa/raumfeld: adopt new snd_soc_dai_set_pll() API
        ASoC: sh: fsi: Add runtime PM support
        sh: ms7724se: Add runtime PM support for FSI
        ALSA: hda - Add a position_fix quirk for MSI Wind U115
        ALSA: opti-miro: add PnP detection
        ALSA: opti-miro: separate comon probing code
        ...
      a421018e
    • Linus Torvalds's avatar
      Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6 · 3ad1f3b3
      Linus Torvalds authored
      * 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6:
        of: merge of_find_all_nodes() implementations
        of: merge other miscellaneous prototypes
        of: merge of_*_flat_dt*() functions
        of: merge of_node_get(), of_node_put() and of_find_all_nodes()
        of: merge of_read_number() an of_read_ulong()
        of: merge of_node_*_flag() and set_node_proc_entry()
        of: merge struct boot_param_header from Microblaze and PowerPC
        of: add common header for flattened device tree representation
        of: Move OF_IS_DYNAMIC and OF_MARK_DYNAMIC macros to of.h
        of: merge struct device_node
        of: merge phandle, ihandle and struct property
        of: Rework linux/of.h and asm/prom.h include ordering
      3ad1f3b3
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/sysctl-2.6 · 1557d330
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/sysctl-2.6: (43 commits)
        security/tomoyo: Remove now unnecessary handling of security_sysctl.
        security/tomoyo: Add a special case to handle accesses through the internal proc mount.
        sysctl: Drop & in front of every proc_handler.
        sysctl: Remove CTL_NONE and CTL_UNNUMBERED
        sysctl: kill dead ctl_handler definitions.
        sysctl: Remove the last of the generic binary sysctl support
        sysctl net: Remove unused binary sysctl code
        sysctl security/tomoyo: Don't look at ctl_name
        sysctl arm: Remove binary sysctl support
        sysctl x86: Remove dead binary sysctl support
        sysctl sh: Remove dead binary sysctl support
        sysctl powerpc: Remove dead binary sysctl support
        sysctl ia64: Remove dead binary sysctl support
        sysctl s390: Remove dead sysctl binary support
        sysctl frv: Remove dead binary sysctl support
        sysctl mips/lasat: Remove dead binary sysctl support
        sysctl drivers: Remove dead binary sysctl support
        sysctl crypto: Remove dead binary sysctl support
        sysctl security/keys: Remove dead binary sysctl support
        sysctl kernel: Remove binary sysctl logic
        ...
      1557d330
  2. 06 Dec, 2009 12 commits
  3. 05 Dec, 2009 21 commits
    • Linus Torvalds's avatar
      Merge branch 'x86-debug-for-linus' of... · 6ec22f9b
      Linus Torvalds authored
      Merge branch 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86: Limit number of per cpu TSC sync messages
        x86: dumpstack, 64-bit: Disable preemption when walking the IRQ/exception stacks
        x86: dumpstack: Clean up the x86_stack_ids[][] initalization and other details
        x86, cpu: mv display_cacheinfo -> cpu_detect_cache_sizes
        x86: Suppress stack overrun message for init_task
        x86: Fix cpu_devs[] initialization in early_cpu_init()
        x86: Remove CPU cache size output for non-Intel too
        x86: Minimise printk spew from per-vendor init code
        x86: Remove the CPU cache size printk's
        cpumask: Avoid cpumask_t in arch/x86/kernel/apic/nmi.c
        x86: Make sure we also print a Code: line for show_regs()
      6ec22f9b
    • Linus Torvalds's avatar
      Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip · 83be7d76
      Linus Torvalds authored
      * 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86, msr, cpumask: Use struct cpumask rather than the deprecated cpumask_t
        x86, cpuid: Simplify the code in cpuid_open
        x86, cpuid: Remove the bkl from cpuid_open()
        x86, msr: Remove the bkl from msr_open()
        x86: AMD Geode LX optimizations
        x86, msr: Unify rdmsr_on_cpus/wrmsr_on_cpus
      83be7d76
    • Linus Torvalds's avatar
      Merge branch 'x86-cleanups-for-linus' of... · c2ed69cd
      Linus Torvalds authored
      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: Fix a section mismatch in arch/x86/kernel/setup.c
        x86: Fixup last users of irq_chip->typename
        x86: Remove BKL from apm_32
        x86: Remove BKL from microcode
        x86: use kernel_stack_pointer() in kprobes.c
        x86: use kernel_stack_pointer() in kgdb.c
        x86: use kernel_stack_pointer() in dumpstack.c
        x86: use kernel_stack_pointer() in process_32.c
      c2ed69cd
    • Linus Torvalds's avatar
      Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip · ef26b169
      Linus Torvalds authored
      * 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        include/linux/compiler-gcc4.h: Fix build bug - gcc-4.0.2 doesn't understand __builtin_object_size
        x86/alternatives: No need for alternatives-asm.h to re-invent stuff already in asm.h
        x86/alternatives: Check replacementlen <= instrlen at build time
        x86, 64-bit: Set data segments to null after switching to 64-bit mode
        x86: Clean up the loadsegment() macro
        x86: Optimize loadsegment()
        x86: Add missing might_fault() checks to copy_{to,from}_user()
        x86-64: __copy_from_user_inatomic() adjustments
        x86: Remove unused thread_return label from switch_to()
        x86, 64-bit: Fix bstep_iret jump
        x86: Don't use the strict copy checks when branch profiling is in use
        x86, 64-bit: Move K8 B step iret fixup to fault entry asm
        x86: Generate cmpxchg build failures
        x86: Add a Kconfig option to turn the copy_from_user warnings into errors
        x86: Turn the copy_from_user check into an (optional) compile time warning
        x86: Use __builtin_memset and __builtin_memcpy for memset/memcpy
        x86: Use __builtin_object_size() to validate the buffer size for copy_from_user()
      ef26b169
    • Linus Torvalds's avatar
      Merge branch 'x86-apic-for-linus' of... · a77d2e08
      Linus Torvalds authored
      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: (30 commits)
        x86, apic: Enable lapic nmi watchdog on AMD Family 11h
        x86: Remove unnecessary mdelay() from cpu_disable_common()
        x86, ioapic: Document another case when level irq is seen as an edge
        x86, ioapic: Fix the EOI register detection mechanism
        x86, io-apic: Move the effort of clearing remoteIRR explicitly before migrating the irq
        x86: SGI UV: Map low MMR ranges
        x86: apic: Print out SRAT table APIC id in hex
        x86: Re-get cfg_new in case reuse/move irq_desc
        x86: apic: Remove not needed #ifdef
        x86: io-apic: IO-APIC MMIO should not fail on resource insertion
        x86: Remove asm/apicnum.h
        x86: apic: Do not use stacked physid_mask_t
        x86, apic: Get rid of apicid_to_cpu_present assign on 64-bit
        x86, ioapic: Use snrpintf while set names for IO-APIC resourses
        x86, apic: Use PAGE_SIZE instead of numbers
        x86: Remove local_irq_enable()/local_irq_disable() in fixup_irqs()
        x86: Use EOI register in io-apic on intel platforms
        x86: Force irq complete move during cpu offline
        x86: Remove move_cleanup_count from irq_cfg
        x86, intr-remap: Avoid irq_chip mask/unmask in fixup_irqs() for intr-remapping
        ...
      a77d2e08
    • Linus Torvalds's avatar
      Merge branch 'sched-core-for-linus' of... · 897e81be
      Linus Torvalds authored
      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: (35 commits)
        sched, cputime: Introduce thread_group_times()
        sched, cputime: Cleanups related to task_times()
        Revert "sched, x86: Optimize branch hint in __switch_to()"
        sched: Fix isolcpus boot option
        sched: Revert 498657a4
        sched, time: Define nsecs_to_jiffies()
        sched: Remove task_{u,s,g}time()
        sched: Introduce task_times() to replace task_{u,s}time() pair
        sched: Limit the number of scheduler debug messages
        sched.c: Call debug_show_all_locks() when dumping all tasks
        sched, x86: Optimize branch hint in __switch_to()
        sched: Optimize branch hint in context_switch()
        sched: Optimize branch hint in pick_next_task_fair()
        sched_feat_write(): Update ppos instead of file->f_pos
        sched: Sched_rt_periodic_timer vs cpu hotplug
        sched, kvm: Fix race condition involving sched_in_preempt_notifers
        sched: More generic WAKE_AFFINE vs select_idle_sibling()
        sched: Cleanup select_task_rq_fair()
        sched: Fix granularity of task_u/stime()
        sched: Fix/add missing update_rq_clock() calls
        ...
      897e81be
    • Linus Torvalds's avatar
      Merge branch 'perf-core-for-linus' of... · c3fa27d1
      Linus Torvalds authored
      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: (470 commits)
        x86: Fix comments of register/stack access functions
        perf tools: Replace %m with %a in sscanf
        hw-breakpoints: Keep track of user disabled breakpoints
        tracing/syscalls: Make syscall events print callbacks static
        tracing: Add DEFINE_EVENT(), DEFINE_SINGLE_EVENT() support to docbook
        perf: Don't free perf_mmap_data until work has been done
        perf_event: Fix compile error
        perf tools: Fix _GNU_SOURCE macro related strndup() build error
        trace_syscalls: Remove unused syscall_name_to_nr()
        trace_syscalls: Simplify syscall profile
        trace_syscalls: Remove duplicate init_enter_##sname()
        trace_syscalls: Add syscall_nr field to struct syscall_metadata
        trace_syscalls: Remove enter_id exit_id
        trace_syscalls: Set event_enter_##sname->data to its metadata
        trace_syscalls: Remove unused event_syscall_enter and event_syscall_exit
        perf_event: Initialize data.period in perf_swevent_hrtimer()
        perf probe: Simplify event naming
        perf probe: Add --list option for listing current probe events
        perf probe: Add argv_split() from lib/argv_split.c
        perf probe: Move probe event utility functions to probe-event.c
        ...
      c3fa27d1
    • David S. Miller's avatar
      Merge branch 'master' of /home/davem/src/GIT/linux-2.6/ · 28b4d5cc
      David S. Miller authored
      Conflicts:
      	drivers/net/pcmcia/fmvj18x_cs.c
      	drivers/net/pcmcia/nmclan_cs.c
      	drivers/net/pcmcia/xirc2ps_cs.c
      	drivers/net/wireless/ray_cs.c
      28b4d5cc
    • Linus Torvalds's avatar
      Merge branch 'tracing-core-for-linus' of... · 96fa2b50
      Linus Torvalds authored
      Merge branch 'tracing-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'tracing-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (40 commits)
        tracing: Separate raw syscall from syscall tracer
        ring-buffer-benchmark: Add parameters to set produce/consumer priorities
        tracing, function tracer: Clean up strstrip() usage
        ring-buffer benchmark: Run producer/consumer threads at nice +19
        tracing: Remove the stale include/trace/power.h
        tracing: Only print objcopy version warning once from recordmcount
        tracing: Prevent build warning: 'ftrace_graph_buf' defined but not used
        ring-buffer: Move access to commit_page up into function used
        tracing: do not disable interrupts for trace_clock_local
        ring-buffer: Add multiple iterations between benchmark timestamps
        kprobes: Sanitize struct kretprobe_instance allocations
        tracing: Fix to use __always_unused attribute
        compiler: Introduce __always_unused
        tracing: Exit with error if a weak function is used in recordmcount.pl
        tracing: Move conditional into update_funcs() in recordmcount.pl
        tracing: Add regex for weak functions in recordmcount.pl
        tracing: Move mcount section search to front of loop in recordmcount.pl
        tracing: Fix objcopy revision check in recordmcount.pl
        tracing: Check absolute path of input file in recordmcount.pl
        tracing: Correct the check for number of arguments in recordmcount.pl
        ...
      96fa2b50
    • Linus Torvalds's avatar
      Merge branch 'tracing-fixes-for-linus' of... · 7a797cdc
      Linus Torvalds authored
      Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        tracing: Fix trace_marker output
        tracing: Fix event format export
        tracing: Fix return value of tracing_stats_read()
      7a797cdc
    • Linus Torvalds's avatar
      Merge branch 'irq-core-for-linus' of... · bb2166c8
      Linus Torvalds authored
      Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        genirq: Fix spurious irq seqfile conversion
        genirq: switch /proc/irq/*/spurious to seq_file
        irq: Do not attempt to create subdirectories if /proc/irq/<irq> failed
        irq: Remove unused debug_poll_all_shared_irqs()
        irq: Fix docbook comments
        irq: trivial: Fix typo in comment for #endif
      bb2166c8
    • Linus Torvalds's avatar
      Merge branch 'core-softlockup-for-linus' of... · 0bf7969f
      Linus Torvalds authored
      Merge branch 'core-softlockup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'core-softlockup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        softlockup: Fix hung_task_check_count sysctl
      0bf7969f
    • Linus Torvalds's avatar
      Merge branch 'core-signal-for-linus' of... · 69f061e0
      Linus Torvalds authored
      Merge branch 'core-signal-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'core-signal-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        signal: Print warning message when dropping signals
        signal: Fix alternate signal stack check
      69f061e0
    • Linus Torvalds's avatar
      Merge branch 'core-rcu-for-linus' of... · 60778176
      Linus Torvalds authored
      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: (31 commits)
        rcu: Make RCU's CPU-stall detector be default
        rcu: Add expedited grace-period support for preemptible RCU
        rcu: Enable fourth level of TREE_RCU hierarchy
        rcu: Rename "quiet" functions
        rcu: Re-arrange code to reduce #ifdef pain
        rcu: Eliminate unneeded function wrapping
        rcu: Fix grace-period-stall bug on large systems with CPU hotplug
        rcu: Eliminate __rcu_pending() false positives
        rcu: Further cleanups of use of lastcomp
        rcu: Simplify association of forced quiescent states with grace periods
        rcu: Accelerate callback processing on CPUs not detecting GP end
        rcu: Mark init-time-only rcu_bootup_announce() as __init
        rcu: Simplify association of quiescent states with grace periods
        rcu: Rename dynticks_completed to completed_fqs
        rcu: Enable synchronize_sched_expedited() fastpath
        rcu: Remove inline from forward-referenced functions
        rcu: Fix note_new_gpnum() uses of ->gpnum
        rcu: Fix synchronization for rcu_process_gp_end() uses of ->completed counter
        rcu: Prepare for synchronization fixes: clean up for non-NO_HZ handling of ->completed counter
        rcu: Cleanup: balance rcu_irq_enter()/rcu_irq_exit() calls
        ...
      60778176
    • Linus Torvalds's avatar
      Merge branch 'core-printk-for-linus' of... · d0b093a8
      Linus Torvalds authored
      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:
        ratelimit: Make suppressed output messages more useful
        printk: Remove ratelimit.h from kernel.h
        ratelimit: Fix/allow use in atomic contexts
        ratelimit: Use per ratelimit context locking
      d0b093a8
    • Linus Torvalds's avatar
      Merge branch 'core-locking-for-linus' of... · 3e72b810
      Linus Torvalds authored
      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:
        mutex: Fix missing conditions to build mutex_spin_on_owner()
        mutex: Better control mutex adaptive spinning config
        locking, task_struct: Reduce size on TRACE_IRQFLAGS and 64bit
        locking: Use __[SPIN|RW]_LOCK_UNLOCKED in [spin|rw]_lock_init()
        locking: Remove unused prototype
        locking: Reduce ifdefs in kernel/spinlock.c
        locking: Make inlining decision Kconfig based
      3e72b810
    • Linus Torvalds's avatar
      Merge branch 'core-ipi-for-linus' of... · 9b269d40
      Linus Torvalds authored
      Merge branch 'core-ipi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'core-ipi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        generic-ipi: Add smp_call_function_any()
        generic-ipi: Fix misleading smp_call_function*() description
      9b269d40
    • Linus Torvalds's avatar
      Merge branch 'core-iommu-for-linus' of... · 7b626acb
      Linus Torvalds authored
      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: (63 commits)
        x86, Calgary IOMMU quirk: Find nearest matching Calgary while walking up the PCI tree
        x86/amd-iommu: Remove amd_iommu_pd_table
        x86/amd-iommu: Move reset_iommu_command_buffer out of locked code
        x86/amd-iommu: Cleanup DTE flushing code
        x86/amd-iommu: Introduce iommu_flush_device() function
        x86/amd-iommu: Cleanup attach/detach_device code
        x86/amd-iommu: Keep devices per domain in a list
        x86/amd-iommu: Add device bind reference counting
        x86/amd-iommu: Use dev->arch->iommu to store iommu related information
        x86/amd-iommu: Remove support for domain sharing
        x86/amd-iommu: Rearrange dma_ops related functions
        x86/amd-iommu: Move some pte allocation functions in the right section
        x86/amd-iommu: Remove iommu parameter from dma_ops_domain_alloc
        x86/amd-iommu: Use get_device_id and check_device where appropriate
        x86/amd-iommu: Move find_protection_domain to helper functions
        x86/amd-iommu: Simplify get_device_resources()
        x86/amd-iommu: Let domain_for_device handle aliases
        x86/amd-iommu: Remove iommu specific handling from dma_ops path
        x86/amd-iommu: Remove iommu parameter from __(un)map_single
        x86/amd-iommu: Make alloc_new_range aware of multiple IOMMUs
        ...
      7b626acb
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw · 1ebb275a
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw: (31 commits)
        GFS2: Fix glock refcount issues
        writeback: remove unused nonblocking and congestion checks (gfs2)
        GFS2: drop rindex glock to refresh rindex list
        GFS2: Tag all metadata with jid
        GFS2: Locking order fix in gfs2_check_blk_state
        GFS2: Remove dirent_first() function
        GFS2: Display nobarrier option in /proc/mounts
        GFS2: add barrier/nobarrier mount options
        GFS2: remove division from new statfs code
        GFS2: Improve statfs and quota usability
        GFS2: Use dquot_send_warning()
        VFS: Export dquot_send_warning
        GFS2: Add set_xquota support
        GFS2: Add get_xquota support
        GFS2: Clean up gfs2_adjust_quota() and do_glock()
        GFS2: Remove constant argument from qd_get()
        GFS2: Remove constant argument from qdsb_get()
        GFS2: Add proper error reporting to quota sync via sysfs
        GFS2: Add get_xstate quota function
        GFS2: Remove obsolete code in quota.c
        ...
      1ebb275a
    • Linus Torvalds's avatar
      Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6 · 83fdbfbf
      Linus Torvalds authored
      * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6: (30 commits)
        TOMOYO: Add recursive directory matching operator support.
        remove CONFIG_SECURITY_FILE_CAPABILITIES compile option
        SELinux: print denials for buggy kernel with unknown perms
        Silence the existing API for capability version compatibility check.
        LSM: Move security_path_chmod()/security_path_chown() to after mutex_lock().
        SELinux: header generation may hit infinite loop
        selinux: Fix warnings
        security: report the module name to security_module_request
        Config option to set a default LSM
        sysctl: require CAP_SYS_RAWIO to set mmap_min_addr
        tpm: autoload tpm_tis based on system PnP IDs
        tpm_tis: TPM_STS_DATA_EXPECT workaround
        define convenient securebits masks for prctl users (v2)
        tpm: fix header for modular build
        tomoyo: improve hash bucket dispersion
        tpm add default function definitions
        LSM: imbed ima calls in the security hooks
        SELinux: add .gitignore files for dynamic classes
        security: remove root_plug
        SELinux: fix locking issue introduced with c6d3aaa4
        ...
      83fdbfbf
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6 · d9b2c4d0
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6: (50 commits)
        pcmcia: rework the irq_req_t typedef
        pcmcia: remove deprecated handle_to_dev() macro
        pcmcia: pcmcia_request_window() doesn't need a pointer to a pointer
        pcmcia: remove unused "window_t" typedef
        pcmcia: move some window-related code to pcmcia_ioctl.c
        pcmcia: Change window_handle_t logic to unsigned long
        pcmcia: Pass struct pcmcia_socket to pcmcia_get_mem_page()
        pcmcia: Pass struct pcmcia_device to pcmcia_map_mem_page()
        pcmcia: Pass struct pcmcia_device to pcmcia_release_window()
        drivers/pcmcia: remove unnecessary kzalloc
        pcmcia: correct handling for Zoomed Video registers in topic.h
        pcmcia: fix printk formats
        pcmcia: autoload module pcmcia
        pcmcia/staging: update comedi drivers
        PCMCIA: stop duplicating pci_irq in soc_pcmcia_socket
        PCMCIA: ss: allow PCI IRQs > 255
        PCMCIA: soc_common: remove 'dev' member from soc_pcmcia_socket
        PCMCIA: soc_common: constify soc_pcmcia_socket ops member
        PCMCIA: sa1111: remove duplicated initializers
        PCMCIA: sa1111: wrap soc_pcmcia_socket to contain sa1111 specific data
        ...
      d9b2c4d0