[Glibc-bsd-commits] r5321 - in trunk/kfreebsd-11/debian: . patches

[rmh at alioth.debian.org]

Author: rmh
Date: 2014-01-08 22:18:20 +0000 (Wed, 08 Jan 2014)
New Revision: 5321

Removed:
   trunk/kfreebsd-11/debian/patches/vmx_ftbfs.diff
Modified:
   trunk/kfreebsd-11/debian/changelog
   trunk/kfreebsd-11/debian/patches/series
Log:
  * New upstream snapshot.
    - Fixes build of vt_xboxfb.
    - vmx_ftbfs.diff: Remove (merged).

Modified: trunk/kfreebsd-11/debian/changelog
===================================================================
--- trunk/kfreebsd-11/debian/changelog	2014-01-08 21:37:03 UTC (rev 5320)
+++ trunk/kfreebsd-11/debian/changelog	2014-01-08 22:18:20 UTC (rev 5321)
@@ -1,3 +1,11 @@
+kfreebsd-11 (11.0~svn260450-1) experimental; urgency=low
+
+  * New upstream snapshot.
+    - Fixes build of vt_xboxfb.
+    - vmx_ftbfs.diff: Remove (merged).
+
+ -- Robert Millan <rmh at debian.org>  Wed, 08 Jan 2014 21:00:00 +0100
+
 kfreebsd-11 (11.0~svn260207-2) experimental; urgency=low
 
   * s/xboxfb/vt_xboxfb/ to fix FTBFS on kfreebsd-i386.

Modified: trunk/kfreebsd-11/debian/patches/series
===================================================================
--- trunk/kfreebsd-11/debian/patches/series	2014-01-08 21:37:03 UTC (rev 5320)
+++ trunk/kfreebsd-11/debian/patches/series	2014-01-08 22:18:20 UTC (rev 5321)
@@ -4,7 +4,6 @@
 mount_remount.diff
 ldscript_output_format.diff
 unescaped_kern_ident.diff
-vmx_ftbfs.diff
 
 # Other patches that might or might not be mergeable
 userland.diff

Deleted: trunk/kfreebsd-11/debian/patches/vmx_ftbfs.diff
===================================================================
--- trunk/kfreebsd-11/debian/patches/vmx_ftbfs.diff	2014-01-08 21:37:03 UTC (rev 5320)
+++ trunk/kfreebsd-11/debian/patches/vmx_ftbfs.diff	2014-01-08 22:18:20 UTC (rev 5321)
@@ -1,11 +0,0 @@
---- a/sys/amd64/vmm/intel/vmx_support.S
-+++ b/sys/amd64/vmm/intel/vmx_support.S
-@@ -187,7 +187,7 @@
- 
- 	VMX_HOST_RESTORE(%r10)
- 	ret
--END(vmx_execute_guest)
-+END(vmx_enter_guest)
- 
- /*
-  * void vmx_exit_guest(void)