[GIT PULL] generic arm for MSM

[GIT PULL] generic arm for MSM

[Daniel Walker]

These are all mostly small patches that I've sent out a few times with
no comments. Let me know if you see any issues.

The following changes since commit 7ee744f22ffad619e23912a22d1b2795e10ed825:
  Stephen Rothwell (1):
        Add linux-next specific files for 20100324

are available in the git repository at:

  git://codeaurora.org/quic/kernel/dwalker/linux-msm.git for-russell

Daniel Walker (2):
      arm: msm: allow ARCH_MSM to have v7 cpus
      arm: msm: add oprofile pmu support

Dave Estes (1):
      arm: mm: qsd8x50: Fix incorrect permission faults

Steve Muckle (1):
      arm: msm: define HAVE_CLK for ARCH_MSM

 arch/arm/Kconfig          |   11 ++++++-----
 arch/arm/kernel/pmu.c     |    2 ++
 arch/arm/mach-msm/Kconfig |    2 ++
 arch/arm/mm/Kconfig       |    2 ++
 arch/arm/mm/abort-ev7.S   |   38 ++++++++++++++++++++++++++++++++++++++
 5 files changed, 50 insertions(+), 5 deletions(-)

[GIT PULL] generic arm for MSM

[Russell King - ARM Linux]

On Thu, Mar 25, 2010 at 02:52:17PM -0700, Daniel Walker wrote:
> These are all mostly small patches that I've sent out a few times with
> no comments. Let me know if you see any issues.
> 
> The following changes since commit 7ee744f22ffad619e23912a22d1b2795e10ed825:
>   Stephen Rothwell (1):
>         Add linux-next specific files for 20100324

This doesn't seem to be in Linus' tree - ah, no, it's based on linux-next.
So, if I pull this, I get everyone's work into my tree.  To see what
you're actually sending me, do this:

	git diff --stat 9353685..

and it'll show you what you're sending me which isn't in my 'devel' branch
already - and if you replace that git id with the latest Linus' commit in
your tree...

So no thanks.  Will not pull the entire linux-next tree into mine.

Please build your tree on a more stable base, such as Linus' tree.

[GIT PULL] generic arm for MSM

[Daniel Walker]

On Thu, 2010-03-25 at 22:29 +0000, Russell King - ARM Linux wrote:
> On Thu, Mar 25, 2010 at 02:52:17PM -0700, Daniel Walker wrote:
> > These are all mostly small patches that I've sent out a few times with
> > no comments. Let me know if you see any issues.
> > 
> > The following changes since commit 7ee744f22ffad619e23912a22d1b2795e10ed825:
> >   Stephen Rothwell (1):
> >         Add linux-next specific files for 20100324
> 
> This doesn't seem to be in Linus' tree - ah, no, it's based on linux-next.
> So, if I pull this, I get everyone's work into my tree.  To see what
> you're actually sending me, do this:
> 
> 	git diff --stat 9353685..
> 
> and it'll show you what you're sending me which isn't in my 'devel' branch
> already - and if you replace that git id with the latest Linus' commit in
> your tree...
> 
> So no thanks.  Will not pull the entire linux-next tree into mine.

Oh please why not! (just joking) ..

> Please build your tree on a more stable base, such as Linus' tree.

I thought you wanted stuff on your development tree? Where can I get
that other than in next? It's easy enough to put it on a linus tree if
that's acceptable.

Daniel

[GIT PULL] generic arm for MSM

[Russell King - ARM Linux]

On Thu, Mar 25, 2010 at 03:32:58PM -0700, Daniel Walker wrote:
> On Thu, 2010-03-25 at 22:29 +0000, Russell King - ARM Linux wrote:
> > On Thu, Mar 25, 2010 at 02:52:17PM -0700, Daniel Walker wrote:
> > > These are all mostly small patches that I've sent out a few times with
> > > no comments. Let me know if you see any issues.
> > > 
> > > The following changes since commit 7ee744f22ffad619e23912a22d1b2795e10ed825:
> > >   Stephen Rothwell (1):
> > >         Add linux-next specific files for 20100324
> > 
> > This doesn't seem to be in Linus' tree - ah, no, it's based on linux-next.
> > So, if I pull this, I get everyone's work into my tree.  To see what
> > you're actually sending me, do this:
> > 
> > 	git diff --stat 9353685..
> > 
> > and it'll show you what you're sending me which isn't in my 'devel' branch
> > already - and if you replace that git id with the latest Linus' commit in
> > your tree...
> > 
> > So no thanks.  Will not pull the entire linux-next tree into mine.
> 
> Oh please why not! (just joking) ..
> 
> > Please build your tree on a more stable base, such as Linus' tree.
> 
> I thought you wanted stuff on your development tree? Where can I get
> that other than in next? It's easy enough to put it on a linus tree if
> that's acceptable.

