From mboxrd@z Thu Jan 1 00:00:00 1970 From: g.liakhovetski@gmx.de (Guennadi Liakhovetski) Date: Tue, 15 Sep 2009 09:55:45 +0200 (CEST) Subject: What's inside the pxa tree for this merge window In-Reply-To: <20090915073456.GA9208@n2100.arm.linux.org.uk> References: <20090914111152.GD16644@n2100.arm.linux.org.uk> <20090915073456.GA9208@n2100.arm.linux.org.uk> Message-ID: To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Tue, 15 Sep 2009, Russell King - ARM Linux wrote: > 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. I did read it, what I wasn't sure about is after Eric has sent a pull request to you you have sent a pull request to Linus Linus has merged your tree you can (and will) now pull further trees whether you will be sending another pull request to Linus in this merge window and if so - approximately when. Or whether because Eric's request has missed your first pull request it now has to be pulled directly by Linus to make it in this window. After this your reply it seems to be the former, so, I'm hoping you'll be sending a next pull request to Linus with PXA patches in your tree some time soon in this merge window. Thanks Guennadi --- Guennadi Liakhovetski, Ph.D. Freelance Open-Source Software Developer http://www.open-technology.de/