Linux 2.6.20.6

Linux 2.6.20.6

[Chris Wright]

We (the -stable team) are announcing the release of the 2.6.20.6 kernel.
This has 2 important fixes that should have been in 2.6.20.5.  They are
issues that were pointed with 2.6.20.5 patches during its review cycle,
but the patch updates were mistakenly dropped.  Please accept our
apologies for the mistake.

The diffstat and short summary of the fixes are below.

I'll also be replying to this message with a copy of the patch between
2.6.20.5 and 2.6.20.6.

The updated 2.6.20.y git tree can be found at:
        git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.20.y.git
and can be browsed at the normal kernel.org git web browser:
        www.kernel.org/git/

thanks,
-chris
--------

 Makefile                    |    2 +-
 crypto/scatterwalk.c        |    2 +-
 include/asm-um/common.lds.S |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

Summary of changes from v2.6.20.5 to v2.6.20.6
==============================================

Chris Wright (1):
      Linux 2.6.20.6

Herbert Xu (1):
      CRYPTO api: Use the right value when advancing scatterwalk_copychunks

Paolo 'Blaisorblade' Giarrusso (1):
      uml: fix static linking for real

Re: Linux 2.6.20.6

[Chris Wright]

diff --git a/Makefile b/Makefile
index 3f194d1..e81e106 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 20
-EXTRAVERSION = .5
+EXTRAVERSION = .6
 NAME = Homicidal Dwarf Hamster
 
 # *DOCUMENTATION*
diff --git a/crypto/scatterwalk.c b/crypto/scatterwalk.c
index a664231..0f76175 100644
--- a/crypto/scatterwalk.c
+++ b/crypto/scatterwalk.c
@@ -91,7 +91,7 @@ void scatterwalk_copychunks(void *buf, struct scatter_walk *walk,
 		memcpy_dir(buf, vaddr, len_this_page, out);
 		scatterwalk_unmap(vaddr, out);
 
-		scatterwalk_advance(walk, nbytes);
+		scatterwalk_advance(walk, len_this_page);
 
 		if (nbytes == len_this_page)
 			break;
diff --git a/include/asm-um/common.lds.S b/include/asm-um/common.lds.S
index b16222b..f5de80c 100644
--- a/include/asm-um/common.lds.S
+++ b/include/asm-um/common.lds.S
@@ -15,7 +15,7 @@
   PROVIDE (_unprotected_end = .);
 
   . = ALIGN(4096);
-  .note : { *(note.*) }
+  .note : { *(.note.*) }
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;

Re: Linux 2.6.20.6

[Chuck Ebbert]

Chris Wright wrote:
> We (the -stable team) are announcing the release of the 2.6.20.6 kernel.
> This has 2 important fixes that should have been in 2.6.20.5.  They are
> issues that were pointed with 2.6.20.5 patches during its review cycle,
> but the patch updates were mistakenly dropped.  Please accept our
> apologies for the mistake.
> 
> The diffstat and short summary of the fixes are below.
> 
> I'll also be replying to this message with a copy of the patch between
> 2.6.20.5 and 2.6.20.6.
> 
> The updated 2.6.20.y git tree can be found at:
>         git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.20.y.git
> and can be browsed at the normal kernel.org git web browser:
>         www.kernel.org/git/
> 

That tree is not up-to-date. So much for using it to track -stable --
what should I use instead?

Re: Linux 2.6.20.6

[Chuck Ebbert]

Chuck Ebbert wrote:
> Chris Wright wrote:
>> We (the -stable team) are announcing the release of the 2.6.20.6 kernel.
>> This has 2 important fixes that should have been in 2.6.20.5.  They are
>> issues that were pointed with 2.6.20.5 patches during its review cycle,
>> but the patch updates were mistakenly dropped.  Please accept our
>> apologies for the mistake.
>>
>> The diffstat and short summary of the fixes are below.
>>
>> I'll also be replying to this message with a copy of the patch between
>> 2.6.20.5 and 2.6.20.6.
>>
>> The updated 2.6.20.y git tree can be found at:
>>         git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.20.y.git
>> and can be browsed at the normal kernel.org git web browser:
>>         www.kernel.org/git/
>>
> 
> That tree is not up-to-date. So much for using it to track -stable --
> what should I use instead?

It is the stable-queue tree that's not up-to-date:

http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git;a=summary

Apparently updates stopped three days ago...

Re: [stable] Linux 2.6.20.6

[Chris Wright]

* Chuck Ebbert (cebbert@redhat.com) wrote:
> That tree is not up-to-date. So much for using it to track -stable --
> what should I use instead?

It's updated, perhaps you hit a stale mirror?

Re: Linux 2.6.20.6

[Chris Wright]

* Chuck Ebbert (cebbert@redhat.com) wrote:
> It is the stable-queue tree that's not up-to-date:

Ah, yes that is updated (but only within the last half-hour or so).