linux-next: manual merge of the akpm tree with Linus' tree

Stephen Rothwell
2013-04-29T08:38:29Z

[-- Attachment #1: Type: text/plain, Size: 881 bytes --]

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in fs/aio.c
between commit 91d80a84bbc8 ("aio: fix possible invalid memory access
when DEBUG is enabled") from Linus' tree and commit "aio: dprintk() ->
pr_debug()" from the akpm 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 fs/aio.c
index 670cb8b,1574cb2..0000000
--- a/fs/aio.c
+++ b/fs/aio.c
@@@ -802,9 -794,8 +794,8 @@@ static int aio_read_evt(struct kioctx *
spin_unlock(&info->ring_lock);

out:
- dprintk("leaving aio_read_evt: %d h%lu t%lu\n", ret,
- (unsigned long)ring->head, (unsigned long)ring->tail);
- kunmap_atomic(ring);
+ pr_debug("%d h%u t%u\n", ret, ring->head, ring->tail);
+ kunmap_atomic(ring);
return ret;
}

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]