Joe Perches 205bd3d23e printk: correct timeout comment, neaten MODULE_PARM_DESC ...

Neaten the MODULE_PARAM_DESC message.
Use 30 seconds in the comment for the zap console locks timeout.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

2015-02-12 18:54:13 -08:00

..

bpf

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2015-01-27 13:55:36 -08:00

configs

…

debug

Surprising number of fixes this merge window :(

2015-01-23 06:40:36 +12:00

events

powerpc updates for 3.20

2015-02-11 18:15:38 -08:00

gcov

gcov: enable GCOV_PROFILE_ALL from ARCH Kconfigs

2014-12-13 12:42:51 -08:00

irq

genirq: Prevent proc race against freeing of irq descriptors

2014-12-13 13:33:07 +01:00

livepatch

livepatch: add missing newline to error message

2015-02-06 21:28:35 +01:00

locking

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

2015-02-11 17:42:32 -08:00

power

oom, PM: make OOM detection in the freezer path raceless

2015-02-11 17:06:03 -08:00

printk

printk: correct timeout comment, neaten MODULE_PARM_DESC

2015-02-12 18:54:13 -08:00

rcu

Merge branches 'doc.2015.01.07a', 'fixes.2015.01.15a', 'preempt.2015.01.06a', 'srcu.2015.01.06a', 'stall.2015.01.16a' and 'torture.2015.01.11a' into HEAD

2015-01-15 23:34:34 -08:00

sched

kernel/sched/clock.c: add another clock for use with the soft lockup watchdog

2015-02-12 18:54:13 -08:00

time

all arches, signal: move restart_block to struct task_struct

2015-02-12 18:54:12 -08:00

trace

The updates included in this pull request for ftrace are:

2015-02-12 08:37:41 -08:00

.gitignore

…

acct.c

…

async.c

…

audit_tree.c

fsnotify: unify inode and mount marks handling

2014-12-13 12:42:53 -08:00

audit_watch.c

…

audit.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2014-12-30 10:45:47 -08:00

audit.h

…

auditfilter.c

Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/audit

2015-02-11 20:07:47 -08:00

auditsc.c

Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/audit

2014-12-31 14:52:18 -08:00

backtracetest.c

…

bounds.c

…

capability.c

…

cgroup_freezer.c

…

cgroup.c

cgroup: release css->id after css_free

2015-02-12 18:54:09 -08:00

compat.c

all arches, signal: move restart_block to struct task_struct

2015-02-12 18:54:12 -08:00

configs.c

…

context_tracking.c

…

cpu_pm.c

…

cpu.c

hotplugcpu: Avoid deadlocks by waking active_writer

2015-01-06 11:01:14 -08:00

cpuset.c

kernel/cpuset.c: Mark cpuset_init_current_mems_allowed as __init

2015-02-12 18:54:11 -08:00

crash_dump.c

…

cred.c

…

delayacct.c

…

dma.c

…

elfcore.c

…

exec_domain.c

…

exit.c

oom, PM: make OOM detection in the freezer path raceless

2015-02-11 17:06:03 -08:00

extable.c

…

fork.c

mm: do not use mm->nr_pmds on !MMU configurations

2015-02-12 18:54:10 -08:00

freezer.c

…

futex_compat.c

…

futex.c

all arches, signal: move restart_block to struct task_struct

2015-02-12 18:54:12 -08:00

groups.c

…

hung_task.c

…

irq_work.c

…

jump_label.c

…

kallsyms.c

…

kcmp.c

…

Kconfig.freezer

…

Kconfig.hz

…

Kconfig.locks

locking/mcs: Better differentiate between MCS variants

2015-01-14 15:07:32 +01:00

Kconfig.preempt

…

kexec.c

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2015-02-10 18:57:15 -08:00

kmod.c

…

kprobes.c

Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm

2015-02-12 08:51:56 -08:00

ksysfs.c

…

kthread.c

…

latencytop.c

…

Makefile

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security

2015-02-11 20:25:11 -08:00

module_signing.c

…

module-internal.h

…

module.c

module: make module_refcount() a signed integer.

2015-01-22 11:15:54 +10:30

notifier.c

rcu: Make SRCU optional by using CONFIG_SRCU

2015-01-06 11:04:29 -08:00

nsproxy.c

…

padata.c

…

panic.c

livepatch: kernel: add TAINT_LIVEPATCH

2014-12-22 15:40:48 +01:00

params.c

param: fix uninitialized read with CONFIG_DEBUG_LOCK_ALLOC

2015-01-20 11:38:31 +10:30

pid_namespace.c

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

2014-12-16 15:53:03 -08:00

pid.c

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

2014-12-16 15:53:03 -08:00

profile.c

…

ptrace.c

…

range.c

kernel: avoid overflow in cmp_range

2015-01-17 10:02:23 +13:00

reboot.c

…

relay.c

…

resource.c

resources: Move struct resource_list_entry from ACPI into resource core

2015-02-05 15:09:25 +01:00

seccomp.c

…

signal.c

all arches, signal: move restart_block to struct task_struct

2015-02-12 18:54:12 -08:00

smp.c

…

smpboot.c

smpboot: Add missing get_online_cpus() in smpboot_register_percpu_thread()

2015-01-23 11:33:51 +01:00

smpboot.h

…

softirq.c

Merge branch 'locking-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2015-02-09 15:24:03 -08:00

stacktrace.c

stacktrace: introduce snprint_stack_trace for buffer output

2014-12-13 12:42:48 -08:00

stop_machine.c

…

sys_ni.c

syscalls: implement execveat() system call

2014-12-13 12:42:51 -08:00

sys.c

x86, mpx: Strictly enforce empty prctl() args

2015-01-22 21:11:06 +01:00

sysctl_binary.c

…

sysctl.c

mm, hugetlb: remove unnecessary lower bound on sysctl handlers"?

2015-02-10 14:30:34 -08:00

system_certificates.S

…

system_keyring.c

…

task_work.c

…

taskstats.c

netlink: make nlmsg_end() and genlmsg_end() void

2015-01-18 01:03:45 -05:00

test_kprobes.c

…

torture.c

…

tracepoint.c

…

tsacct.c

…

uid16.c

…

up.c

…

user_namespace.c

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace

2014-12-17 12:31:40 -08:00

user-return-notifier.c

…

user.c

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace

2014-12-17 12:31:40 -08:00

utsname_sysctl.c

…

utsname.c

…

watchdog.c

kernel/sched/clock.c: add another clock for use with the soft lockup watchdog

2015-02-12 18:54:13 -08:00

workqueue_internal.h

…

workqueue.c

workqueue: fix subtle pool management issue which can stall whole worker_pool

2015-01-16 14:21:16 -05:00