# HG changeset patch
# User kaf24@xxxxxxxxxxxxxxxxxxxx
# Node ID 3c88c4d68fc1ba7a0d30fb8f3710a5be5f788cc0
# Parent 89250c81cdd213327d5eb69ff72e1d42cd187377
Clarify the BSD-ish licenses for the blk and net front-end drivers so
that it is clear they are fully GPL-compatible and satisfy the free
software definitions in include/linux/module.h.
Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>
Signed-off-by: Stephen Tweedie <sct@xxxxxxxxxx>
diff -r 89250c81cdd2 -r 3c88c4d68fc1
linux-2.6-xen-sparse/drivers/xen/blkfront/blkfront.c
--- a/linux-2.6-xen-sparse/drivers/xen/blkfront/blkfront.c Tue Dec 13
21:12:02 2005
+++ b/linux-2.6-xen-sparse/drivers/xen/blkfront/blkfront.c Wed Dec 14
00:25:07 2005
@@ -10,8 +10,11 @@
* Copyright (c) 2005, Christopher Clark
* Copyright (c) 2005, XenSource Ltd
*
- * This file may be distributed separately from the Linux kernel, or
- * incorporated into other software packages, subject to the following license:
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation; or, when distributed
+ * separately from the Linux kernel or incorporated into other
+ * software packages, subject to the following license:
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this source file (the "Software"), to deal in the Software without
@@ -820,7 +823,7 @@
}
module_exit(xlblk_exit);
-MODULE_LICENSE("BSD");
+MODULE_LICENSE("Dual BSD/GPL");
/*
diff -r 89250c81cdd2 -r 3c88c4d68fc1
linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c
--- a/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c Tue Dec 13
21:12:02 2005
+++ b/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c Wed Dec 14
00:25:07 2005
@@ -4,8 +4,11 @@
* Copyright (c) 2002-2005, K A Fraser
* Copyright (c) 2005, XenSource Ltd
*
- * This file may be distributed separately from the Linux kernel, or
- * incorporated into other software packages, subject to the following license:
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation; or, when distributed
+ * separately from the Linux kernel or incorporated into other
+ * software packages, subject to the following license:
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this source file (the "Software"), to deal in the Software without
@@ -1294,7 +1297,7 @@
}
module_exit(netif_exit);
-MODULE_LICENSE("BSD");
+MODULE_LICENSE("Dual BSD/GPL");
/* ** /proc **/
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home