---

yaml --- r: 27811 b: refs/heads/master c: aa98d7c h: refs/heads/master i: 27809: 832215e 27807: c61e714 v: v3
git-mirror · May 13, 2006 · 9fc64ad · 9fc64ad
1 parent 6830a54
commit 9fc64ad
Show file tree

Hide file tree

Showing 385 changed files with 7,374 additions and 6,779 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1417fc44ee923418df3adadeb4846c891bba1ba5
+refs/heads/master: aa98d7cf59b5b0764d3502662053489585faf2fe
diff --git a/trunk/CREDITS b/trunk/CREDITS
@@ -1194,9 +1194,15 @@ S: Brecksville, OH  44141-1334
 S: USA
 
 N: Tristan Greaves
-E: tristan@extricate.org
-W: http://www.extricate.org/
+E: Tristan.Greaves@icl.com
+E: tmg296@ecs.soton.ac.uk
+W: http://www.ecs.soton.ac.uk/~tmg296
 D: Miscellaneous ipv4 sysctl patches
+S: 15 Little Mead
+S: Denmead
+S: Hampshire
+S: PO7 6HS
+S: United Kingdom
 
 N: Michael A. Griffith
 E: grif@cs.ucr.edu
@@ -3241,9 +3247,14 @@ S: 12725 SW Millikan Way, Suite 400
 S: Beaverton, Oregon 97005
 S: USA
 
-N: Marcelo Tosatti
-E: marcelo@kvack.org
+N: Marcelo W. Tosatti
+E: marcelo.tosatti@cyclades.com
+D: Miscellaneous kernel hacker
 D: v2.4 kernel maintainer
+D: Current pc300/cyclades maintainer
+S: Cyclades Corporation
+S: Av Cristovao Colombo, 462. Floresta.
+S: Porto Alegre
 S: Brazil
 
 N: Stefan Traby

diff --git a/trunk/Documentation/devices.txt b/trunk/Documentation/devices.txt
@@ -1721,6 +1721,11 @@ Your cooperation is appreciated.
 		These devices support the same API as the generic SCSI
 		devices.
 
+ 97 block	Packet writing for CD/DVD devices
+		  0 = /dev/pktcdvd0	First packet-writing module
+		  1 = /dev/pktcdvd1	Second packet-writing module
+		    ...
+
  98 char	Control and Measurement Device (comedi)
 		  0 = /dev/comedi0	First comedi device
 		  1 = /dev/comedi1	Second comedi device

diff --git a/trunk/Documentation/memory-barriers.txt b/trunk/Documentation/memory-barriers.txt
@@ -1031,7 +1031,7 @@ conflict on any particular lock.
 LOCKS VS MEMORY ACCESSES
 ------------------------
 
-Consider the following: the system has a pair of spinlocks (M) and (Q), and
+Consider the following: the system has a pair of spinlocks (N) and (Q), and
 three CPUs; then should the following sequence of events occur:
 
 	CPU 1				CPU 2
@@ -1678,7 +1678,7 @@ CPU's caches by some other cache event:
 	smp_wmb();
 	<A:modify v=2>	<C:busy>
 			<C:queue v=2>
-	p = &v;		q = p;
+	p = &b;		q = p;
 			<D:request p>
 	<B:modify p=&v>	<D:commit p=&v>
 		  	<D:read p>

