Author: eelco
Date: Thu Mar 3 15:36:13 2011
New Revision: 26149
URL: https://svn.nixos.org/websvn/nix/?rev=26149&sc=1
Log:
* Remove the xen-pvclock-resume patch, which has finally been merged
into 2.6.32.
Deleted:
nixpkgs/trunk/pkgs/os-specific/linux/kernel/xen-pvclock-resume.patch
Modified:
nixpkgs/trunk/pkgs/os-specific/linux/kernel/patches.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/os-specific/linux/kernel/patches.nix
==============================================================================
--- nixpkgs/trunk/pkgs/os-specific/linux/kernel/patches.nix Thu Mar 3
15:00:30 2011 (r26148)
+++ nixpkgs/trunk/pkgs/os-specific/linux/kernel/patches.nix Thu Mar 3
15:36:13 2011 (r26149)
@@ -224,10 +224,4 @@
patch = ./guruplug-mach-type.patch;
};
- xen_pvclock_resume =
- { # Fix the clock after a DomU restore following a Dom0 reboot or
migration.
- name = "xen-pvclock-resume";
- patch = ./xen-pvclock-resume.patch;
- };
-
}
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Thu Mar 3 15:00:30
2011 (r26148)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Thu Mar 3 15:36:13
2011 (r26149)
@@ -4904,7 +4904,6 @@
kernelPatches.cifs_timeout
kernelPatches.no_xsave
kernelPatches.dell_rfkill
- kernelPatches.xen_pvclock_resume
];
};
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
