From mboxrd@z Thu Jan 1 00:00:00 1970 From: linux@arm.linux.org.uk (Russell King - ARM Linux) Date: Tue, 15 Sep 2009 08:34:56 +0100 Subject: What's inside the pxa tree for this merge window In-Reply-To: References: <20090914111152.GD16644@n2100.arm.linux.org.uk> Message-ID: <20090915073456.GA9208@n2100.arm.linux.org.uk> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Tue, Sep 15, 2009 at 02:50:36PM +0800, Eric Miao wrote: > On Tue, Sep 15, 2009 at 2:30 PM, Guennadi Liakhovetski > wrote: > > On Mon, 14 Sep 2009, Russell King - ARM Linux wrote: > > > >> The request was for me to merge it into my tree. ?However, last Saturday > >> I asked Linus to pull my tree... still waiting, so I'm not going to merge ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ > >> anything further until that's reached some resolution. ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ > >> > >> It's a very bad idea to change trees after a pull request has been sent. > > > > Ic, Eric, when would you be pushing your tree then? > > > > Request has already been sent. It seems from your following email (to the pull request) that neither of you actually read what I said. The relevent bit is underlined with ^'s. It has now been merged, so I can now start merging stuff into my tree again.