diff --git a/trunk/Documentation/networking/operstates.txt b/trunk/Documentation/networking/operstates.txt
diff --git a/trunk/Documentation/scsi/ChangeLog.megaraid b/trunk/Documentation/scsi/ChangeLog.megaraid
@@ -1,28 +1,3 @@
-Release Date	: Mon Apr 11 12:27:22 EST 2006 - Seokmann Ju <sju@lsil.com>
-Current Version : 2.20.4.8 (scsi module), 2.20.2.6 (cmm module)
-Older Version	: 2.20.4.7 (scsi module), 2.20.2.6 (cmm module)
-
-1.	Fixed a bug in megaraid_reset_handler().
-	Customer reported "Unable to handle kernel NULL pointer dereference
-	at virtual address 00000000" when system goes to reset condition
-	for some reason. It happened randomly.
-	Root Cause: in the megaraid_reset_handler(), there is possibility not
-	returning pending packets in the pend_list if there are multiple
-	pending packets.
-	Fix: Made the change in the driver so that it will return all packets
-	in the pend_list.
-
-2.	Added change request.
-	As found in the following URL, rmb() only didn't help the
-	problem. I had to increase the loop counter to 0xFFFFFF. (6 F's)
-	http://marc.theaimsgroup.com/?l=linux-scsi&m=110971060502497&w=2
-
-	I attached a patch for your reference, too.
-	Could you check and get this fix in your driver?
-
-	Best Regards,
-	Jun'ichi Nomura
-
 Release Date	: Fri Nov 11 12:27:22 EST 2005 - Seokmann Ju <sju@lsil.com>
 Current Version : 2.20.4.7 (scsi module), 2.20.2.6 (cmm module)
 Older Version	: 2.20.4.6 (scsi module), 2.20.2.6 (cmm module)

diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
@@ -1480,11 +1480,10 @@ L:	netdev@vger.kernel.org
 S:	Maintained
 
 IRDA SUBSYSTEM
-P:	Samuel Ortiz
-M:	samuel@sortiz.org
+P:	Jean Tourrilhes
 L:	irda-users@lists.sourceforge.net (subscribers-only)
 W:	http://irda.sourceforge.net/
-S:	Maintained
+S:	Odd Fixes
 
 ISAPNP
 P:	Jaroslav Kysela
@@ -1603,11 +1602,6 @@ M:	James.Bottomley@HansenPartnership.com
 L:	linux-scsi@vger.kernel.org
 S:	Maintained
 
-LED SUBSYSTEM
-P:	Richard Purdie
-M:	rpurdie@rpsys.net
-S:	Maintained
-
 LEGO USB Tower driver
 P:	Juergen Stuber
 M:	starblue@users.sourceforge.net
@@ -1667,7 +1661,7 @@ S:	Maintained
 
 LINUX FOR POWERPC EMBEDDED PPC8XX
 P:	Marcelo Tosatti
-M:	marcelo@kvack.org
+M:	marcelo.tosatti@cyclades.com
 W:	http://www.penguinppc.org/
 L:	linuxppc-embedded@ozlabs.org
 S:	Maintained

diff --git a/trunk/Makefile b/trunk/Makefile
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 17
-EXTRAVERSION =-rc4
+EXTRAVERSION =-rc3
 NAME=Sliding Snow Leopard
 
 # *DOCUMENTATION*
@@ -344,14 +344,16 @@ scripts_basic:
 scripts/basic/%: scripts_basic ;
 
 PHONY += outputmakefile
-# outputmakefile generates a Makefile in the output directory, if using a
-# separate output directory. This allows convenient use of make in the
-# output directory.
+# outputmakefile generate a Makefile to be placed in output directory, if
+# using a seperate output directory. This allows convinient use
+# of make in output directory
 outputmakefile:
-ifneq ($(KBUILD_SRC),)
-	$(Q)$(CONFIG_SHELL) $(srctree)/scripts/mkmakefile \
-	    $(srctree) $(objtree) $(VERSION) $(PATCHLEVEL)
-endif
+	$(Q)if test ! $(srctree) -ef $(objtree); then \
+	$(CONFIG_SHELL) $(srctree)/scripts/mkmakefile              \
+	    $(srctree) $(objtree) $(VERSION) $(PATCHLEVEL)         \
+	    > $(objtree)/Makefile;                                 \
+	    echo '  GEN    $(objtree)/Makefile';                   \
+	fi
 
 # To make sure we do not include .config for any of the *config targets
 # catch them early, and hand them over to scripts/kconfig/Makefile
@@ -794,8 +796,8 @@ prepare2: prepare3 outputmakefile
 prepare1: prepare2 include/linux/version.h include/asm \
                    include/config/MARKER
 ifneq ($(KBUILD_MODULES),)
+	$(Q)rm -rf $(MODVERDIR)
 	$(Q)mkdir -p $(MODVERDIR)
-	$(Q)rm -f $(MODVERDIR)/*
 endif
 
 archprepare: prepare1 scripts_basic
@@ -1084,8 +1086,8 @@ else # KBUILD_EXTMOD
 KBUILD_MODULES := 1
 PHONY += crmodverdir
 crmodverdir:
+	$(Q)rm -rf $(MODVERDIR)
 	$(Q)mkdir -p $(MODVERDIR)
-	$(Q)rm -f $(MODVERDIR)/*
 
 PHONY += $(objtree)/Module.symvers
 $(objtree)/Module.symvers:

diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig
@@ -150,6 +150,8 @@ config ARCH_IOP3XX
 
 config ARCH_IXP4XX
 	bool "IXP4xx-based"
+	select DMABOUNCE
+	select PCI
 	help
 	  Support for Intel's IXP4XX (XScale) family of processors.
 

diff --git a/trunk/arch/arm/boot/compressed/misc.c b/trunk/arch/arm/boot/compressed/misc.c
@@ -38,10 +38,10 @@ static void icedcc_putc(int ch)
 		if (--i < 0)
 			return;
 
-		asm volatile ("mrc p14, 0, %0, c0, c0, 0" : "=r" (status));
+		asm("mrc p14, 0, %0, c0, c0, 0" : "=r" (status));
 	} while (status & 2);
 
-	asm("mcr p14, 0, %0, c1, c0, 0" : : "r" (ch));
+	asm("mcr p15, 0, %0, c1, c0, 0" : : "r" (ch));
 }
 
 #define putc(ch)	icedcc_putc(ch)