linux-next: manual merge of the akpm-current tree with the usb tree

[Stephen Rothwell]

Hi Andrew,

Today's linux-next merge of the akpm-current tree got a conflict in:

  drivers/usb/host/u132-hcd.c

between commit:

  d5f9e73309b7 ("USB: u132-hcd: Fix seperate word in printk message")

from the usb tree and commit:

  ac4f832eb227 ("mm, page_alloc: distinguish between being unable to sleep, unwilling to sleep and avoiding waking kswapd")

from the akpm-current tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/usb/host/u132-hcd.c
index 0a94895a358d,67b3b9d9dfd1..000000000000
--- a/drivers/usb/host/u132-hcd.c
+++ b/drivers/usb/host/u132-hcd.c
@@@ -2244,8 -2244,9 +2244,8 @@@ static int u132_urb_enqueue(struct usb_
  {
  	struct u132 *u132 = hcd_to_u132(hcd);
  	if (irqs_disabled()) {
- 		if (__GFP_WAIT & mem_flags) {
+ 		if (gfpflags_allow_blocking(mem_flags)) {
 -			printk(KERN_ERR "invalid context for function that migh"
 -				"t sleep\n");
 +			printk(KERN_ERR "invalid context for function that might sleep\n");
  			return -EINVAL;
  		}
  	}
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/