From: Linus Torvalds Date: Sat, 13 Jan 2018 22:04:06 +0000 (-0800) Subject: Merge tag 'staging-4.15-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh... X-Git-Tag: v4.15-rc8~6 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=d5a047fd92c6e0db7d56b9e20200cc30f6c7c8e2;p=linux-block.git Merge tag 'staging-4.15-rc8' of git://git./linux/kernel/git/gregkh/staging Pull staging driver fix from Greg KH: "Here is a single android ashmem bugfix that resolves a reported issue in that interface. It's been in linux-next this week with no reported issues" * tag 'staging-4.15-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: staging: android: ashmem: fix a race condition in ASHMEM_SET_SIZE ioctl --- d5a047fd92c6e0db7d56b9e20200cc30f6c7c8e2