Messages in this thread | | | Date | Thu, 13 Oct 2011 09:10:14 -0600 | From | Greg KH <> | Subject | Re: linux-next: manual merge of the staging tree with the fbdev tree |
| |
On Thu, Oct 13, 2011 at 05:02:25PM +1100, 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 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.
The fix looks correct to me, thanks.
greg k-h
| |