ia64/xen-unstable

changeset 1033:bc6618cea0b2

bitkeeper revision 1.672 (4003052dGM9kLt2V88cgLMtQOZHEdw)

Merge scramble.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xeno
author kaf24@scramble.cl.cam.ac.uk
date Mon Jan 12 20:35:57 2004 +0000 (2004-01-12)
parents 8711bea9eaa1 b57ab0c5101f
children 0ab2028bc982
files .rootkeys xen/COPYING xen/include/hypervisor-ifs/COPYING
line diff
     1.1 --- a/.rootkeys	Mon Jan 12 08:53:30 2004 +0000
     1.2 +++ b/.rootkeys	Mon Jan 12 20:35:57 2004 +0000
     1.3 @@ -391,6 +391,7 @@ 3e450943TfE-iovQIY_tMO_VdGsPhA xen/inclu
     1.4  3ddb79c4HugMq7IYGxcQKFBpKwKhzA xen/include/asm-i386/types.h
     1.5  3ddb79c3M2n1ROZH6xk3HbyN4CPDqg xen/include/asm-i386/uaccess.h
     1.6  3ddb79c3uPGcP_l_2xyGgBSWd5aC-Q xen/include/asm-i386/unaligned.h
     1.7 +400304fcmRQmDdFYEzDh0wcBba9alg xen/include/hypervisor-ifs/COPYING
     1.8  3ddb79c2YTaZwOqWin9-QNgHge5RVw xen/include/hypervisor-ifs/block.h
     1.9  3ddb79c2PMeWTK86y4C3F4MzHw4A1g xen/include/hypervisor-ifs/dom0_ops.h
    1.10  3e6377eaioRoNm0m_HSDEAd4Vqrq_w xen/include/hypervisor-ifs/dom_mem_ops.h
     2.1 --- a/xen/COPYING	Mon Jan 12 08:53:30 2004 +0000
     2.2 +++ b/xen/COPYING	Mon Jan 12 20:35:57 2004 +0000
     2.3 @@ -1,3 +1,28 @@
     2.4 + XEN NOTICE
     2.5 + ==========
     2.6 +
     2.7 +This copyright does *not* cover guest operating systems that use
     2.8 +Xen services via normal hypercalls - this is merely considered normal
     2.9 +use of Xen, and does *not* fall under the heading of "derived work".
    2.10 +Also note that the GPL below is copyrighted by the Free Software
    2.11 +Foundation, but the instance of code that it refers to (the Xen
    2.12 +virtual machine monitor) is copyrighted by me and others who actually
    2.13 +wrote it.
    2.14 +
    2.15 +Further note that the guest-OS interfacing header files, which
    2.16 +includes all files within the subdirectory include/hypervisor-ifs, are
    2.17 +*not* covered by the GPL but by a much weaker license:
    2.18 + include/hypervisor-ifs/COPYING
    2.19 +
    2.20 +Also note that the only valid version of the GPL as far as Xen is
    2.21 +concerned is _this_ particular version of the license (i.e., *only*
    2.22 +v2, not v2.2 or v3.x or whatever), unless explicitly otherwise
    2.23 +stated.
    2.24 +
    2.25 + -- Keir Fraser (on behalf of the Xen team)
    2.26 +
    2.27 +=====================================================================
    2.28 +
    2.29  		    GNU GENERAL PUBLIC LICENSE
    2.30  		       Version 2, June 1991
    2.31  
     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/xen/include/hypervisor-ifs/COPYING	Mon Jan 12 20:35:57 2004 +0000
     3.3 @@ -0,0 +1,28 @@
     3.4 +XEN NOTICE
     3.5 +==========
     3.6 +
     3.7 +This copyright applies to all files within this subdirectory. All
     3.8 +other files in the Xen source distribution are covered by version 2 of
     3.9 +the GNU General Public License.
    3.10 +
    3.11 + -- Keir Fraser (on behalf of the Xen team)
    3.12 +
    3.13 +=====================================================================
    3.14 +
    3.15 +Permission is hereby granted, free of charge, to any person obtaining a copy
    3.16 +of this software and associated documentation files (the "Software"), to
    3.17 +deal in the Software without restriction, including without limitation the
    3.18 +rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
    3.19 +sell copies of the Software, and to permit persons to whom the Software is
    3.20 +furnished to do so, subject to the following conditions:
    3.21 +
    3.22 +The above copyright notice and this permission notice shall be included in
    3.23 +all copies or substantial portions of the Software.
    3.24 +
    3.25 +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
    3.26 +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
    3.27 +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
    3.28 +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
    3.29 +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
    3.30 +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
    3.31 +DEALINGS IN THE SOFTWARE.