kernel_samsung_sm7125

jenna

History

Peter Zijlstra ab992dc38f watchdog: Fix merge 'conflict' Two watchdog changes that came through different trees had a non conflicting conflict, that is, one changed the semantics of a variable but no actual code conflict happened. So the merge appeared fine, but the resulting code did not behave as expected. Commit `195daf665a` ("watchdog: enable the new user interface of the watchdog mechanism") changes the semantics of watchdog_user_enabled, which thereafter is only used by the functions introduced by `b3738d2932` ("watchdog: Add watchdog enable/disable all functions"). There further appears to be a distinct lack of serialization between setting and using watchdog_enabled, so perhaps we should wrap the {en,dis}able_all() things in watchdog_proc_mutex. This patch fixes a s2r failure reported by Michal; which I cannot readily explain. But this does make the code internally consistent again. Reported-and-tested-by: Michal Hocko <mhocko@suse.cz> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>		10 years ago
..
bpf	bpf: fix 64-bit divide	10 years ago
configs	…
debug	debug: prevent entering debug mode on panic/exception.	10 years ago
events	perf: Annotate inherited event ctx->mutex recursion	10 years ago
gcov	gcov: fix softlockups	10 years ago
irq	genirq: Set IRQCHIP_SKIP_SET_WAKE flag for dummy_irq_chip	10 years ago
livepatch	Merge branch 'for-4.1/core-noarch' into for-linus	10 years ago
locking	sched: Handle priority boosted tasks proper in setscheduler()	10 years ago
power	Merge back earlier suspend/hibernate material for v4.1.	10 years ago
printk	TTY/Serial patches for 4.1-rc1	10 years ago
rcu	rcu: Control grace-period delays directly from value	10 years ago
sched	sched/core: Fix regression in cpuset_cpu_inactive() for suspend	10 years ago
time	Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	10 years ago
trace	tracing: Make ftrace_print_array_seq compute buf_len	10 years ago
.gitignore	…
Kconfig.freezer	…
Kconfig.hz	…
Kconfig.locks	…
Kconfig.preempt	…
Makefile	modsign: change default key details	10 years ago
acct.c	acct: check FMODE_CAN_WRITE	10 years ago
async.c	…
audit.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	10 years ago
audit.h	Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/audit	10 years ago
audit_tree.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	10 years ago
audit_watch.c	VFS: audit: d_backing_inode() annotations	10 years ago
auditfilter.c	…
auditsc.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	10 years ago
backtracetest.c	…
bounds.c	…
capability.c	kernel: conditionally support non-root users, groups and capabilities	10 years ago
cgroup.c	cgroup: remove use of seq_printf return value	10 years ago
cgroup_freezer.c	…
compat.c	all arches, signal: move restart_block to struct task_struct	10 years ago
configs.c	…
context_tracking.c	context_tracking: Export context_tracking_user_enter/exit	10 years ago
cpu.c	Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	10 years ago
cpu_pm.c	…
cpuset.c	kernel, cpuset: remove exception for __GFP_THISNODE	10 years ago
crash_dump.c	…
cred.c	kernel: conditionally support non-root users, groups and capabilities	10 years ago
delayacct.c	…
dma.c	…
elfcore.c	…
exec_domain.c	Remove rest of exec domains.	10 years ago
exit.c	Remove execution domain support	10 years ago
extable.c	…
fork.c	oprofile: reduce mmap_sem hold for mm->exe_file	10 years ago
freezer.c	…
futex.c	Linux 34.0-rc1	10 years ago
futex_compat.c	…
groups.c	kernel: conditionally support non-root users, groups and capabilities	10 years ago
hung_task.c	kernel/hung_task.c: change hung_task.c to use for_each_process_thread()	10 years ago
irq_work.c	…
jump_label.c	…
kallsyms.c	…
kcmp.c	…
kexec.c	kexec: allocate the kexec control page with KEXEC_CONTROL_MEMORY_GFP	10 years ago
kmod.c	…
kprobes.c	kprobes: makes kprobes/enabled works correctly for optimized kprobes.	10 years ago
ksysfs.c	…
kthread.c	…
latencytop.c	…
module-internal.h	…
module.c	Quentin opened a can of worms by adding extable entry checking to modpost,	10 years ago
module_signing.c	…
notifier.c	…
nsproxy.c	…
padata.c	padata: use %*pb[l] to print bitmaps including cpumasks and nodemasks	10 years ago
panic.c	…
params.c	params: handle quotes properly for values not of form foo="bar".	10 years ago
pid.c	fork: report pid reservation failure properly	10 years ago
pid_namespace.c	…
profile.c	profile: use %*pb[l] to print bitmaps including cpumasks and nodemasks	10 years ago
ptrace.c	ptrace: ptrace_detach() can no longer race with SIGKILL	10 years ago
range.c	…
reboot.c	kernel/reboot.c: add orderly_reboot for graceful reboot	10 years ago
relay.c	VFS: kernel/: d_inode() annotations	10 years ago
resource.c	kernel/resource.c: remove deprecated __check_region() and friends	10 years ago
seccomp.c	seccomp: cap SECCOMP_RET_ERRNO data to MAX_ERRNO	10 years ago
signal.c	signal: remove warning about using SI_TKILL in rt_[tg]sigqueueinfo	10 years ago
smp.c	smp: Fix error case handling in smp_call_function_*()	10 years ago
smpboot.c	smpboot: Add common code for notification from dying CPU	10 years ago
smpboot.h	…
softirq.c	…
stacktrace.c	…
stop_machine.c	…
sys.c	prctl: avoid using mmap_sem for exe_file serialization	10 years ago
sys_ni.c	kernel: conditionally support non-root users, groups and capabilities	10 years ago
sysctl.c	kernel/sysctl.c: detect overflows when converting to int	10 years ago
sysctl_binary.c	…
system_certificates.S	…
system_keyring.c	…
task_work.c	…
taskstats.c	…
test_kprobes.c	…
torture.c	…
tracepoint.c	…
tsacct.c	…
uid16.c	…
up.c	…
user-return-notifier.c	…
user.c	…
user_namespace.c	…
utsname.c	…
utsname_sysctl.c	…
watchdog.c	watchdog: Fix merge 'conflict'	10 years ago
workqueue.c	workqueue: Reorder sysfs code	10 years ago
workqueue_internal.h	…