Dave Airlie e8115e79aa Linux 3.18-rc7 ...

-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEcBAABAgAGBQJUe7l9AAoJEHm+PkMAQRiGkGcIAIryQ7NKn4IaxUtS807Lx4Ih
 obEnx7nNKZTXCZpD/7XQGHMMJyozMJR50PHZESJoHu4Luhv9h7EFRnyJ6MdqMlwn
 zla3zY0yRsHwPoJKcHbSE0CPHZz0WPQHj7IEbM+XJz2tMNJfbgTrezElmcCM4DRp
 c9ae+ggwZ2cyNYM0r2RSwSJ525WMh69f9dzSUE27fpvkllQgwqNs/jHYz8HNOEht
 FWcv5UhvzKjwJS3awULfOB3zH2QdFvVTrwAzd+kbV2Q6T6CaUoFRlhXeKUO6W2Jv
 pJM6oj8tMZUkdXEv7EQXT1kwEqC4DULTTTHs4tSF79O1ESmNfePiOwwBcwoM2nM=
 =kG1Y
 -----END PGP SIGNATURE-----

Merge tag 'v3.18-rc7' into drm-next

This fixes a bunch of conflicts prior to merging i915 tree.

Linux 3.18-rc7

Conflicts:
	drivers/gpu/drm/exynos/exynos_drm_drv.c
	drivers/gpu/drm/i915/i915_drv.c
	drivers/gpu/drm/i915/intel_pm.c
	drivers/gpu/drm/tegra/dc.c

2014-12-02 10:58:33 +10:00

..

bpf

bpf: split eBPF out of NET

2014-10-27 19:09:59 -04:00

configs

x86: Add "make tinyconfig" to configure the tiniest possible kernel

2014-08-08 16:30:24 -07:00

debug

kdb: replace strnicmp with strncasecmp

2014-10-14 02:18:25 +02:00

events

Linux 3.18-rc7

2014-12-02 10:58:33 +10:00

gcov

gcov: add ARM64 to GCOV_PROFILE_ALL

2014-10-29 16:33:14 -07:00

irq

Merge branch 'for-3.18-consistent-ops' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu

2014-10-15 07:48:18 +02:00

locking

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

2014-10-13 15:51:40 +02:00

power

PM / sleep: Fix entering suspend-to-IDLE if no freeze_oops is set

2014-11-08 22:30:05 +01:00

printk

Merge branch 'for-3.18-consistent-ops' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu

2014-10-15 07:48:18 +02:00

rcu

rcu: Make rcu_barrier() understand about missing rcuo kthreads

2014-10-28 13:24:13 -07:00

sched

sched: Provide update_curr callbacks for stop/idle scheduling classes

2014-11-23 14:14:40 -08:00

time

sched/cputime: Fix cpu_timer_sample_group() double accounting

2014-11-16 10:04:18 +01:00

trace

tracing: Do not risk busy looping in buffer splice

2014-11-10 16:47:31 -05:00

.gitignore

…

acct.c

acct: eliminate compile warning

2014-10-09 22:26:04 -04:00

async.c

kernel/async.c: switch to pr_foo()

2014-10-09 22:26:04 -04:00

audit_tree.c

audit: keep inode pinned

2014-11-11 14:20:22 -05:00

audit_watch.c

audit: invalid op= values for rules

2014-09-23 16:37:53 -04:00

audit.c

Merge branch 'stable-3.18' of git://git.infradead.org/users/pcmoore/audit

2014-11-13 09:36:39 -08:00

audit.h

audit: reduce scope of audit_log_fcaps

2014-09-23 16:37:51 -04:00

auditfilter.c

Merge git://git.infradead.org/users/eparis/audit

2014-10-19 16:25:56 -07:00

auditsc.c

Merge git://git.infradead.org/users/eparis/audit

2014-10-19 16:25:56 -07:00

backtracetest.c

