Re: Linux 2.6.11.3

2005-03-13 Thread Greg KH 
On Sun, Mar 13, 2005 at 04:38:24PM +0100, Matthias Andree wrote:
> On Sat, 12 Mar 2005, Greg KH wrote:
> 
> > A bitkeeper tree for the 2.6.11.y releases can be found at:
> > bk://linux-release.bkbits.net/linux-2.6.11
> 
> Do we then start switching trees with every new minor release?

Yes.

thanks,

greg k-h
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: Linux 2.6.11.3

2005-03-13 Thread Matthias Andree 
On Sat, 12 Mar 2005, Greg KH wrote:

> A bitkeeper tree for the 2.6.11.y releases can be found at:
>   bk://linux-release.bkbits.net/linux-2.6.11

Do we then start switching trees with every new minor release?

-- 
Matthias Andree
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: Linux 2.6.11.3

2005-03-13 Thread Matthias Andree 
On Sat, 12 Mar 2005, Greg KH wrote:

 A bitkeeper tree for the 2.6.11.y releases can be found at:
   bk://linux-release.bkbits.net/linux-2.6.11

Do we then start switching trees with every new minor release?

-- 
Matthias Andree
-
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: Linux 2.6.11.3

2005-03-13 Thread Greg KH 
On Sun, Mar 13, 2005 at 04:38:24PM +0100, Matthias Andree wrote:
 On Sat, 12 Mar 2005, Greg KH wrote:
 
  A bitkeeper tree for the 2.6.11.y releases can be found at:
  bk://linux-release.bkbits.net/linux-2.6.11
 
 Do we then start switching trees with every new minor release?

Yes.

thanks,

greg k-h
-
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: Linux 2.6.11.3

2005-03-12 Thread Greg KH 
diff -Nru a/Makefile b/Makefile
--- a/Makefile  2005-03-12 22:45:06 -08:00
+++ b/Makefile  2005-03-12 22:45:06 -08:00
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 11
-EXTRAVERSION = .2
+EXTRAVERSION = .3
 NAME=Woozy Numbat
 
 # *DOCUMENTATION*
diff -Nru a/arch/ppc/oprofile/op_model_fsl_booke.c 
b/arch/ppc/oprofile/op_model_fsl_booke.c
--- a/arch/ppc/oprofile/op_model_fsl_booke.c2005-03-12 22:45:06 -08:00
+++ b/arch/ppc/oprofile/op_model_fsl_booke.c2005-03-12 22:45:06 -08:00
@@ -150,7 +150,6 @@
int is_kernel;
int val;
int i;
-   unsigned int cpu = smp_processor_id();
 
