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

[Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>]

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in ipc/msg.c
between commit 2dc958fa2fe6 ("ipc: set msg back to -EAGAIN if copy wasn't
performed") from Linus' tree and commit "ipc: remove msg handling from
queue scan" from the akpm tree.

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

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc ipc/msg.c
index 4eaf3fd,628c6ea..0000000
--- a/ipc/msg.c
+++ b/ipc/msg.c
@@@ -860,17 -860,8 +860,9 @@@ long do_msgrcv(int msqid, void __user *
  						walk_msg->m_type != 1) {
  					msgtyp = walk_msg->m_type - 1;
  				} else if (msgflg & MSG_COPY) {
- 					if (copy_number == msg_counter) {
- 						/*
- 						 * Found requested message.
- 						 * Copy it.
- 						 */
- 						msg = copy_msg(msg, copy);
- 						if (IS_ERR(msg))
- 							goto out_unlock;
+ 					if (copy_number == msg_counter)
  						break;
- 					}
 +					msg = ERR_PTR(-EAGAIN);
  				} else
  					break;
  				msg_counter++;

Attachment: pgpZdb39H8QcR.pgp
Description: PGP signature