kernel/backtracetest.c: replace no level printk by pr_info()

2014-06-04 16:54:14 -07:00

bounds.c

page-cgroup: get rid of NR_PCG_FLAGS

2014-08-08 15:57:18 -07:00

capability.c

CAPABILITIES: remove undefined caps from all processes

2014-07-24 21:53:47 +10:00

cgroup_freezer.c

cgroup: rename cgroup_subsys->base_cftypes to ->legacy_cftypes

2014-07-15 11:05:09 -04:00

cgroup.c

Merge branch 'for-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu

2014-10-10 07:26:02 -04:00

compat.c

compat: nanosleep: Clarify error handling

2014-09-06 12:58:18 +02:00

configs.c

…

context_tracking.c

sched: stop the unbound recursion in preempt_schedule_context()

2014-10-28 10:46:05 +01:00

cpu_pm.c

…

cpu.c

rcu: More on deadlock between CPU hotplug and expedited grace periods

2014-10-23 07:51:17 -07:00

cpuset.c

Merge branch 'for-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup

2014-10-10 07:24:40 -04:00

crash_dump.c

crash_dump: Make is_kdump_kernel() accessible from modules

2014-08-25 15:42:19 -07:00

cred.c

…

delayacct.c

delayacct: Remove braindamaged type conversions

2014-07-23 10:18:06 -07:00

dma.c

…

elfcore.c

…

exec_domain.c

kernel/exec_domain.c: code clean-up

2014-06-04 16:54:15 -07:00

exit.c

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

2014-10-13 16:23:15 +02:00

extable.c

…

fork.c

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

2014-10-13 16:23:15 +02:00

freezer.c

freezer: remove obsolete comments in __thaw_task()

2014-10-21 23:44:20 +02:00

futex_compat.c

…

futex.c

futex: Fix a race condition between REQUEUE_PI and task death

2014-10-26 16:16:18 +01:00

groups.c

kernel/groups.c: remove return value of set_groups

2014-04-03 16:21:05 -07:00

hung_task.c

kernel/hung_task.c: convert simple_strtoul to kstrtouint

2014-06-04 16:54:15 -07:00

irq_work.c

Merge branch 'for-3.18-consistent-ops' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu

2014-10-15 07:48:18 +02:00

jump_label.c

…

kallsyms.c

kernel/kallsyms.c: use __seq_open_private()

2014-10-14 02:18:16 +02:00

kcmp.c

kcmp: fix standard comparison bug

2014-09-10 15:42:12 -07:00

Kconfig.freezer

…

Kconfig.hz

…

Kconfig.locks

locking/rwsem: Add CONFIG_RWSEM_SPIN_ON_OWNER

2014-07-16 14:57:13 +02:00

Kconfig.preempt

…

kexec.c

kexec: remove the unused function parameter

2014-10-14 02:18:21 +02:00

kmod.c

kernel/kmod: fix use-after-free of the sub_info structure

2014-10-29 16:33:14 -07:00

kprobes.c

kprobes: Skip kretprobe hit in NMI context to avoid deadlock

2014-08-08 10:38:04 +02:00

ksysfs.c

kobject: Make support for uevent_helper optional.

2014-04-25 12:00:49 -07:00

kthread.c

kernel/kthread.c: partial revert of 81c98869faa5 ("kthread: ensure locality of task_struct allocations")

2014-10-09 22:25:51 -04:00

latencytop.c

kernel/latencytop.c: convert seq_printf to seq_puts

2014-06-04 16:54:15 -07:00

Makefile

bpf: split eBPF out of NET

2014-10-27 19:09:59 -04:00

module_signing.c

…

module-internal.h

…

module.c

A single panic fix for a rare race, stable CC'd.

2014-10-18 10:24:26 -07:00

notifier.c

kprobes, notifier: Use NOKPROBE_SYMBOL macro in notifier

2014-04-24 10:26:39 +02:00

nsproxy.c

