Hi all, Today's linux-next merge of the tty tree got a conflict in: drivers/video/fbdev/core/fbcon.c between commit: fcf918b96662 ("fbcon: Use array3_size() helper in scr_memcpyw()") from the drm-misc tree and commit: 28bc24fc46f9 ("vc: separate state") from the tty 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/core/fbcon.c index af9f5ab96f74,86fe41b1deb8..000000000000 --- a/drivers/video/fbdev/core/fbcon.c +++ b/drivers/video/fbdev/core/fbcon.c @@@ -676,8 -676,8 +676,8 @@@ static void fbcon_prepare_logo(struct v q = (unsigned short *) (vc->vc_origin + vc->vc_size_row * rows); - scr_memcpyw(q, save, logo_lines * new_cols * 2); + scr_memcpyw(q, save, array3_size(logo_lines, new_cols, 2)); - vc->vc_y += logo_lines; + vc->state.y += logo_lines; vc->vc_pos += logo_lines * vc->vc_size_row; kfree(save); }
Attachment:
pgpqhvyJ432qc.pgp
Description: OpenPGP digital signature