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

[Stephen Rothwell]

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/vt6656/ioctl.c between commit 17b7e1ba1e2e ("staging:
vt6656: Don't leak memory in drivers/staging/vt6656/ioctl.c::private_ioctl
()") from Linus' tree and commit 62ef30b5781d ("staging: vt6656: Remove
redundant casts from ioctl.c") from the staging tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/staging/vt6656/ioctl.c
index d59456c,cc7357d..0000000
--- a/drivers/staging/vt6656/ioctl.c
+++ b/drivers/staging/vt6656/ioctl.c
@@@ -565,7 -565,7 +565,7 @@@ int private_ioctl(PSDevice pDevice, str
  			result = -ENOMEM;
  			break;
  		}
- 		pNodeList = kmalloc(sizeof(SNodeList) + (sNodeList.uItem * sizeof(SNodeItem)), (int)GFP_ATOMIC);
 -		pNodeList = (PSNodeList)kmalloc(sizeof(SNodeList) + (sNodeList.uItem * sizeof(SNodeItem)), GFP_ATOMIC);
++		pNodeList = kmalloc(sizeof(SNodeList) + (sNodeList.uItem * sizeof(SNodeItem)), GFP_ATOMIC);
  		if (pNodeList == NULL) {
  			result = -ENOMEM;
  			break;

Attachment: pgp00000.pgp
Description: PGP signature