tree d80f01d6982c649046defdc2f7196da38eb0bb5b
parent 68abbe729567cef128b2c2141f2ed2567f3b8372
parent 7f47e1c52d0c850cbd24aab763ce6bab11bdb4b2
author Linus Torvalds <torvalds@linux-foundation.org> 1528475094 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1528475094 -0700
mergetag object 7f47e1c52d0c850cbd24aab763ce6bab11bdb4b2
 type commit
 tag for-linus-4.18-rc1-tag
 tagger Juergen Gross <jgross@suse.com> 1528431131 +0200
 
 xen: fixes and features for v4-18-rc1
 -----BEGIN PGP SIGNATURE-----
 
 iHUEABYIAB0WIQRTLbB6QfY48x44uB6AXGG7T9hjvgUCWxoCWAAKCRCAXGG7T9hj
 vvDrAQCR6Js8PWjU8HnaYV/AKYGJ/JANLUSKhK/piel+ed7c7AD/T2XV7m0WI+Rb
 p+dwBd7NLoVokF4SQHvvWgQJLSW7qAA=
 =BnsW
 -----END PGP SIGNATURE-----

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

Pull xen updates from Juergen Gross:
 "This contains some minor code cleanups (fixing return types of
  functions), some fixes for Linux running as Xen PVH guest, and adding
  of a new guest resource mapping feature for Xen tools"

* tag 'for-linus-4.18-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  xen/PVH: Make GDT selectors PVH-specific
  xen/PVH: Set up GS segment for stack canary
  xen/store: do not store local values in xen_start_info
  xen-netfront: fix xennet_start_xmit()'s return type
  xen/privcmd: add IOCTL_PRIVCMD_MMAP_RESOURCE
  xen: Change return type to vm_fault_t