Re: linux-next: manual merge of the staging tree with the fbdev tree

Greg KH
2011-08-24T04:50:36Z

On Wed, Aug 24, 2011 at 02:41:34PM +1000, Stephen Rothwell wrote:
> 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.

Wonderful, thanks for the fix.

greg k-h