[lkml]   [2011]   [Aug]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
    SubjectRe: linux-next: manual merge of the staging tree with the fbdev tree
    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

     \ /
      Last update: 2011-08-24 06:53    [W:0.020 / U:7.092 seconds]
    ©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site