namespaces: Use task_lock and not rcu to protect nsproxy

2014-07-29 18:08:50 -07:00

padata.c

…

panic.c

kernel/panic.c: update comments for print_tainted

2014-11-13 16:17:06 -08:00

params.c

kernel/param: consolidate __{start,stop}___param[] in <linux/moduleparam.h>

2014-10-14 02:18:28 +02:00

pid_namespace.c

pid_namespace: pidns_get() should check task_active_pid_ns() != NULL

2014-04-02 16:20:21 -07:00

pid.c

…

profile.c

kernel/profile.c: use static const char instead of static char

2014-06-06 16:08:13 -07:00

ptrace.c

sched: Remove proliferation of wait_on_bit() action functions

2014-07-16 15:10:39 +02:00

range.c

…

reboot.c

kernel: add support for kernel restart handler call chain

2014-09-26 00:00:06 -07:00

relay.c

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

2014-04-12 14:49:50 -07:00

res_counter.c

kernel/res_counter.c: replace simple_strtoull by kstrtoull

2014-06-04 16:54:15 -07:00

resource.c

x86: optimize resource lookups for ioremap

2014-10-14 02:18:22 +02:00

seccomp.c

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

2014-10-14 02:27:06 +02:00

signal.c

Merge branch 'signal-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/misc

2014-08-09 09:58:12 -07:00

smp.c

Merge branch 'for-3.18-consistent-ops' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu

2014-10-15 07:48:18 +02:00

smpboot.c

…

smpboot.h

…

softirq.c

Merge branch 'for-3.18-consistent-ops' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu

2014-10-15 07:48:18 +02:00

stacktrace.c

…

stop_machine.c

kernel/stop_machine.c: kernel-doc warning fix

2014-06-04 16:54:15 -07:00

sys_ni.c

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

2014-10-08 21:40:54 -04:00

sys.c

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

2014-10-13 16:23:15 +02:00

sysctl_binary.c

dmaengine-3.17

2014-10-07 20:39:25 -04:00

sysctl.c

sched/fair: Fix division by zero sysctl_numa_balancing_scan_size

2014-10-28 10:46:04 +01:00

system_certificates.S

…

system_keyring.c

KEYS: validate certificate trust only with builtin keys

2014-07-17 09:35:17 -04:00

task_work.c

…

taskstats.c

scheduler: Replace __get_cpu_var with this_cpu_ptr

2014-08-26 13:45:45 -04:00

test_kprobes.c

kernel/test_kprobes.c: use current logging functions

2014-08-08 15:57:18 -07:00

torture.c

torture: Address race in module cleanup

2014-09-16 13:41:06 -07:00

tracepoint.c

tracing: syscall_regfunc() should not skip kernel threads

2014-06-21 00:15:26 -04:00

tsacct.c

sched: Make task->start_time nanoseconds based

2014-07-23 10:18:05 -07:00

uid16.c

…

up.c

…

user_namespace.c

proc: constify seq_operations

2014-08-08 15:57:22 -07:00

user-return-notifier.c

scheduler: Replace __get_cpu_var with this_cpu_ptr

2014-08-26 13:45:45 -04:00

user.c

kernel/user.c: drop unused field 'files' from user_struct

2014-06-04 16:54:16 -07:00

utsname_sysctl.c

sysctl: convert use of typedef ctl_table to struct ctl_table

2014-06-06 16:08:16 -07:00

utsname.c

namespaces: Use task_lock and not rcu to protect nsproxy

2014-07-29 18:08:50 -07:00

watchdog.c

Merge branch 'for-3.18-consistent-ops' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu

2014-10-15 07:48:18 +02:00

workqueue_internal.h

workqueue: rename manager_mutex to attach_mutex

2014-05-20 10:59:32 -04:00

workqueue.c

workqueue: Use cond_resched_rcu_qs macro

2014-10-06 05:58:26 -07:00