David S. Miller c1c8626fce Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net ... Lots of overlapping changes, mostly trivial in nature. The mlxsw conflict was resolving using the example resolution at: https://github.com/jpirko/linux_mlxsw/blob/combined_queue/drivers/net/ethernet/mellanox/mlxsw/core_acl_flex_actions.c Signed-off-by: David S. Miller <davem@davemloft.net>		2018-08-05 13:04:31 -07:00
..
bpf	Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net	2018-08-02 10:55:32 -07:00
cgroup	kernfs: allow creating kernfs objects with arbitrary uid/gid	2018-07-20 23:44:35 -07:00
configs	kconfig: tinyconfig: remove stale stack protector fixups	2018-06-15 07:15:28 +09:00
debug	treewide: kzalloc() -> kcalloc()	2018-06-12 16:19:22 -07:00
dma	swiotlb: export swiotlb_dma_ops	2018-06-28 14:00:40 +02:00
events	perf/core: Fix crash when using HW tracing kernel filters	2018-07-25 11:46:22 +02:00
gcov	gcov: remove CONFIG_GCOV_FORMAT_AUTODETECT	2018-06-08 18:56:02 +09:00
irq	genirq: Make force irq threading setup more robust	2018-08-03 15:19:01 +02:00
livepatch
locking	locking/rtmutex: Allow specifying a subclass for nested locking	2018-07-25 11:22:19 +02:00
power	fix a series of Documentation/ broken file name references	2018-06-15 18:10:01 -03:00
printk	Printk changes for 4.18	2018-06-06 16:04:55 -07:00
rcu	treewide: Use array_size() in vmalloc()	2018-06-12 16:19:22 -07:00
sched	sched/rt: Restore rt_runtime after disabling RT_RUNTIME_SHARE	2018-07-25 11:29:08 +02:00
time	nohz: Fix local_timer_softirq_pending()	2018-07-31 22:08:44 +02:00
trace	tracing: Quiet gcc warning about maybe unused link variable	2018-07-25 22:33:50 -04:00
.gitignore
acct.c
async.c
audit_fsnotify.c	fsnotify: add fsnotify_add_inode_mark() wrappers	2018-05-18 14:58:22 +02:00
audit_tree.c	fsnotify: add fsnotify_add_inode_mark() wrappers	2018-05-18 14:58:22 +02:00
audit_watch.c	\n	2018-06-17 05:06:18 +09:00
audit.c	audit: use inline function to get audit context	2018-05-14 17:24:18 -04:00
audit.h
auditfilter.c	audit: use existing session info function	2018-05-18 15:47:54 -04:00
auditsc.c	audit: fix potential null dereference 'context->module.name'	2018-07-30 18:09:37 -04:00
backtracetest.c
bounds.c
capability.c
compat.c	Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2018-06-04 20:27:54 -07:00
configs.c
context_tracking.c
cpu_pm.c
cpu.c
crash_core.c	mm: split page_type out from _mapcount	2018-06-07 17:34:37 -07:00
crash_dump.c
cred.c
delayacct.c
dma.c	proc: introduce proc_create_single{,_data}	2018-05-16 07:23:35 +02:00
elfcore.c
exec_domain.c	proc: introduce proc_create_single{,_data}	2018-05-16 07:23:35 +02:00
exit.c
extable.c
fail_function.c	treewide: kmalloc() -> kmalloc_array()	2018-06-12 16:19:22 -07:00
fork.c	mm: introduce vma_init()	2018-07-26 19:38:03 -07:00
freezer.c
futex_compat.c
futex.c
groups.c
hung_task.c	kernel/hung_task.c: show all hung tasks before panic	2018-06-07 17:34:39 -07:00
iomem.c	memremap: split devm_memremap_pages() and memremap() infrastructure	2018-05-15 23:08:33 -07:00
irq_work.c
jump_label.c
kallsyms.c
kcmp.c
Kconfig.freezer
Kconfig.hz
Kconfig.locks
Kconfig.preempt
kcov.c	sched/core / kcov: avoid kcov_area during task switch	2018-06-15 07:55:24 +09:00
kexec_core.c	kexec: yield to scheduler when loading kimage segments	2018-06-15 07:55:24 +09:00
kexec_file.c	treewide: Use array_size() in vzalloc()	2018-06-12 16:19:22 -07:00
kexec_internal.h
kexec.c
kmod.c
kprobes.c
ksysfs.c
kthread.c	kthread, tracing: Don't expose half-written comm when creating kthreads	2018-07-26 09:59:33 -04:00
latencytop.c
Makefile	dma-mapping: move all DMA mapping code to kernel/dma	2018-06-14 08:50:37 +02:00
memremap.c	mm: fix exports that inadvertently make put_page() EXPORT_SYMBOL_GPL	2018-07-26 19:38:03 -07:00
module_signing.c
module-internal.h
module.c	Modules updates for v4.18	2018-06-16 07:36:39 +09:00
notifier.c
nsproxy.c
padata.c
panic.c	Kbuild: rename CC_STACKPROTECTOR[_STRONG] config variables	2018-06-14 12:21:18 +09:00
params.c
pid_namespace.c
pid.c
profile.c
ptrace.c
range.c
reboot.c
relay.c	kernel/relay.c: change return type to vm_fault_t	2018-06-15 07:55:24 +09:00
resource.c	libnvdimm for 4.18	2018-06-08 17:21:52 -07:00
rseq.c	rseq: uapi: Declare rseq_cs field as union, update includes	2018-07-10 22:18:52 +02:00
seccomp.c	audit/stable-4.18 PR 20180605	2018-06-06 16:34:00 -07:00
signal.c	signal: Remove no longer required irqsave/restore	2018-06-10 06:14:01 +02:00
smp.c
smpboot.c
smpboot.h
softirq.c	nohz: Fix missing tick reprogram when interrupting an inline softirq	2018-08-03 15:52:10 +02:00
stacktrace.c
stop_machine.c	stop_machine: Disable preemption after queueing stopper threads	2018-07-25 11:25:08 +02:00
sys_ni.c	Merge branch 'core-rseq-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2018-06-10 10:17:09 -07:00
sys.c	mm: introduce arg_lock to protect arg_start|end and env_start|end in mm_struct	2018-06-07 17:34:34 -07:00
sysctl_binary.c
sysctl.c	treewide: kzalloc() -> kcalloc()	2018-06-12 16:19:22 -07:00
task_work.c
taskstats.c
test_kprobes.c
torture.c	rcu: Rename cond_resched_rcu_qs() to cond_resched_tasks_rcu_qs()	2018-05-15 10:27:29 -07:00
tracepoint.c	tracepoints: Fix the descriptions of tracepoint_probe_register{_prio}	2018-05-28 12:49:51 -04:00
tsacct.c
ucount.c
uid16.c
uid16.h
umh.c	umh: fix race condition	2018-06-07 16:56:28 -04:00
up.c
user_namespace.c	treewide: kmalloc() -> kmalloc_array()	2018-06-12 16:19:22 -07:00
user-return-notifier.c
user.c
utsname_sysctl.c
utsname.c
watchdog_hld.c
watchdog.c
workqueue_internal.h	workqueue: Set worker->desc to workqueue name by default	2018-05-18 08:47:13 -07:00
workqueue.c	treewide: kzalloc() -> kcalloc()	2018-06-12 16:19:22 -07:00