Linux Kernel Mailing List | 1 Dec 2004 06:16

Merge bk://kernel.bkbits.net/gregkh/linux/usb-2.6

ChangeSet 1.2260, 2004/11/30 21:16:37-08:00, torvalds <at> ppc970.osdl.org

	Merge bk://kernel.bkbits.net/gregkh/linux/usb-2.6
	into ppc970.osdl.org:/home/torvalds/v2.6/linux

 0 files changed

Linux Kernel Mailing List | 1 Dec 2004 06:12

Merge bk://kernel.bkbits.net/gregkh/linux/pci-2.6

ChangeSet 1.2258, 2004/11/30 21:12:13-08:00, torvalds <at> ppc970.osdl.org

	Merge bk://kernel.bkbits.net/gregkh/linux/pci-2.6
	into ppc970.osdl.org:/home/torvalds/v2.6/linux

 0 files changed

Linux Kernel Mailing List | 1 Dec 2004 06:15

Merge bk://kernel.bkbits.net/gregkh/linux/i2c-2.6

ChangeSet 1.2259, 2004/11/30 21:15:28-08:00, torvalds <at> ppc970.osdl.org

	Merge bk://kernel.bkbits.net/gregkh/linux/i2c-2.6
	into ppc970.osdl.org:/home/torvalds/v2.6/linux

 0 files changed

Linux Kernel Mailing List | 1 Dec 2004 06:26

[UDP]: Select handling of bad checksums.

ChangeSet 1.2255.2.3, 2004/11/30 21:26:12-08:00, shemminger <at> osdl.org

	[UDP]: Select handling of bad checksums.
	
	Alternate workaround for blocking usage of select() by UDP applications.
	The problem is Linux optimizes the UDP receive checksum path so that checksum
	validation is not performed until the application read. This is a performance win
	but can cause applications that do select with blocking file descriptors to get false
	positives if the received message has a checksum error.
	There is a long running thread about this on LKML.
	
	This patch makes these applications work, but keeps the one-pass performance gain
	for those applications smart enough to use non-blocking file descriptors with
	select/poll. There is still a possibility to get a false positive if application does
	select on non-blocking fd then makes it blocking before doing the receive, but that
	is unlikely.
	
	Tested by injecting bad packets with SOCK_RAW.
	
	Signed-off-by: Stephen Hemminger <shemminger <at> osdl.org>
	Signed-off-by: David S. Miller <davem <at> davemloft.net>

 include/net/udp.h   |    2 ++
 net/ipv4/af_inet.c  |    2 +-
 net/ipv4/udp.c      |   47 +++++++++++++++++++++++++++++++++++++++++++++++
 net/ipv6/af_inet6.c |    2 +-
 4 files changed, 51 insertions(+), 2 deletions(-)

diff -Nru a/include/net/udp.h b/include/net/udp.h
--- a/include/net/udp.h	2004-12-01 00:03:32 -08:00
(Continue reading)

Linux Kernel Mailing List | 1 Dec 2004 07:02

[GNET_STATS]: kernel-api doc for gnet stats/estimator

ChangeSet 1.2255.2.4, 2004/11/30 22:02:46-08:00, tgraf <at> suug.ch

	[GNET_STATS]: kernel-api doc for gnet stats/estimator
	
	Signed-off-by: Thomas Graf <tgraf <at> suug.ch>
	Signed-off-by: David S. Miller <davem <at> davemloft.net>

 Documentation/DocBook/kernel-api.tmpl |    5 +
 include/linux/gen_stats.h             |    5 +
 net/core/gen_estimator.c              |   35 +++++++++++++
 net/core/gen_stats.c                  |   90 +++++++++++++++++++++++++++++++++-
 4 files changed, 134 insertions(+), 1 deletion(-)

diff -Nru a/Documentation/DocBook/kernel-api.tmpl b/Documentation/DocBook/kernel-api.tmpl
--- a/Documentation/DocBook/kernel-api.tmpl	2004-12-01 00:03:43 -08:00
+++ b/Documentation/DocBook/kernel-api.tmpl	2004-12-01 00:03:43 -08:00
 <at>  <at>  -133,6 +133,11  <at>  <at> 
      <sect1><title>Socket Filter</title>
 !Enet/core/filter.c
      </sect1>
+     <sect1><title>Generic Network Statistics</title>
+!Iinclude/linux/gen_stats.h
+!Enet/core/gen_stats.c
+!Enet/core/gen_estimator.c
+     </sect1>
   </chapter>

   <chapter id="netdev">
diff -Nru a/include/linux/gen_stats.h b/include/linux/gen_stats.h
--- a/include/linux/gen_stats.h	2004-12-01 00:03:43 -08:00
(Continue reading)

Linux Kernel Mailing List | 1 Dec 2004 08:11

Merge bk://kernel.bkbits.net/davem/net-2.6

ChangeSet 1.2261, 2004/11/30 23:11:50-08:00, torvalds <at> ppc970.osdl.org

	Merge bk://kernel.bkbits.net/davem/net-2.6
	into ppc970.osdl.org:/home/torvalds/v2.6/linux

 0 files changed

Linux Kernel Mailing List | 2 Dec 2004 00:18

http://lia64.bkbits.net/linux-ia64-release-2.6.10