I've stated in the past that my 'devel' branch is a convenience thing;
it saves me having to regularly - nightly - email SFR to say "you need
branches A,B,C,D,E,F,G,H,I,J and K".

As such, it's regularly regenerated from a series of topic branches,
and so at least the top commit is not stable.

What I will object to are trees based on linux-next or my devel branch.
If you have a dependence on something in my tree, please talk to me and
I can shift it over to the 'devel-stable' branch (which as the name says,
means that it *is* stable and thus can be used as a basis for trees.)

I'm presently basing my topic branches off of Linus' commit 3971047.
You can use that, or one of the -rc releases, or Linus' current tip.
I don't mind which.

[GIT PULL] generic arm for MSM

[Nicolas Pitre]

On Thu, 25 Mar 2010, Daniel Walker wrote:

> These are all mostly small patches that I've sent out a few times with
> no comments. Let me know if you see any issues.
> 
> The following changes since commit 7ee744f22ffad619e23912a22d1b2795e10ed825:
>   Stephen Rothwell (1):
>         Add linux-next specific files for 20100324

Never base your tree on linux-next.  You really should use a stable 
tree, such as Linus' tree.  The linux-next tree is constantly thrown 
away and rebuilt, and your own tree will keep a reference on that 
obsoleted linux-next version otherwise.



Nicolas

[GIT PULL] generic arm for MSM

[Daniel Walker]

On Thu, 2010-03-25 at 18:46 -0400, Nicolas Pitre wrote:
> On Thu, 25 Mar 2010, Daniel Walker wrote:
> 
> > These are all mostly small patches that I've sent out a few times with
> > no comments. Let me know if you see any issues.
> > 
> > The following changes since commit 7ee744f22ffad619e23912a22d1b2795e10ed825:
> >   Stephen Rothwell (1):
> >         Add linux-next specific files for 20100324
> 
> Never base your tree on linux-next.  You really should use a stable 
> tree, such as Linus' tree.  The linux-next tree is constantly thrown 
> away and rebuilt, and your own tree will keep a reference on that 
> obsoleted linux-next version otherwise.

I only based this pull request on next , since I can't get Russell tree
anyplace else. I've had patches in the past which I've had to use next
cause there are underlying changes that I can only find in next .. So no
I don't base development trees on next generally.

Daniel

[GIT PULL] generic arm for MSM

[Russell King - ARM Linux]

On Thu, Mar 25, 2010 at 03:49:24PM -0700, Daniel Walker wrote:
> On Thu, 2010-03-25 at 18:46 -0400, Nicolas Pitre wrote:
> > On Thu, 25 Mar 2010, Daniel Walker wrote:
> > 
> > > These are all mostly small patches that I've sent out a few times with
> > > no comments. Let me know if you see any issues.
> > > 
> > > The following changes since commit 7ee744f22ffad619e23912a22d1b2795e10ed825:
> > >   Stephen Rothwell (1):
> > >         Add linux-next specific files for 20100324
> > 
> > Never base your tree on linux-next.  You really should use a stable 
> > tree, such as Linus' tree.  The linux-next tree is constantly thrown 
> > away and rebuilt, and your own tree will keep a reference on that 
> > obsoleted linux-next version otherwise.
> 
> I only based this pull request on next , since I can't get Russell tree
> anyplace else. I've had patches in the past which I've had to use next
> cause there are underlying changes that I can only find in next .. So no
> I don't base development trees on next generally.

http://www.home.arm.linux.org.uk/developer/

has a link to gitweb for it, and a url pointing to where it is on the
ftp/http site:

# rmk's GIT tree
# rmk's random kernel patches and git tree 

It's not like it's hidden.

[GIT PULL] generic arm for MSM

[Daniel Walker]

On Thu, 2010-03-25 at 22:53 +0000, Russell King - ARM Linux wrote:

