Lubomir Rintel 8c0f9f5b30 Revert "uapi/linux/keyctl.h: don't use C++ reserved keyword as a struct member name" ... This changes UAPI, breaking iwd and libell: ell/key.c: In function 'kernel_dh_compute': ell/key.c:205:38: error: 'struct keyctl_dh_params' has no member named 'private'; did you mean 'dh_private'? struct keyctl_dh_params params = { .private = private, ^~~~~~~ dh_private This reverts commit 8a2336e549. Fixes: 8a2336e549 ("uapi/linux/keyctl.h: don't use C++ reserved keyword as a struct member name") Signed-off-by: Lubomir Rintel <lkundrak@v3.sk> Signed-off-by: David Howells <dhowells@redhat.com> cc: Randy Dunlap <rdunlap@infradead.org> cc: Mat Martineau <mathew.j.martineau@linux.intel.com> cc: Stephan Mueller <smueller@chronox.de> cc: James Morris <jmorris@namei.org> cc: "Serge E. Hallyn" <serge@hallyn.com> cc: Mat Martineau <mathew.j.martineau@linux.intel.com> cc: Andrew Morton <akpm@linux-foundation.org> cc: Linus Torvalds <torvalds@linux-foundation.org> cc: <stable@vger.kernel.org> Signed-off-by: James Morris <james.morris@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>		2018-09-25 13:28:58 +02:00
..
acpi	ACPICA: Update version to 20180810	2018-08-14 23:49:13 +02:00
asm-generic	asm-generic: io: Fix ioport_map() for !CONFIG_GENERIC_IOMAP && CONFIG_INDIRECT_PIO	2018-09-14 09:49:21 +01:00
clocksource
crypto
drm	drm: fix drm_drv_uses_atomic_modeset on non modesetting drivers.	2018-09-18 11:17:06 +02:00
dt-bindings	ARM: SoC: late updates	2018-08-25 14:12:36 -07:00
keys
kvm	KVM: arm/arm64: vgic-v3: Add core support for Group0 SGIs	2018-08-12 12:06:34 +01:00
linux	Merge gitolite.kernel.org:/pub/scm/linux/kernel/git/davem/net	2018-09-25 11:19:49 +02:00
math-emu
media	- New Drivers	2018-08-20 15:38:44 -07:00
memory
misc
net	NFC: Fix the number of pipes	2018-09-18 19:55:01 -07:00
pcmcia	pcmcia: remove long deprecated pcmcia_request_exclusive_irq() function	2018-08-18 12:30:42 -07:00
ras
rdma	Second merge window update	2018-08-23 15:34:48 -07:00
scsi	SCSI misc on 20180815	2018-08-15 22:06:26 -07:00
soc
sound	ASoC: Fixes for v4.19	2018-09-17 18:59:21 +02:00
target
trace	Merge branch 'for-4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup	2018-08-24 13:19:27 -07:00
uapi	Revert "uapi/linux/keyctl.h: don't use C++ reserved keyword as a struct member name"	2018-09-25 13:28:58 +02:00
video	fbdev changes for v4.19:	2018-08-23 15:44:58 -07:00
xen	xen/balloon: add runtime control for scrubbing ballooned out pages	2018-09-14 08:51:10 -04:00