ChangeSet 1.2262, 2004/12/01 15:18:02-08:00, torvalds <at> ppc970.osdl.org

	Merge http://lia64.bkbits.net/linux-ia64-release-2.6.10
	into ppc970.osdl.org:/home/torvalds/v2.6/linux

 0 files changed

Linux Kernel Mailing List | 1 Dec 2004 06:46

[ACPI] fix IRQ assignment regression with CONFIG_PNPACPI=y

ChangeSet 1.1988.133.5, 2004/12/01 00:46:34-05:00, len.brown <at> intel.com

	[ACPI] fix IRQ assignment regression with CONFIG_PNPACPI=y
	http://bugzilla.kernel.org/show_bug.cgi?id=3762
	
	Signed-off-by: Len Brown <len.brown <at> intel.com>

 pci_link.c |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletion(-)

diff -Nru a/drivers/acpi/pci_link.c b/drivers/acpi/pci_link.c
--- a/drivers/acpi/pci_link.c	2004-12-01 18:09:00 -08:00
+++ b/drivers/acpi/pci_link.c	2004-12-01 18:09:00 -08:00
 <at>  <at>  -791,9 +791,16  <at>  <at> 
 	return 1;
 }

+/*
+ * We'd like PNP to call this routine for the
+ * single ISA_USED value for each legacy device.
+ * But instead it calls us with each POSSIBLE setting.
+ * There is no ISA_POSSIBLE weight, so we simply use
+ * the (small) PCI_USING penalty.
+ */
 void acpi_penalize_isa_irq(int irq)
 {
-	acpi_irq_penalty[irq] += PIRQ_PENALTY_ISA_USED;
+	acpi_irq_penalty[irq] += PIRQ_PENALTY_PCI_USING;
 }

(Continue reading)

Linux Kernel Mailing List | 1 Dec 2004 07:05

[ACPI] fix reboot on poweroff regression due to enabled wakeup GPEs

ChangeSet 1.1988.133.6, 2004/12/01 01:05:10-05:00, len.brown <at> intel.com

	[ACPI] fix reboot on poweroff regression due to enabled wakeup GPEs
	http://bugzilla.kernel.org/show_bug.cgi?id=3669
	
	Signed-off-by: David Shaohua Li <shaohua.li <at> intel.com>
	Signed-off-by: Len Brown <len.brown <at> intel.com>

 Makefile   |    4 ++--
 poweroff.c |    2 ++
 sleep.h    |    1 +
 wakeup.c   |   32 ++++++++++++++++++++++++++++++--
 4 files changed, 35 insertions(+), 4 deletions(-)

diff -Nru a/drivers/acpi/sleep/Makefile b/drivers/acpi/sleep/Makefile
--- a/drivers/acpi/sleep/Makefile	2004-12-01 18:09:11 -08:00
+++ b/drivers/acpi/sleep/Makefile	2004-12-01 18:09:11 -08:00
 <at>  <at>  -1,5 +1,5  <at>  <at> 
-obj-y					:= poweroff.o
-obj-$(CONFIG_ACPI_SLEEP)		+= main.o wakeup.o
+obj-y					:= poweroff.o wakeup.o
+obj-$(CONFIG_ACPI_SLEEP)		+= main.o
 obj-$(CONFIG_ACPI_SLEEP_PROC_FS)	+= proc.o

 EXTRA_CFLAGS += $(ACPI_CFLAGS)
diff -Nru a/drivers/acpi/sleep/poweroff.c b/drivers/acpi/sleep/poweroff.c
--- a/drivers/acpi/sleep/poweroff.c	2004-12-01 18:09:11 -08:00
+++ b/drivers/acpi/sleep/poweroff.c	2004-12-01 18:09:11 -08:00
 <at>  <at>  -9,6 +9,7  <at>  <at> 
 #include <linux/init.h>
(Continue reading)

Linux Kernel Mailing List | 1 Dec 2004 07:36

[ACPI] IPMI must supply the address of its GPE handler to install or remove it

ChangeSet 1.1988.133.7, 2004/12/01 01:36:30-05:00, len.brown <at> intel.com

	[ACPI] IPMI must supply the address of its GPE handler to install or remove it
	
	Signed-off-by: Len Brown <len.brown <at> intel.com>

 ipmi_si_intf.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff -Nru a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
--- a/drivers/char/ipmi/ipmi_si_intf.c	2004-12-01 18:09:22 -08:00
+++ b/drivers/char/ipmi/ipmi_si_intf.c	2004-12-01 18:09:22 -08:00
 <at>  <at>  -1370,7 +1370,7  <at>  <at> 
 	status = acpi_install_gpe_handler(NULL,
 					  info->irq,
 					  ACPI_GPE_LEVEL_TRIGGERED,
-					  ipmi_acpi_gpe,
+					  &ipmi_acpi_gpe,
 					  info);
 	if (status != AE_OK) {
 		printk(KERN_WARNING
 <at>  <at>  -1390,7 +1390,7  <at>  <at> 
 	if (!info->irq)
 		return;

-	acpi_remove_gpe_handler(NULL, info->irq, ipmi_acpi_gpe);
+	acpi_remove_gpe_handler(NULL, info->irq, &ipmi_acpi_gpe);
 }

 /*
(Continue reading)


Gmane