/* set the PMM bit (see comment below) */
mtmsr(mfmsr() | MSR_PMM);
@@ -162,7 +161,7 @@
val = ctr_read(i);
if (val < 0) {
if (oprofile_running && ctr[i].enabled) {
-   oprofile_add_sample(pc, is_kernel, i, cpu);
+   oprofile_add_pc(pc, is_kernel, i);
ctr_write(i, reset_value[i]);
} else {
ctr_write(i, 0);
diff -Nru a/arch/ppc/platforms/4xx/ebony.h b/arch/ppc/platforms/4xx/ebony.h
--- a/arch/ppc/platforms/4xx/ebony.h2005-03-12 22:45:06 -08:00
+++ b/arch/ppc/platforms/4xx/ebony.h2005-03-12 22:45:06 -08:00
@@ -61,8 +61,8 @@
  */
 
 /* OpenBIOS defined UART mappings, used before early_serial_setup */
-#define UART0_IO_BASE  (u8 *) 0xE200
-#define UART1_IO_BASE  (u8 *) 0xE300
+#define UART0_IO_BASE  0xE200
+#define UART1_IO_BASE  0xE300
 
 /* external Epson SG-615P */
 #define BASE_BAUD  691200
diff -Nru a/arch/ppc/platforms/4xx/luan.h b/arch/ppc/platforms/4xx/luan.h
--- a/arch/ppc/platforms/4xx/luan.h 2005-03-12 22:45:06 -08:00
+++ b/arch/ppc/platforms/4xx/luan.h 2005-03-12 22:45:06 -08:00
@@ -47,9 +47,9 @@
 #define RS_TABLE_SIZE  3
 
 /* PIBS defined UART mappings, used before early_serial_setup */
-#define UART0_IO_BASE  (u8 *) 0xa200
-#define UART1_IO_BASE  (u8 *) 0xa300
-#define UART2_IO_BASE  (u8 *) 0xa600
+#define UART0_IO_BASE  0xa200
+#define UART1_IO_BASE  0xa300
+#define UART2_IO_BASE  0xa600
 
 #define BASE_BAUD  11059200
 #define STD_UART_OP(num)   \
diff -Nru a/arch/ppc/platforms/4xx/ocotea.h b/arch/ppc/platforms/4xx/ocotea.h
--- a/arch/ppc/platforms/4xx/ocotea.h   2005-03-12 22:45:06 -08:00
+++ b/arch/ppc/platforms/4xx/ocotea.h   2005-03-12 22:45:06 -08:00
@@ -56,8 +56,8 @@
 #define RS_TABLE_SIZE  2
 
 /* OpenBIOS defined UART mappings, used before early_serial_setup */
-#define UART0_IO_BASE  (u8 *) 0xE200
-#define UART1_IO_BASE  (u8 *) 0xE300
+#define UART0_IO_BASE  0xE200
+#define UART1_IO_BASE  0xE300
 
 #define BASE_BAUD  11059200/16
 #define STD_UART_OP(num)   \
diff -Nru a/drivers/char/drm/drm_ioctl.c b/drivers/char/drm/drm_ioctl.c
--- a/drivers/char/drm/drm_ioctl.c  2005-03-12 22:45:06 -08:00
+++ b/drivers/char/drm/drm_ioctl.c  2005-03-12 22:45:06 -08:00
@@ -326,6 +326,8 @@
 
DRM_COPY_FROM_USER_IOCTL(sv, argp, sizeof(sv));
 
+   memset(, 0, sizeof(version));
+
dev->driver->version();
retv.drm_di_major = DRM_IF_MAJOR;
retv.drm_di_minor = DRM_IF_MINOR;
diff -Nru a/drivers/media/video/adv7170.c b/drivers/media/video/adv7170.c
--- a/drivers/media/video/adv7170.c 2005-03-12 22:45:06 -08:00
+++ b/drivers/media/video/adv7170.c 2005-03-12 22:45:06 -08:00
@@ -130,7 +130,7 @@
u8 block_data[32];
 
msg.addr = client->addr;
-   msg.flags = client->flags;
+   msg.flags = 0;
while (len >= 2) {
msg.buf = (char *) block_data;
msg.len = 0;
diff -Nru a/drivers/media/video/adv7175.c b/drivers/media/video/adv7175.c
--- a/drivers/media/video/adv7175.c 2005-03-12 22:45:06 -08:00
+++ b/drivers/media/video/adv7175.c 2005-03-12 22:45:06 -08:00
@@ -126,7 +126,7 @@
u8 block_data[32];
 
msg.addr = client->addr;
-   msg.flags = client->flags;
+   msg.flags = 0;
while (len >= 2) {
msg.buf = (char *) block_data;
msg.len = 0;
diff -Nru a/drivers/media/video/bt819.c b/drivers/media/video/bt819.c
--- a/drivers/media/video/bt819.c   2005-03-12 22:45:06 -08:00
+++ b/drivers/media/video/bt819.c   2005-03-12 22:45:06 -08:00
@@ -146,7 +146,7 @@
u8 block_data[32];
 
msg.addr = client->addr;
-   msg.flags = client->flags;
+   msg.flags = 0;
while (len >= 2) {
msg.buf = (char *) block_data;
msg.len = 0;
diff -Nru a/drivers/media/video/saa7110.c b/drivers/media/video/saa7110.c
--- a/drivers/media/video/saa7110.c 2005-03-12 22:45:06

Linux 2.6.11.3

2005-03-12 Thread Greg KH 
As there were no complaints about the patches posted a few days ago,
I've released 2.6.11.3 with them in it.

It's available now in the normal kernel.org places:
kernel.org/pub/linux/kernel/v2.6/patch-2.6.11.3.gz
which is a patch against the 2.6.11 release (note, this is different
than before, and should fix all of the previous complaints.)

I've also rediffed the 2.6.11.2 patch against the 2.6.11 release,
instead of the 2.6.11.1 release, and updated it.  There are incremental
patches between the 2.6.11.y releases at:
kernel.org/pub/linux/kernel/v2.6/incr

If anyone has any issues with the way the patches are diffed, please let
me know.

A detailed changelog can be found at:
kernel.org/pub/linux/kernel/v2.6/ChangeLog-2.6.11.3

A bitkeeper tree for the 2.6.11.y releases can be found at:
bk://linux-release.bkbits.net/linux-2.6.11

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.11.2 and 2.6.11.3, as it is small enough to do so.

thanks,
 
greg k-h

---

 Makefile   |2 +-
 arch/ppc/oprofile/op_model_fsl_booke.c |3 +--
 arch/ppc/platforms/4xx/ebony.h |4 ++--
 arch/ppc/platforms/4xx/luan.h  |6 +++---
 arch/ppc/platforms/4xx/ocotea.h|4 ++--
 drivers/char/drm/drm_ioctl.c   |2 ++
 drivers/media/video/adv7170.c  |2 +-
 drivers/media/video/adv7175.c  |2 +-
 drivers/media/video/bt819.c|2 +-
 drivers/media/video/saa7110.c  |   33 -
 drivers/media/video/saa7114.c  |2 +-
 drivers/media/video/saa7185.c  |2 +-
 drivers/net/r8169.c|   17 ++---
 drivers/net/sis900.c   |   30 ++
 drivers/net/via-rhine.c|3 +++
 drivers/pci/hotplug/pciehp_ctrl.c  |3 ++-
 fs/cramfs/inode.c  |1 +
 net/ipv4/tcp_timer.c   |1 +
 18 files changed, 63 insertions(+), 56 deletions(-)


Summary of changes from v2.6.11.2 to v2.6.11.3
==

Alexander Nyberg:
  o PCI: fix hotplug double free

David S. Miller:
  o [TCP]: Put back tcp_timer_bug_msg[] symbol export

Egbert Eich:
  o drm missing memset can crash X server

Eric Lammerts:
  o cramfs: small stat(2) fix

Greg Kroah-Hartman:
  o Linux 2.6.11.3

Herbert Xu:
  o sis900 kernel oops fix

Jean Delvare:
  o fix amd64 2.6.11 oops on modprobe (saa7110)
  o Fix i2c messsage flags in video drivers

Kumar Gala:
  o ppc32: trivial fix for e500 oprofile build

Matt Porter:
  o ppc32: Compilation fixes for Ebony, Luan and Ocotea

Olof Johansson:
  o [VIA RHINE] older chips oops on shutdown

Stephen Hemminger:
  o r8169: receive descriptor length fix

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Linux 2.6.11.3

2005-03-12 Thread Greg KH 
As there were no complaints about the patches posted a few days ago,
I've released 2.6.11.3 with them in it.

It's available now in the normal kernel.org places:
kernel.org/pub/linux/kernel/v2.6/patch-2.6.11.3.gz
which is a patch against the 2.6.11 release (note, this is different
than before, and should fix all of the previous complaints.)

I've also rediffed the 2.6.11.2 patch against the 2.6.11 release,
instead of the 2.6.11.1 release, and updated it.  There are incremental
patches between the 2.6.11.y releases at:
kernel.org/pub/linux/kernel/v2.6/incr

If anyone has any issues with the way the patches are diffed, please let
me know.

A detailed changelog can be found at:
kernel.org/pub/linux/kernel/v2.6/ChangeLog-2.6.11.3

A bitkeeper tree for the 2.6.11.y releases can be found at:
bk://linux-release.bkbits.net/linux-2.6.11

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.11.2 and 2.6.11.3, as it is small enough to do so.

thanks,
 
greg k-h

---

 Makefile   |2 +-
 arch/ppc/oprofile/op_model_fsl_booke.c |3 +--
 arch/ppc/platforms/4xx/ebony.h |4 ++--
 arch/ppc/platforms/4xx/luan.h  |6 +++---
 arch/ppc/platforms/4xx/ocotea.h|4 ++--
 drivers/char/drm/drm_ioctl.c   |2 ++
 drivers/media/video/adv7170.c  |2 +-
 drivers/media/video/adv7175.c  |2 +-
 drivers/media/video/bt819.c|2 +-
 drivers/media/video/saa7110.c  |   33 -
 drivers/media/video/saa7114.c  |2 +-
 drivers/media/video/saa7185.c  |2 +-
 drivers/net/r8169.c|   17 ++---
 drivers/net/sis900.c   |   30 ++
 drivers/net/via-rhine.c|3 +++
 drivers/pci/hotplug/pciehp_ctrl.c  |3 ++-
 fs/cramfs/inode.c  |1 +
 net/ipv4/tcp_timer.c   |1 +
 18 files changed, 63 insertions(+), 56 deletions(-)


Summary of changes from v2.6.11.2 to v2.6.11.3
==

Alexander Nyberg:
  o PCI: fix hotplug double free

David S. Miller:
  o [TCP]: Put back tcp_timer_bug_msg[] symbol export

Egbert Eich:
  o drm missing memset can crash X server

Eric Lammerts:
  o cramfs: small stat(2) fix

Greg Kroah-Hartman:
  o Linux 2.6.11.3

Herbert Xu:
  o sis900 kernel oops fix

Jean Delvare:
  o fix amd64 2.6.11 oops on modprobe (saa7110)
  o Fix i2c messsage flags in video drivers

Kumar Gala:
  o ppc32: trivial fix for e500 oprofile build

Matt Porter:
  o ppc32: Compilation fixes for Ebony, Luan and Ocotea

Olof Johansson:
  o [VIA RHINE] older chips oops on shutdown

Stephen Hemminger:
  o r8169: receive descriptor length fix

-
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: Linux 2.6.11.3

2005-03-12 Thread Greg KH 
diff -Nru a/Makefile b/Makefile
--- a/Makefile  2005-03-12 22:45:06 -08:00
+++ b/Makefile  2005-03-12 22:45:06 -08:00
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 11
-EXTRAVERSION = .2
+EXTRAVERSION = .3
 NAME=Woozy Numbat
 
 # *DOCUMENTATION*
diff -Nru a/arch/ppc/oprofile/op_model_fsl_booke.c 
b/arch/ppc/oprofile/op_model_fsl_booke.c
--- a/arch/ppc/oprofile/op_model_fsl_booke.c2005-03-12 22:45:06 -08:00
+++ b/arch/ppc/oprofile/op_model_fsl_booke.c2005-03-12 22:45:06 -08:00
@@ -150,7 +150,6 @@
int is_kernel;
int val;
int i;
-   unsigned int cpu = smp_processor_id();
 
/* set the PMM bit (see comment below) */
mtmsr(mfmsr() | MSR_PMM);
@@ -162,7 +161,7 @@
val = ctr_read(i);
if (val  0) {
if (oprofile_running  ctr[i].enabled) {
-   oprofile_add_sample(pc, is_kernel, i, cpu);
+   oprofile_add_pc(pc, is_kernel, i);
ctr_write(i, reset_value[i]);
} else {
ctr_write(i, 0);
diff -Nru a/arch/ppc/platforms/4xx/ebony.h b/arch/ppc/platforms/4xx/ebony.h
--- a/arch/ppc/platforms/4xx/ebony.h2005-03-12 22:45:06 -08:00
+++ b/arch/ppc/platforms/4xx/ebony.h2005-03-12 22:45:06 -08:00
@@ -61,8 +61,8 @@
  */
 
 /* OpenBIOS defined UART mappings, used before early_serial_setup */
-#define UART0_IO_BASE  (u8 *) 0xE200
-#define UART1_IO_BASE  (u8 *) 0xE300
+#define UART0_IO_BASE  0xE200
+#define UART1_IO_BASE  0xE300
 
 /* external Epson SG-615P */
 #define BASE_BAUD  691200
diff -Nru a/arch/ppc/platforms/4xx/luan.h b/arch/ppc/platforms/4xx/luan.h
--- a/arch/ppc/platforms/4xx/luan.h 2005-03-12 22:45:06 -08:00
+++ b/arch/ppc/platforms/4xx/luan.h 2005-03-12 22:45:06 -08:00
@@ -47,9 +47,9 @@
 #define RS_TABLE_SIZE  3
 
 /* PIBS defined UART mappings, used before early_serial_setup */
-#define UART0_IO_BASE  (u8 *) 0xa200
-#define UART1_IO_BASE  (u8 *) 0xa300
-#define UART2_IO_BASE  (u8 *) 0xa600
+#define UART0_IO_BASE  0xa200
+#define UART1_IO_BASE  0xa300
+#define UART2_IO_BASE  0xa600
 
 #define BASE_BAUD  11059200
 #define STD_UART_OP(num)   \
diff -Nru a/arch/ppc/platforms/4xx/ocotea.h b/arch/ppc/platforms/4xx/ocotea.h
--- a/arch/ppc/platforms/4xx/ocotea.h   2005-03-12 22:45:06 -08:00
+++ b/arch/ppc/platforms/4xx/ocotea.h   2005-03-12 22:45:06 -08:00
@@ -56,8 +56,8 @@
 #define RS_TABLE_SIZE  2
 
 /* OpenBIOS defined UART mappings, used before early_serial_setup */
-#define UART0_IO_BASE  (u8 *) 0xE200
-#define UART1_IO_BASE  (u8 *) 0xE300
+#define UART0_IO_BASE  0xE200
+#define UART1_IO_BASE  0xE300
 
 #define BASE_BAUD  11059200/16
 #define STD_UART_OP(num)   \
diff -Nru a/drivers/char/drm/drm_ioctl.c b/drivers/char/drm/drm_ioctl.c
--- a/drivers/char/drm/drm_ioctl.c  2005-03-12 22:45:06 -08:00
+++ b/drivers/char/drm/drm_ioctl.c  2005-03-12 22:45:06 -08:00
@@ -326,6 +326,8 @@
 
DRM_COPY_FROM_USER_IOCTL(sv, argp, sizeof(sv));
 
+   memset(version, 0, sizeof(version));
+
dev-driver-version(version);
retv.drm_di_major = DRM_IF_MAJOR;
retv.drm_di_minor = DRM_IF_MINOR;
diff -Nru a/drivers/media/video/adv7170.c b/drivers/media/video/adv7170.c
--- a/drivers/media/video/adv7170.c 2005-03-12 22:45:06 -08:00
+++ b/drivers/media/video/adv7170.c 2005-03-12 22:45:06 -08:00
@@ -130,7 +130,7 @@
u8 block_data[32];
 
msg.addr = client-addr;
-   msg.flags = client-flags;
+   msg.flags = 0;
while (len = 2) {
msg.buf = (char *) block_data;
msg.len = 0;
diff -Nru a/drivers/media/video/adv7175.c b/drivers/media/video/adv7175.c
--- a/drivers/media/video/adv7175.c 2005-03-12 22:45:06 -08:00
+++ b/drivers/media/video/adv7175.c 2005-03-12 22:45:06 -08:00
@@ -126,7 +126,7 @@
u8 block_data[32];
 
msg.addr = client-addr;
-   msg.flags = client-flags;
+   msg.flags = 0;
while (len = 2) {
msg.buf = (char *) block_data;
msg.len = 0;
diff -Nru a/drivers/media/video/bt819.c b/drivers/media/video/bt819.c
--- a/drivers/media/video/bt819.c   2005-03-12 22:45:06 -08:00
+++ b/drivers/media/video/bt819.c   2005-03-12 22:45:06 -08:00
@@ -146,7 +146,7 @@
u8 block_data[32];
 
msg.addr = client-addr;
-   msg.flags = client-flags;
+   msg.flags = 0;
while (len = 2) {
msg.buf = (char *) block_data;
msg.len = 0;
diff -Nru a/drivers/media/video/saa7110.c b/drivers/media/video/saa7110.c
--- a/drivers/media/video/saa7110.c 2005-03-12 22:45:06