> http://www.home.arm.linux.org.uk/developer/
> 
> has a link to gitweb for it, and a url pointing to where it is on the
> ftp/http site:
> 
> # rmk's GIT tree
> # rmk's random kernel patches and git tree 
> 
> It's not like it's hidden.

for that url I get,

Forbidden
You don't have permission to access /developer/ on this server.


________________________________________________________________________
Apache/2.2.2 (Fedora) Server at www.home.arm.linux.org.uk Port 80

[GIT PULL] generic arm for MSM

[Russell King - ARM Linux]

On Thu, Mar 25, 2010 at 03:54:15PM -0700, Daniel Walker wrote:
> On Thu, 2010-03-25 at 22:53 +0000, Russell King - ARM Linux wrote:
> 
> > http://www.home.arm.linux.org.uk/developer/
> > 
> > has a link to gitweb for it, and a url pointing to where it is on the
> > ftp/http site:
> > 
> > # rmk's GIT tree
> > # rmk's random kernel patches and git tree 
> > 
> > It's not like it's hidden.
> 
> for that url I get,
> 
> Forbidden
> You don't have permission to access /developer/ on this server.

http://www.arm.linux.org.uk/developer/

sorry, I tend to use my own local copy of the site; the public copy is
identical.

[GIT PULL] generic arm for MSM

[Daniel Walker]

On Thu, 2010-03-25 at 22:55 +0000, Russell King - ARM Linux wrote:
> On Thu, Mar 25, 2010 at 03:54:15PM -0700, Daniel Walker wrote:
> > On Thu, 2010-03-25 at 22:53 +0000, Russell King - ARM Linux wrote:
> > 
> > > http://www.home.arm.linux.org.uk/developer/
> > > 
> > > has a link to gitweb for it, and a url pointing to where it is on the
> > > ftp/http site:
> > > 
> > > # rmk's GIT tree
> > > # rmk's random kernel patches and git tree 
> > > 
> > > It's not like it's hidden.
> > 
> > for that url I get,
> > 
> > Forbidden
> > You don't have permission to access /developer/ on this server.
> 
> http://www.arm.linux.org.uk/developer/
> 
> sorry, I tend to use my own local copy of the site; the public copy is
> identical.

I guess it's not hidden, but I'd say it's not easy to find .. Is there
some reason you don't want that tree in the MAINTAINERS file ?

I tried to add both,

ftp://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm.git
http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm.git/

and I got strange download failures ..

fatal: ftp://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm.git/info/refs download error - Failed connect to ftp.arm.linux.org.uk:21; Operation now in progress

Both had the same failure. I tried with a newer git version 1.7 (before
it was 1.6) and it showed this on the ftp variant,

