[Intel-gfx] I messed up drm-intel-next-queued!

[Hans de Goede]

Hi,

On 25-12-18 06:08, Vivi, Rodrigo wrote:
> Hi Hans,
> 
> I’m traveling on vacation and didn’t bring my laptop. I believe Joonas and Jani are out this week as well.
> 
> I’m in favor of the forced push if you are sure you have the latest one with you.

I'm sure I've the latest commit/hash from before messing up.

I've also checked no-one pushed anything based on top of my mess-up.

I've just done the forced push and everything is ok now again.

> In case you are not sure about the latest sabe head:
> I had done a drm-intel-next tag last Friday... so worst case we could reator to the drive-update-date commit and ask around to see if someone had merged other patches after that and re-push.
> 
> Merry Christmas,

I wish you a Merry Christmas too.

Thanks & Regards,

Hans




>> On Dec 24, 2018, at 8:39 PM, Hans de Goede <hdegoede at redhat.com> wrote:
>>
>> Hi,
>>
>> Ugh, I just messed up drm-intel-next-queued big time.
>>
>> I somehow rebased my work on top of drm-tip (I believe I did the rebase
>> in the wrong dir) and then after running a bunch of tests I
>> did a "dim push-branch drm-intel-next-queued" which pushed the
>> patches I intended to push rebased on top of drm-tip
>> pushing drm-tip to dinq :(
>>
>> I'm so sorry about this.
>>
>> I just checked my reflog and the last commit before me messing
>> up is commit d4de753526f4d99f541f1b6ed1d963005c09700c
>> ("drm/i915: Unwind failure on pinning the gen7 ppgtt")
>>
>> I think we should do a forced push to restore this, but
>> I don't want to make things worse, so hence this email.
>>
>> Regards,
>>
>> Hans
>>
>>
>>
>>