]> git.baikalelectronics.ru Git - kernel.git/commit
Merge tag 'for-linus-4.3-rc0b-tag' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 10 Sep 2015 23:21:11 +0000 (16:21 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 10 Sep 2015 23:21:11 +0000 (16:21 -0700)
commitdbd0e70eda8afcc6e3f91f282a6053f2411d656c
tree316ddb218bf3d5482bf16d38c129b71504780835
parent27c1d113da1dec67edfefe0e6c419629943a151e
parentad8ae4e4469504f86b19e132e37cb21141a3cea2
Merge tag 'for-linus-4.3-rc0b-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip

Pull xen terminology fixes from David Vrabel:
 "Use the correct GFN/BFN terms more consistently"

* tag 'for-linus-4.3-rc0b-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  xen/xenbus: Rename the variable xen_store_mfn to xen_store_gfn
  xen/privcmd: Further s/MFN/GFN/ clean-up
  hvc/xen: Further s/MFN/GFN clean-up
  video/xen-fbfront: Further s/MFN/GFN clean-up
  xen/tmem: Use xen_page_to_gfn rather than pfn_to_gfn
  xen: Use correctly the Xen memory terminologies
  arm/xen: implement correctly pfn_to_mfn
  xen: Make clear that swiotlb and biomerge are dealing with DMA address
drivers/block/xen-blkfront.c
drivers/net/xen-netback/netback.c
drivers/net/xen-netfront.c
drivers/xen/events/events_base.c