error: RETR response: 550 (curl_result = 78, http_code = 550, sha1 = 01e77706cdde7c0b47e5ca1f4284a795504c7c40The command seems to be hund

However, it did finish downloading the tree ..

Are these known issues, or maybe it's because bits are traveling
US<->UK ?

Daniel

[GIT PULL] generic arm for MSM

[Uwe Kleine-König]

Hello,

> I tried to add both,
> 
> ftp://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm.git
> http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm.git/
> 
> and I got strange download failures ..
It's recommended to have an actual copy of Linus' tree to fetch Russells
into.  Then it works fine most of the time.

Best regards
Uwe

-- 
Pengutronix e.K.                           | Uwe Kleine-K?nig            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |

[GIT PULL] generic arm for MSM

[Russell King - ARM Linux]

On Fri, Mar 26, 2010 at 09:14:45AM +0100, Uwe Kleine-K?nig wrote:
> Hello,
> 
> > I tried to add both,
> > 
> > ftp://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm.git
> > http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm.git/
> > 
> > and I got strange download failures ..
> It's recommended to have an actual copy of Linus' tree to fetch Russells
> into.  Then it works fine most of the time.

There shouldn't be any problem; that tree is an identical copy of my
local tree which uses no alternatives.  It always contains an entire
set of Linus' tree with no additional repacking.

The only reason to pull this tree into a copy of Linus' tree is that
it'll avoid fetching 400MB or so of Linus' pack files over http from
the UK, instead only fetching 34MB of objects.

[GIT PULL] generic arm for MSM

[Uwe Kleine-König]

Hello,

> There shouldn't be any problem; that tree is an identical copy of my
> local tree which uses no alternatives.  It always contains an entire
> set of Linus' tree with no additional repacking.
> 
> The only reason to pull this tree into a copy of Linus' tree is that
> it'll avoid fetching 400MB or so of Linus' pack files over http from
> the UK, instead only fetching 34MB of objects.
I looked some time ago and IIRC you had all of Linus' tree in a single
pack file.  This resulted in trying to download these 400MB even though
I only missed one day's worth of commits.  So today I always do

	git remote update linus rmk

which works well most of the time.

Best regards
Uwe

-- 
Pengutronix e.K.                           | Uwe Kleine-K?nig            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |

[GIT PULL] generic arm for MSM

[Daniel Walker]

On Fri, 2010-03-26 at 08:23 +0000, Russell King - ARM Linux wrote:
> On Fri, Mar 26, 2010 at 09:14:45AM +0100, Uwe Kleine-K?nig wrote:
> > Hello,
> > 
> > > I tried to add both,
> > > 
> > > ftp://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm.git
> > > http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm.git/
> > > 
> > > and I got strange download failures ..
> > It's recommended to have an actual copy of Linus' tree to fetch Russells
> > into.  Then it works fine most of the time.
> 
> There shouldn't be any problem; that tree is an identical copy of my
> local tree which uses no alternatives.  It always contains an entire
> set of Linus' tree with no additional repacking.

Now I'm getting this when I try to fetch your tree,

error: RETR response: 550 (curl_result = 78, http_code = 550, sha1 = 2725898fc9bb2121ac0fb1b5e4faf4fc09014729)
error: RETR response: 550 (curl_result = 78, http_code = 550, sha1 = b72c40949b0f04728f2993a1434598d3bad094ea)
error: RETR response: 550 (curl_result = 78, http_code = 550, sha1 = 2eaa9cfdf33b8d7fb7aff27792192e0019ae8fc6)
error: RETR response: 550 (curl_result = 78, http_code = 550, sha1 = e4d50423d773fb8d5b714430ba5358e8a1b87c14)
error: RETR response: 550 (curl_result = 78, http_code = 550, sha1 = 162451fe66ce653aba0882a73c91b18006263397)
error: RETR response: 550 (curl_result = 78, http_code = 550, sha1 = 698a60b84f0ea4fe4a35aaeeb554e2e364adbb3c)
error: RETR response: 550 (curl_result = 78, http_code = 550, sha1 = 31bd585167b1da44dbb0242c1e1c3bef8126f7a2)
error: RETR response: 550 (curl_result = 78, http_code = 550, sha1 = 6d7959089feef578b898c72ca7d5397114262a6d)
error: FTP response timeout (curl_result = 28, http_code = 150, sha1 = 0f59db814fb8d112ea3ded5ca240aaf7e9b165dd)
error: Unable to find 9dc95cddf0db231f714b583d41872f5682c7fa10 under ftp://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm.git
Cannot obtain needed tree 9dc95cddf0db231f714b583d41872f5682c7fa10
while processing commit 7998a8787a8b35fede689c2bb716f65b231e7492.
error: Fetch failed.

Ultimately the fetch fails .. I did this on multiple git trees with the
same result ..

Daniel

[GIT PULL] generic arm for MSM

[Russell King - ARM Linux]

On Thu, Apr 01, 2010 at 04:11:31PM -0700, Daniel Walker wrote:
> On Fri, 2010-03-26 at 08:23 +0000, Russell King - ARM Linux wrote:
> > On Fri, Mar 26, 2010 at 09:14:45AM +0100, Uwe Kleine-K?nig wrote:
> > > Hello,
> > > 
> > > > I tried to add both,
> > > > 
> > > > ftp://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm.git
> > > > http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm.git/
> > > > 
> > > > and I got strange download failures ..
> > > It's recommended to have an actual copy of Linus' tree to fetch Russells
> > > into.  Then it works fine most of the time.
> > 
> > There shouldn't be any problem; that tree is an identical copy of my
> > local tree which uses no alternatives.  It always contains an entire
> > set of Linus' tree with no additional repacking.
> 
> Now I'm getting this when I try to fetch your tree,
> 
> error: RETR response: 550 (curl_result = 78, http_code = 550, sha1 = 2725898fc9bb2121ac0fb1b5e4faf4fc09014729)
> error: RETR response: 550 (curl_result = 78, http_code = 550, sha1 = b72c40949b0f04728f2993a1434598d3bad094ea)
> error: RETR response: 550 (curl_result = 78, http_code = 550, sha1 = 2eaa9cfdf33b8d7fb7aff27792192e0019ae8fc6)
> error: RETR response: 550 (curl_result = 78, http_code = 550, sha1 = e4d50423d773fb8d5b714430ba5358e8a1b87c14)
> error: RETR response: 550 (curl_result = 78, http_code = 550, sha1 = 162451fe66ce653aba0882a73c91b18006263397)
> error: RETR response: 550 (curl_result = 78, http_code = 550, sha1 = 698a60b84f0ea4fe4a35aaeeb554e2e364adbb3c)
> error: RETR response: 550 (curl_result = 78, http_code = 550, sha1 = 31bd585167b1da44dbb0242c1e1c3bef8126f7a2)
> error: RETR response: 550 (curl_result = 78, http_code = 550, sha1 = 6d7959089feef578b898c72ca7d5397114262a6d)
> error: FTP response timeout (curl_result = 28, http_code = 150, sha1 = 0f59db814fb8d112ea3ded5ca240aaf7e9b165dd)
> error: Unable to find 9dc95cddf0db231f714b583d41872f5682c7fa10 under ftp://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm.git
> Cannot obtain needed tree 9dc95cddf0db231f714b583d41872f5682c7fa10
> while processing commit 7998a8787a8b35fede689c2bb716f65b231e7492.
> error: Fetch failed.
> 
> Ultimately the fetch fails .. I did this on multiple git trees with the
> same result ..

Seems to be a git bug.

1. GIT_DIR=..../linux-2.6-arm.git git cat-file -p 2725898fc9bb2121ac0fb1b5e4faf4fc09014729
   works, so the tree _does_ have this object.
2. objects/27/25898fc9bb2121ac0fb1b5e4faf4fc09014729 doesn't exist, so it
   must be in a pack file.
3. objects/info/packs lists all the pack files.

So the question is why isn't your pull fetching from the pack files.
Lastly:

4. b72c40949b0f04728f2993a1434598d3bad094ea (and some of the others) are
   Linus' commits.
5. 2eaa9cfdf33b8d7fb7aff27792192e0019ae8fc6 is the -rc3 tag.

So either your tree is not up to date wrt Linus' tree, or git is trying
to fetch objects it already has (which would also be a git bug.)

I notice that you're using the ftp URL - have you tried using the http
URL instead?  Maybe git doesn't support ftp URLs?

[GIT PULL] generic arm for MSM

[Daniel Walker]

On Tue, 2010-04-06 at 22:35 +0100, Russell King - ARM Linux wrote:
> On Thu, Apr 01, 2010 at 04:11:31PM -0700, Daniel Walker wrote:
> > On Fri, 2010-03-26 at 08:23 +0000, Russell King - ARM Linux wrote:
> > > On Fri, Mar 26, 2010 at 09:14:45AM +0100, Uwe Kleine-K?nig wrote:
> > > > Hello,
> > > > 
> > > > > I tried to add both,
> > > > > 
> > > > > ftp://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm.git
> > > > > http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm.git/
> > > > > 
> > > > > and I got strange download failures ..
> > > > It's recommended to have an actual copy of Linus' tree to fetch Russells
> > > > into.  Then it works fine most of the time.
> > > 
> > > There shouldn't be any problem; that tree is an identical copy of my
> > > local tree which uses no alternatives.  It always contains an entire
> > > set of Linus' tree with no additional repacking.
> > 
> > Now I'm getting this when I try to fetch your tree,
> > 
> > error: RETR response: 550 (curl_result = 78, http_code = 550, sha1 = 2725898fc9bb2121ac0fb1b5e4faf4fc09014729)
> > error: RETR response: 550 (curl_result = 78, http_code = 550, sha1 = b72c40949b0f04728f2993a1434598d3bad094ea)
> > error: RETR response: 550 (curl_result = 78, http_code = 550, sha1 = 2eaa9cfdf33b8d7fb7aff27792192e0019ae8fc6)
> > error: RETR response: 550 (curl_result = 78, http_code = 550, sha1 = e4d50423d773fb8d5b714430ba5358e8a1b87c14)
> > error: RETR response: 550 (curl_result = 78, http_code = 550, sha1 = 162451fe66ce653aba0882a73c91b18006263397)
> > error: RETR response: 550 (curl_result = 78, http_code = 550, sha1 = 698a60b84f0ea4fe4a35aaeeb554e2e364adbb3c)
> > error: RETR response: 550 (curl_result = 78, http_code = 550, sha1 = 31bd585167b1da44dbb0242c1e1c3bef8126f7a2)
> > error: RETR response: 550 (curl_result = 78, http_code = 550, sha1 = 6d7959089feef578b898c72ca7d5397114262a6d)
> > error: FTP response timeout (curl_result = 28, http_code = 150, sha1 = 0f59db814fb8d112ea3ded5ca240aaf7e9b165dd)
> > error: Unable to find 9dc95cddf0db231f714b583d41872f5682c7fa10 under ftp://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm.git
> > Cannot obtain needed tree 9dc95cddf0db231f714b583d41872f5682c7fa10
> > while processing commit 7998a8787a8b35fede689c2bb716f65b231e7492.
> > error: Fetch failed.
> > 
> > Ultimately the fetch fails .. I did this on multiple git trees with the
> > same result ..
> 
> Seems to be a git bug.
> 
> 1. GIT_DIR=..../linux-2.6-arm.git git cat-file -p 2725898fc9bb2121ac0fb1b5e4faf4fc09014729
>    works, so the tree _does_ have this object.
> 2. objects/27/25898fc9bb2121ac0fb1b5e4faf4fc09014729 doesn't exist, so it
>    must be in a pack file.
> 3. objects/info/packs lists all the pack files.
> 
> So the question is why isn't your pull fetching from the pack files.
> Lastly:
> 
> 4. b72c40949b0f04728f2993a1434598d3bad094ea (and some of the others) are
>    Linus' commits.
> 5. 2eaa9cfdf33b8d7fb7aff27792192e0019ae8fc6 is the -rc3 tag.
> 
> So either your tree is not up to date wrt Linus' tree, or git is trying
> to fetch objects it already has (which would also be a git bug.)

It's not up to date w.r.t to Linus tree, or at least the attempt I
logged above wasn't.

> I notice that you're using the ftp URL - have you tried using the http
> URL instead?  Maybe git doesn't support ftp URLs?

I tried the http url initialy on an older git version, but it wouldn't
download with http or ftp on that git version. So I just stuck with ftp.
I can give it another try with http .

The other issue is that after the above failure git ends up telling me
repeatedly that the tree is corrupted.

Does you server list anything wrong happening, cause those 550 errors
seem pretty suspect. It could also be some sort of firewall thing on my
end. I'm assuming no one else has reported anything like this before
right?

Daniel

[GIT PULL] generic arm for MSM

[Russell King - ARM Linux]

On Tue, Apr 06, 2010 at 03:00:25PM -0700, Daniel Walker wrote:
> On Tue, 2010-04-06 at 22:35 +0100, Russell King - ARM Linux wrote:
> > On Thu, Apr 01, 2010 at 04:11:31PM -0700, Daniel Walker wrote:
> > > On Fri, 2010-03-26 at 08:23 +0000, Russell King - ARM Linux wrote:
> > > > On Fri, Mar 26, 2010 at 09:14:45AM +0100, Uwe Kleine-K?nig wrote:
> > > > > Hello,
> > > > > 
> > > > > > I tried to add both,
> > > > > > 
> > > > > > ftp://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm.git
> > > > > > http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm.git/
> > > > > > 
> > > > > > and I got strange download failures ..
> > > > > It's recommended to have an actual copy of Linus' tree to fetch Russells
> > > > > into.  Then it works fine most of the time.
> > > > 
> > > > There shouldn't be any problem; that tree is an identical copy of my
> > > > local tree which uses no alternatives.  It always contains an entire
> > > > set of Linus' tree with no additional repacking.
> > > 
> > > Now I'm getting this when I try to fetch your tree,
> > > 
> > > error: RETR response: 550 (curl_result = 78, http_code = 550, sha1 = 2725898fc9bb2121ac0fb1b5e4faf4fc09014729)
> > > error: RETR response: 550 (curl_result = 78, http_code = 550, sha1 = b72c40949b0f04728f2993a1434598d3bad094ea)
> > > error: RETR response: 550 (curl_result = 78, http_code = 550, sha1 = 2eaa9cfdf33b8d7fb7aff27792192e0019ae8fc6)
> > > error: RETR response: 550 (curl_result = 78, http_code = 550, sha1 = e4d50423d773fb8d5b714430ba5358e8a1b87c14)
> > > error: RETR response: 550 (curl_result = 78, http_code = 550, sha1 = 162451fe66ce653aba0882a73c91b18006263397)
> > > error: RETR response: 550 (curl_result = 78, http_code = 550, sha1 = 698a60b84f0ea4fe4a35aaeeb554e2e364adbb3c)
> > > error: RETR response: 550 (curl_result = 78, http_code = 550, sha1 = 31bd585167b1da44dbb0242c1e1c3bef8126f7a2)
> > > error: RETR response: 550 (curl_result = 78, http_code = 550, sha1 = 6d7959089feef578b898c72ca7d5397114262a6d)
> > > error: FTP response timeout (curl_result = 28, http_code = 150, sha1 = 0f59db814fb8d112ea3ded5ca240aaf7e9b165dd)
> > > error: Unable to find 9dc95cddf0db231f714b583d41872f5682c7fa10 under ftp://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm.git
> > > Cannot obtain needed tree 9dc95cddf0db231f714b583d41872f5682c7fa10
> > > while processing commit 7998a8787a8b35fede689c2bb716f65b231e7492.
> > > error: Fetch failed.
> > > 
> > > Ultimately the fetch fails .. I did this on multiple git trees with the
> > > same result ..
> > 
> > Seems to be a git bug.
> > 
> > 1. GIT_DIR=..../linux-2.6-arm.git git cat-file -p 2725898fc9bb2121ac0fb1b5e4faf4fc09014729
> >    works, so the tree _does_ have this object.
> > 2. objects/27/25898fc9bb2121ac0fb1b5e4faf4fc09014729 doesn't exist, so it
> >    must be in a pack file.
> > 3. objects/info/packs lists all the pack files.
> > 
> > So the question is why isn't your pull fetching from the pack files.
> > Lastly:
> > 
> > 4. b72c40949b0f04728f2993a1434598d3bad094ea (and some of the others) are
> >    Linus' commits.
> > 5. 2eaa9cfdf33b8d7fb7aff27792192e0019ae8fc6 is the -rc3 tag.
> > 
> > So either your tree is not up to date wrt Linus' tree, or git is trying
> > to fetch objects it already has (which would also be a git bug.)
> 
> It's not up to date w.r.t to Linus tree, or at least the attempt I
> logged above wasn't.

Correct - _my_ tree is behind Linus' tree.  Therefore, if you have Linus'
latest tree, you *already* have all of Linus' commits in *your* tree and
git should not be fetching any of Linus' commits from me.

> > I notice that you're using the ftp URL - have you tried using the http
> > URL instead?  Maybe git doesn't support ftp URLs?
> 
> I tried the http url initialy on an older git version, but it wouldn't
> download with http or ftp on that git version. So I just stuck with ftp.
> I can give it another try with http .
> 
> The other issue is that after the above failure git ends up telling me
> repeatedly that the tree is corrupted.
> 
> Does you server list anything wrong happening, cause those 550 errors
> seem pretty suspect. It could also be some sort of firewall thing on my
> end. I'm assuming no one else has reported anything like this before
> right?

The 550 errors are because the unpacked objects don't exist; they're
already inside one of Linus' pack files which you should already have.

That's the point - you should already have these git IDs (the ones you
explicitly refer to) so there should be no reason for git to even
consider fetching them via http or ftp.

