linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* linux-next: manual merge of the staging tree with the fbdev tree
@ 2011-10-13  6:02 Stephen Rothwell
  2011-10-13 15:10 ` Greg KH
  0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2011-10-13  6:02 UTC (permalink / raw)
  To: Greg KH
  Cc: linux-next, linux-kernel, Laurent Pinchart,
	Florian Tobias Schandinat, linux-fbdev, Aaro Koskinen

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

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/xgifb/XGI_main_26.c between commit 0d5c6ca30bb0
("staging: xgifb: use display information in info not in var for
panning") from the fbdev tree and commit fd26d42019cb ("staging: xgifb:
avoid direct references xgi_video_info") from the staging tree.

I fixed it up (I think - see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/staging/xgifb/XGI_main_26.c
index f8b88ad,36db231..0000000
--- a/drivers/staging/xgifb/XGI_main_26.c
+++ b/drivers/staging/xgifb/XGI_main_26.c
@@@ -1363,8 -1300,8 +1300,8 @@@ static int XGIfb_do_set_var(struct fb_v
  	return 0;
  }
  
- #ifdef XGIFB_PAN
- static int XGIfb_pan_var(struct fb_var_screeninfo *var, struct fb_info *info)
+ static int XGIfb_pan_var(struct xgifb_video_info *xgifb_info,
 -			 struct fb_var_screeninfo *var)
++			 struct fb_var_screeninfo *var, struct fb_info *info)
  {
  	unsigned int base;
  
@@@ -1686,7 -1634,7 +1624,7 @@@ static int XGIfb_pan_display(struct fb_
  						> info->var.yres_virtual)
  			return -EINVAL;
  	}
- 	err = XGIfb_pan_var(var, info);
 -	err = XGIfb_pan_var(xgifb_info, var);
++	err = XGIfb_pan_var(xgifb_info, var, info);
  	if (err < 0)
  		return err;
  

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

^ permalink raw reply	[flat|nested] 6+ messages in thread
* linux-next: manual merge of the staging tree with the fbdev tree
@ 2011-08-24  4:41 Stephen Rothwell
  2011-08-24  4:48 ` Greg KH
  0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2011-08-24  4:41 UTC (permalink / raw)
  To: Greg KH
  Cc: linux-next, linux-kernel, Aaro Koskinen, Laurent Pinchart, Paul Mundt

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/xgifb/XGI_main_26.c between commit c42a3d543d2b
("staging: xgifb: use display information in info not in var for
panning") from the fbdev tree and commit c39aada6926c ("staging: xgifb:
eliminate #ifdef XGIFB_PAN") from the staging tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/staging/xgifb/XGI_main_26.c
index f8b88ad,4415d4a..0000000
--- a/drivers/staging/xgifb/XGI_main_26.c
+++ b/drivers/staging/xgifb/XGI_main_26.c
@@@ -1363,8 -1357,7 +1357,7 @@@ static int XGIfb_do_set_var(struct fb_v
  	return 0;
  }
  
- #ifdef XGIFB_PAN
 -static int XGIfb_pan_var(struct fb_var_screeninfo *var)
 +static int XGIfb_pan_var(struct fb_var_screeninfo *var, struct fb_info *info)
  {
  	unsigned int base;
  

^ permalink raw reply	[flat|nested] 6+ messages in thread
* linux-next: manual merge of the staging tree with the fbdev tree
@ 2011-01-07  2:35 Stephen Rothwell
  2011-01-07 22:39 ` Greg KH
  0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2011-01-07  2:35 UTC (permalink / raw)
  To: Greg KH; +Cc: linux-next, linux-kernel, Paul Mundt, Joe Perches

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/video/udlfb.c between commit realloc_framebuffer ("video: udlfb:
Kill off special printk wrappers, use pr_fmt()") from the fbdev tree and
commit 5b84cc781058bb452f869d84bb24442ec51948c4 ("staging: Use vzalloc")
from the staging tree.

Another commit in the fbdev tree moves this file out of staging (from
drivers/staging/udlfb/udlfb.c).

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

diff --cc drivers/video/udlfb.c
index 020589a,8dd21e0..0000000
--- a/drivers/video/udlfb.c
+++ b/drivers/video/udlfb.c
@@@ -1128,9 -1163,9 +1128,9 @@@ static int dlfb_realloc_framebuffer(str
  		 * But with imperfect damage info we may send pixels over USB
  		 * that were, in fact, unchanged - wasting limited USB bandwidth
  		 */
- 		new_back = vmalloc(new_len);
+ 		new_back = vzalloc(new_len);
  		if (!new_back)
- 			pr_info("No shadow/backing buffer allcoated\n");
 -			dl_info("No shadow/backing buffer allocated\n");
++			pr_info("No shadow/backing buffer allocated\n");
  		else {
  			if (dev->backing_buffer)
  				vfree(dev->backing_buffer);

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2011-10-13 15:10 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-10-13  6:02 linux-next: manual merge of the staging tree with the fbdev tree Stephen Rothwell
2011-10-13 15:10 ` Greg KH
  -- strict thread matches above, loose matches on Subject: below --
2011-08-24  4:41 Stephen Rothwell
2011-08-24  4:48 ` Greg KH
2011-01-07  2:35 Stephen Rothwell
2011-01-07 22:39 ` Greg KH

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).