From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 5 Jan 2018 20:15:12 +0000 (-0800)
Subject: Merge tag 'for-linus-4.15-rc7-tag' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v4.15-rc7~17
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=925cbd7ed4b073a2afc9915e241ab789b44a3f61;p=thirdparty%2Fkernel%2Flinux.git

Merge tag 'for-linus-4.15-rc7-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip

Pull xen fix from Juergen Gross:
 "One minor fix adjusting the kmalloc flags in the new pvcalls driver
  added in rc1"

* tag 'for-linus-4.15-rc7-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  xen/pvcalls: use GFP_ATOMIC under spin lock
---

925cbd7ed4b073a2afc9915e241ab789b44a3f61