[GIT PULL] generic arm for MSM

[Daniel Walker]

On Tue, 2010-04-06 at 23:04 +0100, Russell King - ARM Linux wrote:
>  
> > Does you server list anything wrong happening, cause those 550 errors
> > seem pretty suspect. It could also be some sort of firewall thing on my
> > end. I'm assuming no one else has reported anything like this before
> > right?
> 
> The 550 errors are because the unpacked objects don't exist; they're
> already inside one of Linus' pack files which you should already have.
> 
> That's the point - you should already have these git IDs (the ones you
> explicitly refer to) so there should be no reason for git to even
> consider fetching them via http or ftp.

So your saying that the git defect .. I'm using a fairly recent version
of git 1.7.0 .. There are slightly more recent ones which I can try
also.

Daniel

[GIT PULL] generic arm for MSM

[H Hartley Sweeten]

On Tuesday, April 06, 2010 3:09 PM, Daniel Walker wrote:
> On Tue, 2010-04-06 at 23:04 +0100, Russell King - ARM Linux wrote:
>>  
>>> Does you server list anything wrong happening, cause those 550 errors
>>> seem pretty suspect. It could also be some sort of firewall thing on my
>>> end. I'm assuming no one else has reported anything like this before
>>> right?
>> 
>> The 550 errors are because the unpacked objects don't exist; they're
>> already inside one of Linus' pack files which you should already have.
>> 
>> That's the point - you should already have these git IDs (the ones you
>> explicitly refer to) so there should be no reason for git to even
>> consider fetching them via http or ftp.
>
> So your saying that the git defect .. I'm using a fairly recent version
> of git 1.7.0 .. There are slightly more recent ones which I can try
> also.

