2012년 9월 13일 목요일에 Dave Airlie<airl...@gmail.com>님이 작성: >>> >>> On Mon, Sep 10, 2012 at 3:46 PM, Inki Dae <inki....@samsung.com> wrote: >>> > Hello Dave, sorry for being late. >>> > >>> > this patch set fixes build warnings and includes minor code cleanup and >>> > also one patch you missed. this patch just drops non-standard NV12M and >>> > YUV420M formats from drm_fourcc.h >>> > for this, you can refer to below link: >>> > http://lists.freedesktop.org/archives/dri-devel/2012- >>> April/021812.html >>> > >>> > other patches including big changes will go to -next. >>> >>> This appears to be built on a bad base commit, it might have been some a >>> fixes >>> tree that I had to revoke, can you rebase onto Linus master and resend? >>> >> >> Rebased. if there is any problem, please let me know. > > commit da02680cb5ea7efd67732240fde739748149842e > Merge: df5c2b7 26df641 > Author: Inki Dae <inki....@samsung.com> > Date: Thu Sep 13 11:18:11 2012 +0900 > > Merge branch 'drm-fixes' of ../main_line/linux-drm into dave-drm-fixes > > shouldn't be there and is causing me problems, you shouldn't backmerge > without a reason in the merge commit, and even then it should be > avoided. >
ah, sorry for inconvenient. removed that merge commit and checked to be merged to drm-fixes. please pull it again and please let me know if any problem again. thanks, Inki Dae > Dave. > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/dri-devel >
_______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/dri-devel
