Merge branch 'linus' into core/softirq

diff --cc kernel/rcupreempt.c
Simple merge

diff --cc kernel/sched.c
Simple merge

diff --cc net/core/dev.c
Simple merge