Daniel,

I just updated my copy of Russell's tree with no issues:

 $ git remote update
Fetching origin
Fetching linux-arm

[GIT PULL] generic arm for MSM

[Daniel Walker]

On Tue, 2010-04-06 at 17:34 -0500, H Hartley Sweeten wrote:
> On Tuesday, April 06, 2010 3:09 PM, Daniel Walker wrote:
> > On Tue, 2010-04-06 at 23:04 +0100, Russell King - ARM Linux wrote:
> >>  
> >>> Does you server list anything wrong happening, cause those 550 errors
> >>> seem pretty suspect. It could also be some sort of firewall thing on my
> >>> end. I'm assuming no one else has reported anything like this before
> >>> right?
> >> 
> >> The 550 errors are because the unpacked objects don't exist; they're
> >> already inside one of Linus' pack files which you should already have.
> >> 
> >> That's the point - you should already have these git IDs (the ones you
> >> explicitly refer to) so there should be no reason for git to even
> >> consider fetching them via http or ftp.
> >
> > So your saying that the git defect .. I'm using a fairly recent version
> > of git 1.7.0 .. There are slightly more recent ones which I can try
> > also.
> 
> Daniel,
> 
> I just updated my copy of Russell's tree with no issues:
> 
>  $ git remote update
> Fetching origin
> Fetching linux-arm
> From http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm
>    988addf..b72c409  devel-stable -> linux-arm/devel-stable
>  * [new branch]      lmb        -> linux-arm/lmb
>    bb45692..c6c3523  master     -> linux-arm/master
>    ae6be51..2eaa9cf  origin     -> linux-arm/origin
> 
> Are you trying to 'git pull' his tree?

