* Updated Next/Trees, problems with nfs-git
@ 2008-08-04 13:44 Nico -telmich- Schottelius
2008-08-04 15:09 ` Nico -telmich- Schottelius
0 siblings, 1 reply; 4+ messages in thread
From: Nico -telmich- Schottelius @ 2008-08-04 13:44 UTC (permalink / raw)
To: linux-next; +Cc: linux-nfs
[-- Attachment #1.1: Type: text/plain, Size: 849 bytes --]
Hello!
I just tried to fetch all trees listed in Next/Trees.
Therefore I updated Trees to have arm via http instead of master ssh
(so non-kernel-devs can fetch it) and updated a typo for lsm and agp.
The scripts I use can be found in my ~/bin-git:
http://unix.schottelius.org/cgi-bin/gitweb.cgi?p=nsbin;a=commit;h=41abb532b828c1c704d10566918c2d42637d161d
The patch for Trees in attached (Signed-off-by: Nico Schottelius <nico@denkbrett•schottelius.org>).
The nfs-tree failed:
[15:37] denkbrett:linux-nico% sh ~/bin/linux/merge-branches.sh
fatal: Couldn't find remote ref refs/heads/linux-next
Problem with nfs (see above)
Sincerly,
Nico
--
Think about Free and Open Source Software (FOSS).
http://nico.schottelius.org/documentations/foss/the-term-foss/
PGP: BFE4 C736 ABE5 406F 8F42 F7CF B8BE F92A 9885 188C
[-- Attachment #1.2: Trees.diff --]
[-- Type: text/x-diff, Size: 2524 bytes --]
--- Trees.orig 2008-08-04 15:16:12.152650055 +0200
+++ Trees 2008-08-04 15:39:45.543588078 +0200
@@ -8,7 +8,7 @@
net-current git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git#master
sparc-current git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6.git#master
sound-current git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git#for-linus
-arm-current git ssh://master.kernel.org/home/rmk/linux-2.6-arm.git#master
+arm-current git http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm.git/#master
pci-current git git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6#for-linus
wireless-current git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git#master
kbuild-current git git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes.git#master
@@ -70,7 +70,7 @@
crypto git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6#master
vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6.git#for-next
sound git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git#for-next
-arm git ssh://master.kernel.org/home/rmk/linux-2.6-arm.git#devel
+arm git http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm.git/#devel
cpufreq git git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq.git#next
v9fs git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git#for-next
rr quilt http://ozlabs.org/~rusty/kernel/rr-latest/
@@ -83,7 +83,7 @@
bkl-removal git git://git.lwn.net/linux-2.6.git#bkl-removal
trivial git git://git.kernel.org/pub/scm/linux/kernel/git/juhl/trivial-2.6.git#next
ubifs git git://git.infradead.org/~dedekind/ubifs-2.6.git#linux-next
-lsm git git://gitkernel.org/pub/scm/linux/kernel/git/chrisw/lsm-2.6.git#for-next
+lsm git git://git.kernel.org/pub/scm/linux/kernel/git/chrisw/lsm-2.6.git#for-next
block git git://git.kernel.dk/linux-2.6-block.git#for-next
embedded git git://git.infradead.org/embedded-2.6.git#master
firmware git git://git.infradead.org/users/dwmw2/firmware-2.6.git#master
@@ -107,4 +107,4 @@
security-testing git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6.git#next
lblnet git git://git.infradead.org/users/pcmoore/lblnet-2.6_next#master
ttydev quilt http://www.linux.org.uk/~alan/ttydev/
-agp git git://git.kernel.org//pub/scm/linux/kernel/git/airlied/agp-2.6.git#agp-next
+agp git git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6.git#agp-next
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: Updated Next/Trees, problems with nfs-git
2008-08-04 13:44 Updated Next/Trees, problems with nfs-git Nico -telmich- Schottelius
@ 2008-08-04 15:09 ` Nico -telmich- Schottelius
2008-08-04 17:35 ` J. Bruce Fields
0 siblings, 1 reply; 4+ messages in thread
From: Nico -telmich- Schottelius @ 2008-08-04 15:09 UTC (permalink / raw)
To: linux-next; +Cc: linux-nfs
[-- Attachment #1.1: Type: text/plain, Size: 124 bytes --]
Hello again!
Found out that #linux-next should have been #nfsd-next and updated
the patch to match.
Patch attached.
Nico
[-- Attachment #1.2: Trees.diff --]
[-- Type: text/x-diff, Size: 3664 bytes --]
Update Next/Trees
Signed-off-by: Nico Schottelius <nico@denkbrett•schottelius.org>
diff --git a/Next/Trees b/Next/Trees
index bae9377..94a3962 100644
--- a/Next/Trees
+++ b/Next/Trees
@@ -8,7 +8,7 @@ scsi-rc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fix
net-current git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git#master
sparc-current git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6.git#master
sound-current git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git#for-linus
-arm-current git ssh://master.kernel.org/home/rmk/linux-2.6-arm.git#master
+arm-current git http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm.git/#master
pci-current git git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6#for-linus
wireless-current git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git#master
kbuild-current git git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes.git#master
@@ -41,7 +41,7 @@ jfs git git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git#next
kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-next.git#master
ide quilt http://kernel.org/pub/linux/kernel/people/bart/pata-2.6/patches/
libata git git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev.git#NEXT
-nfs git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next
+nfs git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#nfsd-next
xfs git git://oss.sgi.com:8090/xfs/xfs-2.6.git#master
infiniband git git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband.git#for-next
acpi git git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-acpi-2.6.git#test
@@ -70,7 +70,7 @@ wireless git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-nex
crypto git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6#master
vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6.git#for-next
sound git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git#for-next
-arm git ssh://master.kernel.org/home/rmk/linux-2.6-arm.git#devel
+arm git http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm.git/#devel
cpufreq git git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq.git#next
v9fs git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git#for-next
rr quilt http://ozlabs.org/~rusty/kernel/rr-latest/
@@ -83,7 +83,7 @@ semaphore-removal git git://git.kernel.org/pub/scm/linux/kernel/git/willy/misc.g
bkl-removal git git://git.lwn.net/linux-2.6.git#bkl-removal
trivial git git://git.kernel.org/pub/scm/linux/kernel/git/juhl/trivial-2.6.git#next
ubifs git git://git.infradead.org/~dedekind/ubifs-2.6.git#linux-next
-lsm git git://gitkernel.org/pub/scm/linux/kernel/git/chrisw/lsm-2.6.git#for-next
+lsm git git://git.kernel.org/pub/scm/linux/kernel/git/chrisw/lsm-2.6.git#for-next
block git git://git.kernel.dk/linux-2.6-block.git#for-next
embedded git git://git.infradead.org/embedded-2.6.git#master
firmware git git://git.infradead.org/users/dwmw2/firmware-2.6.git#master
@@ -107,4 +107,4 @@ voltage git git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6.git#r
security-testing git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6.git#next
lblnet git git://git.infradead.org/users/pcmoore/lblnet-2.6_next#master
ttydev quilt http://www.linux.org.uk/~alan/ttydev/
-agp git git://git.kernel.org//pub/scm/linux/kernel/git/airlied/agp-2.6.git#agp-next
+agp git git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6.git#agp-next
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: Updated Next/Trees, problems with nfs-git
2008-08-04 15:09 ` Nico -telmich- Schottelius
@ 2008-08-04 17:35 ` J. Bruce Fields
[not found] ` <20080804173556.GA25940-uC3wQj2KruNg9hUCZPvPmw@public.gmane.org>
0 siblings, 1 reply; 4+ messages in thread
From: J. Bruce Fields @ 2008-08-04 17:35 UTC (permalink / raw)
To: Nico -telmich- Schottelius; +Cc: linux-next, linux-nfs
On Mon, Aug 04, 2008 at 05:09:40PM +0200, Nico -telmich- Schottelius wrote:
> Hello again!
>
> Found out that #linux-next should have been #nfsd-next and updated
> the patch to match.
>
> Patch attached.
I'm lost:
> -nfs git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next
> +nfs git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#nfsd-next
There is no branch named "nfsd-next" in that git repository. (Do I
misunderstand how this file is supposed to work?) The only nfsd-next I
know of is the one I push to at:
git://linux-nfs.org/~bfields/linux.git nfsd-next
--b.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: Updated Next/Trees, problems with nfs-git
[not found] ` <20080804173556.GA25940-uC3wQj2KruNg9hUCZPvPmw@public.gmane.org>
@ 2008-08-04 22:30 ` Nico -telmich- Schottelius
0 siblings, 0 replies; 4+ messages in thread
From: Nico -telmich- Schottelius @ 2008-08-04 22:30 UTC (permalink / raw)
To: J. Bruce Fields
Cc: linux-next-u79uwXL29TY76Z2rM5mHXA,
linux-nfs-u79uwXL29TY76Z2rM5mHXA
[-- Attachment #1: Type: text/plain, Size: 1032 bytes --]
Hello Bruce!
J. Bruce Fields [Mon, Aug 04, 2008 at 01:35:56PM -0400]:
> On Mon, Aug 04, 2008 at 05:09:40PM +0200, Nico -telmich- Schottelius wrote:
> > Hello again!
> >
> > Found out that #linux-next should have been #nfsd-next and updated
> > the patch to match.
> >
> > Patch attached.
>
> I'm lost:
>
> > -nfs git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next
> > +nfs git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#nfsd-next
>
> There is no branch named "nfsd-next" in that git repository. (Do I
> misunderstand how this file is supposed to work?) The only nfsd-next I
> know of is the one I push to at:
>
> git://linux-nfs.org/~bfields/linux.git nfsd-next
Sorry, I was somehow confused by the error reported in my original mail,
searched for something that matched my eyes and took the wrong git-tree
at http://git.linux-nfs.org/.
So it must in fact be
git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next
Sorry for the inconvenience!
Nico
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2008-08-04 22:30 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-08-04 13:44 Updated Next/Trees, problems with nfs-git Nico -telmich- Schottelius
2008-08-04 15:09 ` Nico -telmich- Schottelius
2008-08-04 17:35 ` J. Bruce Fields
[not found] ` <20080804173556.GA25940-uC3wQj2KruNg9hUCZPvPmw@public.gmane.org>
2008-08-04 22:30 ` Nico -telmich- Schottelius
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox