Linus Torvalds
95694129b4
Merge branch 'paul' (Fixups from Paul Gortmaker) ...
This merges some of the fixes from Paul Gortmaker for the header file
cleanup fallout.
Some of the patches are going through arch maintainer trees, and David
Howells suggested another be done differently, but this at least fixes a
few cases.
* emailed from Paul Gortmaker <paul.gortmaker@windriver.com>:
asm-generic: add linux/types.h to cmpxchg.h
firewire: restore the device.h include in linux/firewire.h
frv: fix warnings in mb93090-mb00/pci-dma.c about implicit EXPORT_SYMBOL
parisc: fix missing cmpxchg file error from system.h split
blackfin: fix cmpxchg build fails from system.h fallout
avr32: fix build failures from mis-naming of atmel_nand.h
ARM: mach-msm: fix compile fail from system.h fallout
irq_work: fix compile failure on MIPS from system.h split
2012-04-02 14:41:43 -07:00
Disintegrate and delete asm/system.h
2012-03-28 15:58:21 -07:00
Merge branch 'linus' into perf/urgent
2012-03-26 17:19:03 +02:00
gcov: disable CONSTRUCTORS for UML
2011-07-26 16:49:45 -07:00
Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2012-03-30 18:08:05 -07:00
Power management updates for 3.4
2012-03-21 10:15:51 -07:00
Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2012-03-31 13:35:31 -07:00
Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2012-03-29 14:16:48 -07:00
tracing: Fix ent_size in trace output
2012-03-27 12:05:44 -04:00
Merge branch 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2012-01-08 12:19:57 -08:00
kernel/async: remove redundant declaration.
2012-01-13 09:32:18 +10:30
constify path argument of audit_log_d_path()
2012-03-20 21:29:40 -04:00
audit: remove AUDIT_SETUP_CONTEXT as it isn't used
2012-01-17 16:16:57 -05:00
audit_tree,rcu: Convert call_rcu(__put_tree) to kfree_rcu()
2011-07-20 14:10:11 -07:00
audit: allow interfield comparison in audit rules
2012-01-17 16:17:01 -05:00
kernel-doc: fix new warnings in auditsc.c
2012-01-23 08:44:53 -08:00
Revert "capabitlies: ns_capable can use the cap helpers rather than lsm call"
2012-01-17 10:19:41 -08:00
cgroup: cgroup_attach_task() could return -errno after success
2012-03-29 22:03:33 -07:00
cgroup: remove cgroup_subsys argument from callbacks
2012-02-02 09:20:22 -08:00
compat: Add helper functions to read/write struct timeval, timespec
2012-02-20 12:48:47 -08:00
kernel/configs.c: include MODULE_*() when CONFIG_IKCONFIG_PROC=n
2011-07-25 20:57:15 -07:00
Merge branch 'pm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
2012-01-08 13:10:57 -08:00
cpu_pm: call notifiers during suspend
2011-09-23 12:05:29 +05:30
Autogenerated GPG tag for Rusty D1ADB8F1: 15EE 8D6C AB0E 7F0C F999 BFCB D920 0E6C D1AD B8F1
2012-04-02 08:53:24 -07:00
Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux
2011-11-06 19:44:47 -08:00
security: trim security.h
2012-02-14 10:45:42 +11:00
KVM: Steal time implementation
2011-07-14 12:59:14 +03:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
Merge branch 'x86-x32-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2012-03-29 18:12:23 -07:00
prctl: add PR_{SET,GET}_CHILD_SUBREAPER to allow simple process supervision
2012-03-23 16:58:32 -07:00
PM / Freezer: Remove references to TIF_FREEZE in comments
2012-03-04 23:08:54 +01:00
futex: Mark get_robust_list as deprecated
2012-03-29 11:37:17 +02:00
futex: Mark get_robust_list as deprecated
2012-03-29 11:37:17 +02:00
kernel: Map most files to use export.h instead of module.h
2011-10-31 09:20:12 -04:00
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2011-11-28 08:43:52 -08:00
hung_task: fix the broken rcu_lock_break() logic
2012-03-05 15:49:42 -08:00
irq_work: fix compile failure on MIPS from system.h split
2012-04-02 08:48:04 -07:00
[S390] cputime: add sparse checking and cleanup
2011-12-15 14:56:19 +01:00
static keys: Inline the static_key_enabled() function
2012-02-28 20:01:08 +01:00
locking/kconfig: Simplify INLINE_SPIN_UNLOCK usage
2012-03-23 13:18:57 +01:00
locking/kconfig: Simplify INLINE_SPIN_UNLOCK usage
2012-03-23 13:18:57 +01:00
Merge branch 'akpm' (Andrew's patch-bomb)
2012-03-28 17:19:28 -07:00
kernel: Map most files to use export.h instead of module.h
2011-10-31 09:20:12 -04:00
kmod: make __request_module() killable
2012-03-23 16:58:42 -07:00
kprobes: return proper error code from register_kprobe()
2012-03-05 15:49:42 -08:00
kernel: ksysfs.c is implicitly using stat.h
2011-10-31 09:20:13 -04:00
freezer: kill unused set_freezable_with_signal()
2011-11-23 09:28:17 -08:00
kernel: Map most files to use export.h instead of module.h
2011-10-31 09:20:12 -04:00
lockdep: Add CPU-idle/offline warning to lockdep-RCU splat
2012-02-21 09:06:06 -08:00
kernel: Map most files to use export.h instead of module.h
2011-10-31 09:20:12 -04:00
sysctl: Move the implementation into fs/proc/proc_sysctl.c
2012-01-24 16:37:54 -08:00
module: Remove module size limit
2012-03-26 12:50:53 +10:30
kernel: Map most files to use export.h instead of module.h
2011-10-31 09:20:12 -04:00
sched/rt: Use schedule_preempt_disabled()
2012-03-01 10:28:03 +01:00
kernel: Map most files to use export.h instead of module.h
2011-10-31 09:20:12 -04:00
kernel: Map most files to use export.h instead of module.h
2011-10-31 09:20:12 -04:00
padata: Fix cpu hotplug
2012-03-29 19:52:46 +08:00
panic: don't print redundant backtraces on oops
2012-01-12 20:13:11 -08:00
params: <level>_initcall-like kernel parameters
2012-03-26 12:50:51 +10:30
vfs: fix panic in __d_lookup() with high dentry hashtable counts
2012-02-13 20:45:38 -05:00
pidns: add reboot_pid_ns() to handle the reboot syscall
2012-03-28 17:14:36 -07:00
[S390] cputime: add sparse checking and cleanup
2011-12-15 14:56:19 +01:00
kernel: Map most files to use export.h instead of module.h
2011-10-31 09:20:12 -04:00
Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2012-03-20 10:31:44 -07:00
kernel: Map most files to use export.h instead of module.h
2011-10-31 09:20:12 -04:00
ptrace: remove PTRACE_SEIZE_DEVEL bit
2012-03-23 16:58:41 -07:00
range: fix bogus misuse of module.h to get printk()
2011-10-31 09:20:11 -04:00
rcu: Allow nesting of rcu_idle_enter() and rcu_idle_exit()
2012-02-21 09:06:12 -08:00
rcu: Check for illegal use of RCU from offlined CPUs
2012-02-21 09:06:03 -08:00
rcu: Add RCU_NONIDLE() for idle-loop RCU read-side critical sections
2012-02-21 09:06:13 -08:00
rcu: Simplify unboosting checks
2012-02-21 09:03:43 -08:00
PTR_ERR should be called before its argument is cleared.
2012-02-21 09:06:10 -08:00
rcu: Stop spurious warnings from synchronize_sched_expedited
2012-02-21 15:33:34 -08:00
rcu: Rework detection of use of RCU by offline CPUs
2012-02-21 09:06:07 -08:00
rcu: Hold off RCU_FAST_NO_HZ after timer posted
2012-02-21 09:42:30 -08:00
rcu: Rework detection of use of RCU by offline CPUs
2012-02-21 09:06:07 -08:00
relay: prevent integer overflow in relay_open()
2012-02-10 09:04:49 +01:00
net: introduce res_counter_charge_nofail() for socket allocations
2012-01-22 15:08:46 -05:00
kernel/resource.c: move EXPORT_SYMBOL right after definition
2012-02-03 23:37:07 +01:00
lockdep, rtmutex, bug: Show taint flags on error
2011-12-06 08:16:49 +01:00
rtmutex-tester: convert sysdev_class to a regular subsystem
2011-12-14 14:54:22 -08:00
Revert "rcu: Permit rt_mutex_unlock() with irqs disabled"
2011-12-11 10:33:18 -08:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
seccomp: audit abnormal end to a process due to seccomp
2012-01-17 16:16:55 -05:00
kernel: Map most files to use export.h instead of module.h
2011-10-31 09:20:12 -04:00
Disintegrate and delete asm/system.h
2012-03-28 15:58:21 -07:00
smp: add func to IPI cpus based on parameter func
2012-03-28 17:14:35 -07:00
Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2012-03-20 10:32:09 -07:00
locking/kconfig: Simplify INLINE_SPIN_UNLOCK usage
2012-03-23 13:18:57 +01:00
rcu: Call out dangers of expedited RCU primitives
2012-02-21 09:06:08 -08:00
kernel: Map most files to use export.h instead of module.h
2011-10-31 09:20:12 -04:00
Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux
2011-11-06 19:44:47 -08:00
pidns: add reboot_pid_ns() to handle the reboot syscall
2012-03-28 17:14:36 -07:00
Cross Memory Attach
2011-10-31 17:30:44 -07:00
Merge branch 'akpm' (Andrew's patch-bomb)
2012-03-28 17:19:28 -07:00
binary_sysctl(): fix memory leak
2011-12-20 10:25:04 -08:00
Make TASKSTATS require root access
2011-09-19 17:04:37 -07:00
time: Remove bogus comments
2012-03-15 18:17:55 -07:00
Merge branch 'core-debugobjects-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2012-01-06 07:53:34 -08:00
static keys: Introduce 'struct static_key', static_key_true()/false() and static_key_slow_[inc|dec]()
2012-02-24 10:05:59 +01:00
[S390] cputime: add sparse checking and cleanup
2011-12-15 14:56:19 +01:00
kernel: Map most files to use export.h instead of module.h
2011-10-31 09:20:12 -04:00
kernel: Map most files to use export.h instead of module.h
2011-10-31 09:20:12 -04:00
kernel: Map most files to use export.h instead of module.h
2011-10-31 09:20:12 -04:00
kernel: Map most files to use export.h instead of module.h
2011-10-31 09:20:12 -04:00
kernel: Map most files to use export.h instead of module.h
2011-10-31 09:20:12 -04:00
Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux
2011-11-06 19:44:47 -08:00
lockdep/waitqueues: Add better annotation
2011-12-21 10:07:39 +01:00
kernel/watchdog.c: add comment to watchdog() exit path
2012-03-23 16:58:32 -07:00
Merge branch 'for-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
2012-03-20 18:13:22 -07:00
95694129b4