public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* Linux 2.6.9-ac1
@ 2004-10-21 11:08 Alan Cox
  2004-10-21 12:49 ` [patch] 2.6.9-ac1: invalid SUBLEVEL Adrian Bunk
  0 siblings, 1 reply; 5+ messages in thread
From: Alan Cox @ 2004-10-21 11:08 UTC (permalink / raw)
  To: Linux Kernel Mailing List

For those who need the various patches and bits I've been doing. Also if
people have small, clearly correct fixes to real problems in 2.6.9 that
ought to go into a production 2.6.9 series kernel please mail me a copy
and I'll merge those so we don't get the 2.6.8.1 audio ripping mess
again. 

ftp://ftp.kernel.org/pub/linux/kernel/people/alan/linux-2.6/2.6.9/

2.6.9-ac1

Security Fixes
o	Set VM_IO on areas that are temporarily		(Alan Cox)
	marked PageReserved (Serious bug)
o	Lock ide-proc against driver unload		(Alan Cox)
	(very low severity)

Bug Fixes
o	Working IDE locking				(Alan Cox)
	| And a great deal of review by Bartlomiej
o	Handle E7xxx boxes with USB legacy flaws	(Alan Cox)
	
Functionality
o	Allow booting with "irqpoll" or "irqfixup"	(Alan Cox)
	on systems with broken IRQ tables.
o	Support for setuid core dumping in some		(Alan Cox)
	environments (off by default)
o	Support for drives that don't report geometry
o	IT8212 support (raid and passthrough)		(Alan Cox)
o	Allow IDE to grab all unknown generic IDE	(Alan Cox)
	devices (boot with "all-generic-ide")
o	Restore PWC driver				(Luc Saillard)

Other
o	Small pending tty clean-up to moxa		(Alan Cox)
o	Put VIA Velocity (tm) adapters under gigabit	(VIA)


^ permalink raw reply	[flat|nested] 5+ messages in thread

* [patch] 2.6.9-ac1: invalid SUBLEVEL
  2004-10-21 11:08 Linux 2.6.9-ac1 Alan Cox
@ 2004-10-21 12:49 ` Adrian Bunk
  2004-10-21 13:31   ` Alan Cox
  0 siblings, 1 reply; 5+ messages in thread
From: Adrian Bunk @ 2004-10-21 12:49 UTC (permalink / raw)
  To: Alan Cox; +Cc: Linux Kernel Mailing List

<--  snip  -->

$ make
  CHK     include/linux/version.h
expr: non-numeric argument
make[1]: `arch/i386/kernel/asm-offsets.s' is up to date.
  CHK     include/linux/compile.h
  CC      kernel/power/swsusp.o
kernel/power/swsusp.c: In function `init_header':
kernel/power/swsusp.c:327: parse error before `;'
kernel/power/swsusp.c: In function `sanity_check':
kernel/power/swsusp.c:1074: parse error before `)'
make[2]: *** [kernel/power/swsusp.o] Error 1
make[1]: *** [kernel/power] Error 2
make: *** [kernel] Error 2
$ cat 
include/linux/version.h 
#define UTS_RELEASE "2.6.9-ac1"
#define LINUX_VERSION_CODE
#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
$ 

<--  snip  -->


Proposed fix:


Signed-off-by: Adrian Bunk <bunk@stusta.de>

--- linux-2.6.9-ac1-full/Makefile.old	2004-10-21 14:48:07.000000000 +0200
+++ linux-2.6.9-ac1-full/Makefile	2004-10-21 14:48:30.000000000 +0200
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 6
-SUBLEVEL = 9-ac1
-EXTRAVERSION =
+SUBLEVEL = 9
+EXTRAVERSION = -ac1
 NAME=AC 1
 
 # *DOCUMENTATION*


^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [patch] 2.6.9-ac1: invalid SUBLEVEL
  2004-10-21 12:49 ` [patch] 2.6.9-ac1: invalid SUBLEVEL Adrian Bunk
@ 2004-10-21 13:31   ` Alan Cox
  2004-10-21 15:10     ` Han Boetes
  2004-10-21 15:29     ` Dave Jones
  0 siblings, 2 replies; 5+ messages in thread