No, it's remote so I do either "git fetch rmk" , or "git remote update
rmk"

> I tried that initially and it worked fine for the initial pull.  After that I
> always ran into issues with trying to update it.
> 
> I don't quite remember how I did the initial pull when I started a new branch
> to follow Russell's tree but I think I did it like the FAQ says on how to
> follow the -next tree.
> 
> Oh, this is using git version 1.7.0.3.254.g4503b

Did you ever try this on 1.7.0 ?

Daniel

[GIT PULL] generic arm for MSM

[Daniel Walker]

On Fri, 2010-03-26 at 09:14 +0100, Uwe Kleine-K?nig wrote:
> Hello,
> 
> > I tried to add both,
> > 
> > ftp://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm.git
> > http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm.git/
> > 
> > and I got strange download failures ..
> It's recommended to have an actual copy of Linus' tree to fetch Russells
> into.  Then it works fine most of the time.

When I wrote the above I was setting these up as remotes, not
downloading full trees.

Daniel

[GIT PULL] generic arm for MSM

[Mark Brown]

On Thu, Mar 25, 2010 at 03:49:24PM -0700, Daniel Walker wrote:

> I only based this pull request on next , since I can't get Russell tree
> anyplace else. I've had patches in the past which I've had to use next
> cause there are underlying changes that I can only find in next .. So no
> I don't base development trees on next generally.

You can see what's pulled into -next by looking at the file Trees in the
root of the -next tree, and the specific commits in a given -next can be
seen by looking at the file SHA1s in the same directory.

As people have said you should *never* send any pull requests based on
-next, it's a constantly rebasing merge of various development trees of
varying quality and so will never be merged into mainline.  If you are
sending stuff based on -next for some reason send it as a patches.