Re: [Pull Request] Eseries patches

[Ian Molton <spyro@xxxxxxx>]

Russell King - ARM Linux wrote:

>> Hehe, it looks like Russell has more strict requirement on this.
>> I guess you have to merge them a bit further and do more work :)

No, Russell just silently merged them, but they didnt hit mainline yet, so I
missed that fact. Something which Russell is taking great delight in pointing
out my stupidity over.

> The problem is that Ian's been bugging me to merge the reshuffle of
> the eseries stuff, and whining "where are you" to several of my email
> addresses.

Well when you dont reply for several days, what should I do? sit here and wai t
longer?

and its your own fault I had to do that twice because as you pointed out to me,
you willfully ignored one of my messages (your choice of word).

> However, Ian's not bothered to check whether I've already pulled it or
> not.

Actually, I did, but my check was inadequate. I'm so very sorry. The fact of the
matter is that git (as far as I can see) doesn't actually make it easy to check
if a particular branch has been pulled into a remote repo.

I've had a play, and the best I can come up with is to use gitk --all and search
for my name until I find either the specific patchset, or one that predates it.

>  Fact is, the last pull was 26th August before these subsequent
> "where are you" "pull my tree" whinges started.

Would have been nice if you said something as simple as "I pulled your tree on
XXX, are you sure there are any changes" then (using polite language, not the
rather arrogant didactic message I got).

> I've no idea what's actually in Ian's tree and what he's asking me to
> actually pull.  There's no diffstat, no list of changes, and no gitweb
> URL.  I've no real idea if what he's asking me to pull is just the
> stuff which I pulled on the 26th but now rebased.

Simply because, since I believed the branch not to have been pulled, I didn't
think it was necessary to post an identical diffstat. If I thought it had been
pulled I wouldn't have even had to send a pull request would I?

Since it was obvious that I was pushing the same patchset I already pushed (I
said as much in my second pull request) you might have simply said so.

> So, what I want from Ian is a proper pull request, so I can see if
> there really is anything new in there.

I'll save you the effort. There isn't. My mistake.

> That all said, it's all gone completely quiet since I sent Ian a copy
> of _my_ diffstat of stuff I've already merged from his git tree - I
> suspect he has a rather red face.

No, I don't. Unlike you, I can hold my hands up and admit when I've made a
mistake. Shit happens.

If I hadn't made any effort to check if you'd pulled, THEN I'd have a red face,
but since I did, I don't feel bad. I'll simply get on with cleaning up the rest
of the e-series code.

Have a nice day Russell. You've got a reputation for this kind of 'rubbing
peoples nose in their errors' crap by now, hope it doesn't bite you.

-------------------------------------------------------------------
List admin: http://lists.arm.linux.org.uk/mailman/listinfo/linux-arm-kernel
FAQ:        http://www.arm.linux.org.uk/mailinglists/faq.php
Etiquette:  http://www.arm.linux.org.uk/mailinglists/etiquette.php