git.samba.org - sfrench/cifs-2.6.git/commit

git.samba.org / sfrench / cifs-2.6.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: ce1a5ea d1fdb6d)

author	Jonathan Corbet <corbet@lwn.net>
	Fri, 14 Jun 2019 20:18:53 +0000 (14:18 -0600)
committer	Jonathan Corbet <corbet@lwn.net>
	Fri, 14 Jun 2019 20:18:53 +0000 (14:18 -0600)
commit	8afecfb0ec961e37e61b2d19c4fa71617a9482de
tree	c43ea51a47b1e76b762caa4c1b0c356249e5e874	tree
parent	ce1a5ea18ef9bf4c62c75abe7c540a29264ec988	commit \| diff
parent	d1fdb6d8f6a4109a4263176c84b899076a5f8008	commit \| diff

Merge tag 'v5.2-rc4' into mauro

We need to pick up post-rc1 changes to various document files so they don't
get lost in Mauro's massive RST conversion push.

12 files changed:

Documentation/bpf/btf.rst	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/microcode/amd.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/kprobes/core.c	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/tlb.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/faraday/ftgmac100.c	diff1 \|	diff2 \|	blob \| history
drivers/vhost/vhost.c	diff1 \|	diff2 \|	blob \| history
include/acpi/acpi_drivers.h	diff1 \|	diff2 \|	blob \| history
include/linux/fs_context.h	diff1 \|	diff2 \|	blob \| history
mm/Kconfig	diff1 \|	diff2 \|	blob \| history
scripts/sphinx-pre-install	diff1 \|	diff2 \|	blob \| history
security/Kconfig	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.