---

yaml
---
r: 26652
b: refs/heads/master
c: 5eb204e
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2bf9d6d0f2dadc2a6c13684719c67dc043b9ce67
+refs/heads/master: 5eb204eb1fff7387d3ab3e6225c0099dc34e69db

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)

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

trunk/Makefile

@@ -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: