* linux-next: manual merge of the akpm-current tree with the usb tree
@ 2015-10-07 4:26 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2015-10-07 4:26 UTC (permalink / raw)
To: Andrew Morton, Greg KH
Cc: linux-next, linux-kernel, Masanari Iida, Mel Gorman
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@canb.auug.org.au
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;
}
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2015-10-07 4:26 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-10-07 4:26 linux-next: manual merge of the akpm-current tree with the usb tree Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).