Merged at pnfs-all-2.6.35-rc3-2010-06-14 Thanks! Benny On Jun. 08, 2010, 4:47 -0400, Boaz Harrosh <bharrosh@xxxxxxxxxxx> wrote: > > The official way of adding a tree identifier tag to the Kernel > version-string is a presence of a localversion-* file next to > the Makefile. It's content is appended to the Linus supplied > version-string from Makefile. > > After this patch the output is the same as before xxx-2.6.35-rc2-pnfs > But is a more comfortable way to manage it. > > (The appended "+" in post 2.6.35-rc Kernels is not resolved with > this. But I have sent a patch to Linus to fix this issue) > > Signed-off-by: Boaz Harrosh <bharrosh@xxxxxxxxxxx> > --- > Makefile | 2 +- > localversion-pnfs | 1 + > 2 files changed, 2 insertions(+), 1 deletions(-) > create mode 100644 localversion-pnfs > > diff --git a/Makefile b/Makefile > index 6ac434c..654c31a 100644 > --- a/Makefile > +++ b/Makefile > @@ -1,7 +1,7 @@ > VERSION = 2 > PATCHLEVEL = 6 > SUBLEVEL = 35 > -EXTRAVERSION = -rc2-pnfs > +EXTRAVERSION = -rc2 > NAME = Sheep on Meth > > # *DOCUMENTATION* > diff --git a/localversion-pnfs b/localversion-pnfs > new file mode 100644 > index 0000000..7523328 > --- /dev/null > +++ b/localversion-pnfs > @@ -0,0 +1 @@ > +-pnfs -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
