Merge tag 'stable/for-linus-3.7-uapi-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen

ba8a3d6c · Linus Torvalds <[email protected]> · 2012-10-13 11:14:29 +09:00

Pull Xen UAPI disintegration from Konrad Rzeszutek Wilk:
 "This has the UAPI disintegration work done by David Howells"

* tag 'stable/for-linus-3.7-uapi-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
  UAPI: (Scripted) Disintegrate include/xen

Commit: ba8a3d6c7c1956c6ff54a96e23007beccaa95640
Parents: 125aae1d · 32451033

Merge commit. Changes below are compared with the first parent: 125aae1d.

Changes

4 files changed · +2 −2

File	Status	Add	Del	Content
include/uapi/xen/Kbuild	modified	+2	−0	View file
include/xen/evtchn.h → include/uapi/xen/evtchn.h	renamed	+0	−0	View file
include/xen/privcmd.h → include/uapi/xen/privcmd.h	renamed	+0	−0	View file
include/xen/Kbuild	modified	+0	−2	View file

include/uapi/xen/Kbuild

View file

diff --git a/include/uapi/xen/Kbuild b/include/uapi/xen/Kbuild
index aafaa5a..61257cb 100644
--- a/include/uapi/xen/Kbuild
+++ b/include/uapi/xen/Kbuild
@@ -1 +1,3 @@
 # UAPI Header export list
+header-y += evtchn.h
+header-y += privcmd.h

include/uapi/xen/evtchn.h

View file

diff --git a/include/xen/evtchn.h b/include/uapi/xen/evtchn.h
similarity index 100%
rename from include/xen/evtchn.h
rename to include/uapi/xen/evtchn.h

include/uapi/xen/privcmd.h

View file

diff --git a/include/xen/privcmd.h b/include/uapi/xen/privcmd.h
similarity index 100%
rename from include/xen/privcmd.h
rename to include/uapi/xen/privcmd.h

include/xen/Kbuild

View file

diff --git a/include/xen/Kbuild b/include/xen/Kbuild
index 84ad8f0..e69de29 100644
--- a/include/xen/Kbuild
+++ b/include/xen/Kbuild
@@ -1,2 +0,0 @@
-header-y += evtchn.h
-header-y += privcmd.h