From: Alan Cox @ 2004-10-21 13:31 UTC (permalink / raw)
  To: Adrian Bunk; +Cc: Linux Kernel Mailing List

On Iau, 2004-10-21 at 13:49, Adrian Bunk wrote:
>  VERSION = 2
>  PATCHLEVEL = 6
> -SUBLEVEL = 9-ac1
> -EXTRAVERSION =
> +SUBLEVEL = 9
> +EXTRAVERSION = -ac1
>  NAME=AC 1

Doh I'm -amazed- that worked for me. Fixed in my tree, I'll go and hide
in a corner for a bit.


^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [patch] 2.6.9-ac1: invalid SUBLEVEL
  2004-10-21 13:31   ` Alan Cox
@ 2004-10-21 15:10     ` Han Boetes
  2004-10-21 15:29     ` Dave Jones
  1 sibling, 0 replies; 5+ messages in thread
From: Han Boetes @ 2004-10-21 15:10 UTC (permalink / raw)
  To: Linux Kernel Mailing List

Alan Cox wrote:
> On Iau, 2004-10-21 at 13:49, Adrian Bunk wrote:
> >  VERSION = 2
> >  PATCHLEVEL = 6
> > -SUBLEVEL = 9-ac1
> > -EXTRAVERSION =
> > +SUBLEVEL = 9
> > +EXTRAVERSION = -ac1
> >  NAME=AC 1
>
> Doh I'm -amazed- that worked for me. Fixed in my tree

Here is some old shell-code I wrote for my kernel updating script: It
was especially written because you tend to forget this.

test_version () {
    # Sometimes Alan forgets to update the EXTRAVERSION in the Makefile;
    # then you destroy the previous version and the script fails :S
    cd $pwd/linux-$latest_stable
    # if EXTRAVERSION is for mm but not the current one.
    if [ -z "$(grep "EXTRAVERSION = -$mm_rest" Makefile)" \
        -a -z "$(grep "EXTRAVERSION = .*mm" Makefile)" ]; then
        warning 'Warning: I had to edit the versionnumber in the Makefile!'
        grep "EXTRAVERSION =" Makefile
        perl -pi -e "s#^EXTRAVERSION.*\n#EXTRAVERSION = -$mm_rest\n#" \
            Makefile || error
        grep "EXTRAVERSION =" Makefile
    fi
}

> I'll go and hide in a corner for a bit.

I think it is a better idea you add some checks to the script you use to
generate that patch.



# Han

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [patch] 2.6.9-ac1: invalid SUBLEVEL
  2004-10-21 13:31   ` Alan Cox
  2004-10-21 15:10     ` Han Boetes
@ 2004-10-21 15:29     ` Dave Jones
  1 sibling, 0 replies; 5+ messages in thread
From: Dave Jones @ 2004-10-21 15:29 UTC (permalink / raw)
  To: Alan Cox; +Cc: Adrian Bunk, Linux Kernel Mailing List

On Thu, Oct 21, 2004 at 02:31:47PM +0100, Alan Cox wrote:
 > On Iau, 2004-10-21 at 13:49, Adrian Bunk wrote:
 > >  VERSION = 2
 > >  PATCHLEVEL = 6
 > > -SUBLEVEL = 9-ac1
 > > -EXTRAVERSION =
 > > +SUBLEVEL = 9
 > > +EXTRAVERSION = -ac1
 > >  NAME=AC 1
 > 
 > Doh I'm -amazed- that worked for me. Fixed in my tree, I'll go and hide
 > in a corner for a bit.
 
I think we can forgive you Alan, clearly you're out of practise 8-)

		Dave


^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2004-10-21 15:45 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2004-10-21 11:08 Linux 2.6.9-ac1 Alan Cox
2004-10-21 12:49 ` [patch] 2.6.9-ac1: invalid SUBLEVEL Adrian Bunk
2004-10-21 13:31   ` Alan Cox
2004-10-21 15:10     ` Han Boetes
2004-10-21 15:29     ` Dave Jones

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox