Merge tag 'for-linus-4.15-rc7-tag' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 5 Jan 2018 20:15:12 +0000 (12:15 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 5 Jan 2018 20:15:12 +0000 (12:15 -0800)
commit925cbd7ed4b073a2afc9915e241ab789b44a3f61
tree202bb92fcc469a67ac79d54d05bd441a86358c86
parent64648a5fcabf46000a496c41c92c5c0f16be78ed
parent4aac2caff30fdef1db8403af81e79807811d22ea
Merge tag 'for-linus-4.15-rc7-tag' of git://git./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