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

[Stephen Rothwell <sfr@canb.auug.org.au>]

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

Hi Bartlomiej,

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

  drivers/video/fbdev/mmp/fb/mmpfb.c

between commit:

  6396bb221514 ("treewide: kzalloc() -> kcalloc()")

from Linus' tree and commit:

  e0e894f59418 ("video: fbdev-MMP: Delete an error message for a failed memory allocation in two functions")

from the fbdev tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/video/fbdev/mmp/fb/mmpfb.c
index f27697e07c55,292b3e403044..000000000000
--- a/drivers/video/fbdev/mmp/fb/mmpfb.c
+++ b/drivers/video/fbdev/mmp/fb/mmpfb.c
@@@ -493,12 -493,11 +493,11 @@@ static int modes_setup(struct mmpfb_inf
  		return 0;
  	}
  	/* put videomode list to info structure */
 -	videomodes = kzalloc(sizeof(struct fb_videomode) * videomode_num,
 -			GFP_KERNEL);
 +	videomodes = kcalloc(videomode_num, sizeof(struct fb_videomode),
 +			     GFP_KERNEL);
- 	if (!videomodes) {
- 		dev_err(fbi->dev, "can't malloc video modes\n");
+ 	if (!videomodes)
  		return -ENOMEM;
- 	}
+ 
  	for (i = 0; i < videomode_num; i++)
  		mmpmode_to_fbmode(&videomodes[i], &mmp_modes[i]);
  	fb_videomode_to_modelist(videomodes, videomode_num, &info->modelist);

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]