aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAge
* Merge upstream into 'upstream' branch of netdev-2.6.git.Jeff Garzik2005-08-24
|\ | | | | | | Hand fix merge conflict in drivers/net/tokenring/Kconfig.
| * Linux v2.6.13-rc7v2.6.13-rc7Linus Torvalds2005-08-23
| | | | | | | | Too many changes to release a final 2.6.13.
| * [PATCH] Fix IXP4xx CLOCK_TICK_RATEDeepak Saxena2005-08-23
| | | | | | | | | | | | | | | | | | | | | | | | | | As pointed out in the following thread, the CLOCK_TICK_RATE setting for IXP4xx is incorrect b/c the HW ignores the lowest 2 bits of the LATCH value. http://lists.arm.linux.org.uk/pipermail/linux-arm-kernel/2005-August/030950.html Tnx to George Anziger and Egil Hjelmeland for finding the issue. Signed-off-by: Deepak Saxena <dsaxena@plexity.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * [PATCH] cpu_exclusive sched domains on partial nodes temp fixPaul Jackson2005-08-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This keeps the kernel/cpuset.c routine update_cpu_domains() from invoking the sched.c routine partition_sched_domains() if the cpuset in question doesn't fall on node boundaries. I have boot tested this on an SN2, and with the help of a couple of ad hoc printk's, determined that it does indeed avoid calling the partition_sched_domains() routine on partial nodes. I did not directly verify that this avoids setting up bogus sched domains or avoids the oops that Hawkes saw. This patch imposes a silent artificial constraint on which cpusets can be used to define dynamic sched domains. This patch should allow proceeding with this new feature in 2.6.13 for the configurations in which it is useful (node alligned sched domains) while avoiding trying to setup sched domains in the less useful cases that can cause the kernel corruption and oops. Signed-off-by: Paul Jackson <pj@sgi.com> Acked-by: Ingo Molnar <mingo@elte.hu> Acked-by: Dinakar Guniguntala <dino@in.ibm.com> Acked-by: John Hawkes <hawkes@sgi.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * Merge head 'upstream-fixes' of ↵Linus Torvalds2005-08-23
| |\ | | | | | | | | | master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6
| | * [PATCH] i810_audio: fix release_region misordering in error exit from i810_probeJohn W. Linville2005-08-23
| | | | | | | | | | | | | | | | | | | | | | | | Re-order release_region calls in i810_probe to properly unwind preceding allocations. Signed-off-by: John W. Linville <linville@tuxdriver.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | Merge head 'upstream-fixes' of ↵Linus Torvalds2005-08-23
| |\ \ | | | | | | | | | | | | master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
| | * | libata: release prep (bump versions, etc.)Jeff Garzik2005-08-23
| | |/ | | | | | | | | | | | | | | | - bump versions where necessary - remove two duplicated+outdated doc comments - add MODULE_VERSION() to AHCI driver
| * | [PATCH] x86_64: Don't oops at boot when empty Opteron node has IOAndi Kleen2005-08-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code to detect IO links on Opteron would not check if the node had actually memory. This could lead to pci_bus_to_node returning an invalid node, which might cause crashes later when dma_alloc_coherent passes it to page_alloc_node(). The bug has been there forever but for some reason it is causing now crashes. Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | [PATCH] usbnet oops fixlepton2005-08-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | There's a "return the wrong SKB" error in the GL620A cable minidriver (for "usbnet") which can oops. This would not appear when talking Linux-to-Linux, only Linux-to-Windows (for recent Linuxes). Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | [PATCH] i386: fix incorrect FP signal codeChuck Ebbert2005-08-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | i386 floating-point exception handling has a bug that can cause error code 0 to be sent instead of the proper code during signal delivery. This is caused by unconditionally checking the IS and c1 bits from the FPU status word when they are not always relevant. The IS bit tells whether an exception is a stack fault and is only relevant when the exception is IE (invalid operation.) The C1 bit determines whether a stack fault is overflow or underflow and is only relevant when IS and IE are set. Signed-off-by: Chuck Ebbert <76306.1226@compuserve.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2005-08-23
| |\ \
| | * | [ROSE]: Fix typo in rose_route_frame() locking fix.David S. Miller2005-08-23
| | | | | | | | | | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [PATCH] s390 __CHECKER__ ifdefsAl Viro2005-08-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | remove the bogus games with explicit ifdefs on __CHECKER__ Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | | [PATCH] %t... in vsnprintfAl Viro2005-08-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | handling of %t... (ptrdiff_t) in vsnprintf Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | | [PATCH] ad1980 makefile fixAl Viro2005-08-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | ac97_plugin_ad1980 should trigger build of ac97_codec Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | | [PATCH] Kconfig fix (non-modular SCSI drivers)Al Viro2005-08-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | non-modular scsi drivers depend on built-in scsi Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | | [PATCH] Kconfig fix (missing dependencies on PCI in sound/*)Al Viro2005-08-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | a bunch of PCI-only drivers didn't have the right dependency Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | | [PATCH] missing exports on m32rAl Viro2005-08-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | missing exports on m32r Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | | [PATCH] qualifiers in return types - easy casesAl Viro2005-08-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a bunch of functions switched from volatile to __attribute__((noreturn)) and from const to __attribute_pure__ Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | | [PATCH] typo fix in qdio.cAl Viro2005-08-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | dumb typo: u32 volatile * mistyped as u32 * volatile Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | | [PATCH] emac netpoll fixAl Viro2005-08-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | netpoll is void(struct net_device *), not int(struct net_device *) Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | | [PATCH] vidc gcc4 fixAl Viro2005-08-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | removes an extern for a static variable. Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | | [PATCH] broken inline asm on s390 (misuse of labels)Al Viro2005-08-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | use of explicit labels in inline asm is a Bad Idea(tm), since gcc can decide to inline the function in several places. Fixed by use of 1f/f: instead of .Lfitsin/.Lfitsin: Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | | [PATCH] m32r_sio gcc4 fixesAl Viro2005-08-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | extern declaration followed by static in drivers/serial/m32r_sio.c Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | | [PATCH] m32r icu_data gcc4 fixesAl Viro2005-08-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | either icu_data declaration for SMP case should be taken out of m32102.h, or its declarations for m32700ut and opsput should not be static for SMP. Patch does the latter - judging by comments in m32102.h it is intended to be non-static. Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | | [PATCH] m32r smp.h gcc4 fixesAl Viro2005-08-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | extern on physid_2_cpu[] does not belong in smp.h - the thing is static. Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | | [PATCH] alpha spinlock code and bogus constraintsAl Viro2005-08-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "=m" (lock->lock) / "1" (lock->lock) makes gcc4 unhappy; fixed by s/1/m/, same as in case of i386 rwsem.h where such variant had been accepted by both Linus and rth. Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | | [PATCH] alpha xchg fixAl Viro2005-08-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | alpha xchg has to be a macro - alpha disables always_inline and if that puppy does not get inlined, we immediately blow up on undefined reference. Happens even on gcc3; with gcc4 that happens a _lot_. Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | | [PATCH] missing include in pcmcia_resource.cAl Viro2005-08-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | missing include of asm/irq.h Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | | [PATCH] alpha gcc4 warningsAl Viro2005-08-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on UP smp_call_function() is expanded to expression. Alpha oprofile calls that puppy and ignores the return value. And has -Werror for arch/*... Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | | [PATCH] Kconfig fix (sparc32 drivers/char dependencies)Al Viro2005-08-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | since sparc32 Kconfig includes drivers/char/Kconfig (instead of duplicating its parts) we need several new dependencies there to exclude the stuff broken on sparc32 and not excluded by existing dependencies. Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | | [PATCH] Kconfig fix (emac dependencient)Al Viro2005-08-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | emac doesn't build modular; ibm_emac_debug doesn't build at all (missing headers). Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | | [PATCH] Kconfig fix (CONFIG_PM on 44x)Al Viro2005-08-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CONFIG_PM is broken on 44x; removed duplicate entry for CONFIG_PM, made the inclusion of generic one conditional on BROKEN || !44x. Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | | [PATCH] Kconfig fix (ppc 4xx and early serial)Al Viro2005-08-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a bunch of ppc 4xx variants unconditionally calls early_serial_setup() and therefore needs SERIAL_8250 Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | | [PATCH] Kconfig fix (IRQ_ALL_CPUS vs. MV64360)Al Viro2005-08-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | MV64360 does not support IRQ_ALL_CPUS - see arch/ppc/kernel/mv64360_pic.c. Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | | [PATCH] Kconfig fix (ppc32 SMP dependencies)Al Viro2005-08-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ppc SMP is supported only for 6xx/POWER3/POWER4 - i.e. ones that have PPC_STD_MMU. Dependency fixed. Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Acked-by: Paul Mackerras <paulus@samba.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | | [PATCH] Kconfig fix (VGA console on arm/versatile)Al Viro2005-08-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | VGA console doesn't exist (or build) on arm/versatile; dependency fixed. Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | | [PATCH] Kconfig fix (amba on arm/versatile)Al Viro2005-08-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | AMBA_PL010 is broken on arm/versatile; marked as such Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | | [PATCH] Kconfig fix (acornscsi)Al Viro2005-08-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | acornscsi had been broken for a long time; marked as such Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | | [PATCH] Kconfig fix (M32R_PLDSIO dependecies)Al Viro2005-08-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | M32R_PLDSIO depends on subarchitecture providing PLD_ESIO0CR and friends. Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | | [PATCH] Kconfig fix (parport_pc on m32r)Al Viro2005-08-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | parport_pc shouldn't be picked on m32r (no asm/parport.h, for starters) Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | | [PATCH] Kconfig fix (airo_cs on m32r)Al Viro2005-08-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | airo_cs is broken on m32r; marked as such. [Proper fix would involve separating PCI-dependent parts and making sure they don't get in the way _and_ arranging for asm/scatterlist.h getting picked on m32r] Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | | [PATCH] Kconfig fix (tms380tr and ISA_DMA_API)Al Viro2005-08-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ISA parts of tms380tr are using ISA DMA helpers and should depend on ISA_DMA_API. Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | | [PATCH] Kconfig fix (arv)Al Viro2005-08-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | arv uses constants provided only by include/asm-m32r/m32700ut/m32700ut_lan.h It won't build for any subarchitecture other than M32700UT; marked as such. Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | | [PATCH] Kconfig fix (infiniband and PCI)Al Viro2005-08-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | infiniband uses PCI helpers all over the place (including the core parts) and won't build without PCI. Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | | [PATCH] Kconfig fix (DEBUG_PAGEALLOC on m32r)Al Viro2005-08-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DEBUG_PAGEALLOC is broken on m32r - the option had been blindly copied from i386; kernel_map_pages() had not and that's what is needed for DEBUG_PAGEALLOC to work (or link, while we are at it). Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | | [PATCH] Kconfig fix (PCI on m32r)Al Viro2005-08-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PCI support is broken on m32r (pci_map_... missing, etc.); marked as such Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | | [PATCH] Kconfig fix (PMAC_BACKLIGHT on ppc64)Al Viro2005-08-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PMAC_BACKLIGHT is broken on ppc64; marked as such Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | | [PATCH] Kconfig fix (HISAX_FRITZPCI on ppc64)Al Viro2005-08-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | HISAX_FRITZPCI is broken on ppc64; marked as such Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
generated by cgit v1.2.2 (git 2.25.0) at 2024-12-28 01:04:42 -0500