---

yaml
---
r: 148527
b: refs/heads/master
c: 6ab5631
h: refs/heads/master
i:
  148525: d76f82f
  148523: 6b76437
  148519: a9e7517
  148511: 5f7a684
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e349792a385ed47390d156155b1a1e19af1bf163
+refs/heads/master: 6ab56315a36e42e90ad7173aa8b3bbd1467d1fea

trunk/Documentation/ide/ide.txt

@@ -216,8 +216,6 @@ Other kernel parameters for ide_core are:
 
 * "noflush=[interface_number.device_number]" to disable flush requests
 
-* "nohpa=[interface_number.device_number]" to disable Host Protected Area
-
 * "noprobe=[interface_number.device_number]" to skip probing
 
 * "nowerr=[interface_number.device_number]" to ignore the WRERR_STAT bit

trunk/Documentation/kernel-parameters.txt

@@ -887,8 +887,11 @@ and is between 256 and 4096 characters. It is defined in the file
 
 	ide-core.nodma=	[HW] (E)IDE subsystem
 			Format: =0.0 to prevent dma on hda, =0.1 hdb =1.0 hdc
-			.vlb_clock .pci_clock .noflush .nohpa .noprobe .nowerr
-			.cdrom .chs .ignore_cable are additional options
+			.vlb_clock .pci_clock .noflush .noprobe .nowerr .cdrom
+			.chs .ignore_cable are additional options
+			See Documentation/ide/ide.txt.
+
+	idebus=		[HW] (E)IDE subsystem - VLB/PCI bus speed
 			See Documentation/ide/ide.txt.
 
 	ide-pci-generic.all-generic-ide [HW] (E)IDE subsystem

trunk/Documentation/lguest/Makefile

@@ -1,5 +1,6 @@
 # This creates the demonstration utility "lguest" which runs a Linux guest.
-CFLAGS:=-m32 -Wall -Wmissing-declarations -Wmissing-prototypes -O3 -I../../include -I../../arch/x86/include -U_FORTIFY_SOURCE
+CFLAGS:=-Wall -Wmissing-declarations -Wmissing-prototypes -O3 -I../../include -I../../arch/x86/include -U_FORTIFY_SOURCE
+LDLIBS:=-lz
 
 all: lguest