Masahiro Yamada 76ce2a80a2 Rename include/{uapi => }/asm-generic/shmparam.h really ... Commit 36c0f7f0f8 ("arch: unexport asm/shmparam.h for all architectures") is different from the patch I submitted. My patch is this: https://lore.kernel.org/lkml/1546904307-11124-1-git-send-email-yamada.masahiro@socionext.com/T/#u The file renaming part: rename include/{uapi => }/asm-generic/shmparam.h (100%) was lost when it was picked up. I think it was an accident because Andrew did not say anything. Link: http://lkml.kernel.org/r/1549158277-24558-1-git-send-email-yamada.masahiro@socionext.com Fixes: 36c0f7f0f8 ("arch: unexport asm/shmparam.h for all architectures") Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>		2019-02-12 16:33:18 -08:00
..
acpi	Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2018-12-26 17:03:51 -08:00
asm-generic	Rename include/{uapi => }/asm-generic/shmparam.h really	2019-02-12 16:33:18 -08:00
clocksource	ARM: SoC platform updates for 4.17	2018-04-05 21:21:08 -07:00
crypto	crypto: skcipher - remove remnants of internal IV generators	2018-12-23 11:52:45 +08:00
drm	Merge tag 'drm-intel-fixes-2019-01-11' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes	2019-01-11 10:26:21 +01:00
dt-bindings	ARM: SoC fixes for linux-5.0	2019-02-08 16:23:41 -08:00
keys	KEYS: Move trusted.h to include/keys [ver #2]	2018-10-26 09:30:47 +01:00
kvm	KVM: arm/arm64: Remove arch timer workqueue	2018-12-19 17:47:07 +00:00
linux	Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2019-02-10 09:54:19 -08:00
math-emu	math-emu/soft-fp.h: (_FP_ROUND_ZERO) cast 0 to void to fix warning	2018-11-22 18:13:42 +08:00
media	media fixes for v4.20-rc8	2018-12-25 13:11:30 -08:00
memory
misc	Revert "cxl: Allow a default context to be associated with an external pci_dev"	2018-07-02 23:54:33 +10:00
net	netfilter: nf_tables: unbind set in rule from commit path	2019-02-04 17:29:17 +01:00
pcmcia
ras	PCI/AER: Add TLP header information to tracepoint	2018-05-10 08:34:52 -05:00
rdma	RDMA/device: Expose ib_device_try_get(()	2019-01-21 14:33:08 -07:00
scsi	4.21 merge window pull request	2018-12-28 14:57:10 -08:00
soc	ARM: SoC driver updates	2018-12-31 17:32:35 -08:00
sound	ALSA: compress: Fix stop handling on compressed capture streams	2019-02-05 22:01:41 +01:00
target	scsi: target: consistently null-terminate t10_wwn strings	2018-12-07 21:54:33 -05:00
trace	afs: Fix race in async call refcounting	2019-01-17 15:17:28 +00:00
uapi	Rename include/{uapi => }/asm-generic/shmparam.h really	2019-02-12 16:33:18 -08:00
video	drm/exynos: fimd: Make pixel blend mode configurable	2018-12-14 15:46:15 +09:00
xen	arm64/xen: fix xen-swiotlb cache flushing	2019-01-23 22:14:56 +01:00