linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Greg KH <greg@kroah.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
	Florian Tobias Schandinat <FlorianSchandinat@gmx.de>,
	linux-fbdev@vger.kernel.org, Aaro Koskinen <aaro.koskinen@iki.fi>
Subject: linux-next: manual merge of the staging tree with the fbdev tree
Date: Thu, 13 Oct 2011 17:02:25 +1100	[thread overview]
Message-ID: <20111013170225.254bc2d590deee544913ab6c@canb.auug.org.au> (raw)

[-- 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 --]

             reply	other threads:[~2011-10-13  6:02 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-10-13  6:02 Stephen Rothwell [this message]
2011-10-13 15:10 ` linux-next: manual merge of the staging tree with the fbdev tree 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

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20111013170225.254bc2d590deee544913ab6c@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=FlorianSchandinat@gmx.de \
    --cc=aaro.koskinen@iki.fi \
    --cc=greg@kroah.com \
    --cc=laurent.pinchart@ideasonboard.com \
    --cc=linux-fbdev@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).