Arnd Bergmann f16ee7c7ec misc: rtsx: rename SG_END macro ... A change to the generic scatterlist code caused a conflict with the rtsx card reader driver: In file included from drivers/misc/cardreader/rtsx_pcr.c:32: include/linux/rtsx_pci.h:40: error: "SG_END" redefined [-Werror] This changes one instance of the driver to prefix SG_END and related constants. Fixes: 723fbf563a ("lib/scatterlist: Add SG_CHAIN and SG_END macros for LSB encodings") Cc: Anshuman Khandual <khandual@linux.vnet.ibm.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Jens Axboe <axboe@kernel.dk>		2018-03-01 08:33:05 -07:00
..
acpi	ACPICA: Update version to 20180105	2018-02-06 10:32:13 +01:00
asm-generic	bug.h: work around GCC PR82365 in BUG()	2018-02-21 15:35:43 -08:00
clocksource
crypto	Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2018-01-31 14:22:45 -08:00
drm	drm/graphics pull request for v4.16-rc1	2018-02-01 17:48:47 -08:00
dt-bindings	MIPS changes for 4.16	2018-02-07 11:22:44 -08:00
keys
kvm	KVM changes for 4.16	2018-02-10 13:16:35 -08:00
linux	misc: rtsx: rename SG_END macro	2018-03-01 08:33:05 -07:00
math-emu
media	vfs: do bulk POLL* -> EPOLL* replacement	2018-02-11 14:34:03 -08:00
memory
misc	powerpc updates for 4.16	2018-02-02 10:01:04 -08:00
net	udplite: fix partial checksum initialization	2018-02-16 15:57:42 -05:00
pcmcia
ras
rdma	IB/uverbs: Use u64_to_user_ptr() not a union	2018-02-15 14:59:45 -07:00
scsi	SCSI postmerge on 20180202	2018-02-03 13:07:56 -08:00
soc	ARM: SoC driver updates for 4.16	2018-02-01 16:35:31 -08:00
sound	Merge branch 'topic/fixes' into for-linus	2018-02-12 09:36:26 +01:00
target
trace	Merge branch 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2018-02-14 17:02:15 -08:00
uapi	blktrace_api.h: fix comment for struct blk_user_trace_setup	2018-02-26 12:26:02 -07:00
video	fbdev changes for v4.16:	2018-02-07 13:10:43 -08:00
xen