cool.. something along the lines of: git pull --rebase <airlied's remote name> drm-next and then git mergetool should do the job Thanks :-) BR, -R On Thu, Mar 12, 2015 at 11:31 PM, John Hunter <zhjwpku@xxxxxxxxx> wrote: > Fine, I will try to catch up. > Thanks anyway. > > Have a nice day, > John > > On Fri, Mar 13, 2015 at 11:07 AM, Rob Clark <robdclark@xxxxxxxxx> wrote: >> >> On Thu, Mar 12, 2015 at 10:53 PM, John Hunter <zhjwpku@xxxxxxxxx> wrote: >> > Got it, maybe I should work on the drm-next or latest linux master. >> > >> > I am working on the drm git repo below for now as Daniel Vetter told me >> > git://people.freedesktop.org/~airlied/linux >> > I am quite confused now 'cause there are a bounch of git repo, I really >> > do not know which one should I git clone. >> > >> >> Hmm, I suspect airlied hasn't updated his master branch in a while, >> which is probably causing confusing.. using his drm-next branch or >> linus master would be better.. in general, drm-next for latest and >> greatest drm is probably best, but right at the moment there is >> probably not much difference from linus master. >> >> I usually end up 'git remote add'ing a bunch of different trees to >> track both what has already landed in linus's master branch, and also >> what is coming in drm-next (and various different arm trees related to >> other stuff I work on).. but for drm stuff, Dave's drm-next branch is >> a safe bet. >> >> BR, >> -R >> >> >> > >> > On Fri, Mar 13, 2015 at 10:33 AM, Rob Clark <robdclark@xxxxxxxxx> wrote: >> >> >> >> On Thu, Mar 12, 2015 at 4:02 AM, John Hunter <zhaojunwang@xxxxxxxxxx> >> >> wrote: >> >> > From: John Hunter <zhjwpku@xxxxxxxxx> >> >> > >> >> > IMHO, some annotations were copypaste from somewhere else, it is >> >> > obviously not rightly modified. Hope I am right with that. >> >> > --- >> >> > drivers/gpu/drm/drm_crtc.c | 115 >> >> > ++++++++++++++++++++++----------------------- >> >> > 1 file changed, 56 insertions(+), 59 deletions(-) >> >> > >> >> > diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c >> >> > index f2d667b..7f771e9 100644 >> >> > --- a/drivers/gpu/drm/drm_crtc.c >> >> > +++ b/drivers/gpu/drm/drm_crtc.c >> >> > @@ -205,12 +205,12 @@ char *drm_get_connector_status_name(enum >> >> > drm_connector_status status) >> >> > /** >> >> > * drm_mode_object_get - allocate a new identifier >> >> > * @dev: DRM device >> >> > - * @ptr: object pointer, used to generate unique ID >> >> > - * @type: object type >> >> > + * @obj: object pointer, used to generate unique ID >> >> > + * @obj_type: object type >> >> > * >> >> > * LOCKING: >> >> > * >> >> > - * Create a unique identifier based on @ptr in @dev's identifier >> >> > space. >> >> > Used >> >> > + * Create a unique identifier based on @obj in @dev's identifier >> >> > space. >> >> > Used >> >> > * for tracking modes, CRTCs and connectors. >> >> >> >> so, I don't suppose you can rebase against a newer upstream kernel? >> >> >> >> From a quick look, it seems like the arg name errors where corrected >> >> in 065a50ed3ef75cb265e12e3e1b615db0835150bc while the description >> >> bodies fixes from your patch are still applicable. In the current >> >> form, the patch does not apply against drm-next (or latest linux >> >> master), but most of it is still applicable and would be a very >> >> welcome improvement. >> >> >> >> Thanks :-) >> >> >> >> BR, >> >> -R >> >> > > > > > -- > Best regards > Junwang Zhao > Microprocessor Research and Develop Center > Department of Computer Science &Technology > Peking University > Beijing, 100871, PRC _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/dri-devel
