summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Input: serio_raw - fix Kconfig helpNeil Brown2005-07-111-1/+1
| | | | | | Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au> Signed-off-by: Vojtech Pavlik <vojtech@suse.cz> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* Input: serio_raw - link serio_raw misc device to correspondingDmitry Torokhov2005-07-111-0/+1
| | | | | | serio port in sysfs. Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* Merge rsync://www.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6Dmitry Torokhov2005-07-11848-17148/+31488
|\
| * Merge master.kernel.org:~rmk/linux-2.6-arm.gitLinus Torvalds2005-07-1065-1133/+1847
| |\
| | * [PATCH] ARM: 2803/1: OMAP update 11/11: Add cpufreq supportTony Lindgren2005-07-103-1/+130
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch from Tony Lindgren This patch adds minimal cpufreq support for OMAP taking advantage of the clock framework. Signed-off-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * [PATCH] ARM: 2805/1: OMAP update 10/11: Update H2 defconfigTony Lindgren2005-07-101-39/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | Patch from Tony Lindgren This patch updates H2 defconfig. Signed-off-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * [PATCH] ARM: 2804/1: OMAP update 9/11: Update OMAP arch filesTony Lindgren2005-07-1010-102/+480
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch from Tony Lindgren This patch by various OMAP developers syncs the OMAP specific arch files with the linux-omap tree. Signed-off-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * [PATCH] ARM: 2802/1: OMAP update 8/11: Update OMAP arch filesTony Lindgren2005-07-1012-29/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch from Tony Lindgren This patch by various OMAP developers syncs the OMAP specific arch files with the linux-omap tree. Signed-off-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * [PATCH] ARM: 2812/1: OMAP update 7c/11: Move arch-omap to plat-omapTony Lindgren2005-07-1012-0/+4635
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch from Tony Lindgren This patch move common OMAP code from arch-omap to plat-omap directory. Signed-off-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * [PATCH] ARM: 2809/1: OMAP update 7b/11: Move arch-omap to plat-omapTony Lindgren2005-07-102-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch from Tony Lindgren This patch move common OMAP code from arch-omap to plat-omap directory. Signed-off-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * [PATCH] ARM: 2807/1: OMAP update 7a/11: Move arch-omap to plat-omapTony Lindgren2005-07-1012-4635/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch from Tony Lindgren This patch move common OMAP code from arch-omap to plat-omap directory. Signed-off-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * [PATCH] ARM: 2801/1: OMAP update 6/11: Split OMAP1 common code into id, io ↵Tony Lindgren2005-07-105-418/+508
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and serial Patch from Tony Lindgren This patch by Juha Yrjölä and other OMAP developers splits OMAP1 specific common code into OMAP1 id, io, and serial code in mach-omap1 directory. Signed-off-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * [PATCH] ARM: 2806/1: OMAP update 5/11: Move board files into mach-omap1 ↵Tony Lindgren2005-07-108-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | directory Patch from Tony Lindgren This patch by Paul Mundt and other OMAP developers moves OMAP1 board files into mach-omap1 directory. Signed-off-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * [PATCH] ARM: 2799/1: OMAP update 4/11: Move OMAP1 LED code into mach-omap1 ↵Tony Lindgren2005-07-105-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | directory Patch from Tony Lindgren This patch by Paul Mundt and other OMAP developers moves OMAP1 specific LED code into mach-omap1 directory. Signed-off-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * [PATCH] ARM: 2800/1: OMAP update 3/11: Move OMAP1 core code into mach-omap1 ↵Tony Lindgren2005-07-103-11/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | directory Patch from Tony Lindgren This patch by Paul Mundt and other OMAP developers moves OMAP1 specific IRQ, time, and FPGA code into mach-omap1 directory. Signed-off-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * [PATCH] ARM: 2798/1: OMAP update 2/11: Change ARM Kconfig to support omap1 ↵Tony Lindgren2005-07-106-157/+184
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and omap2 Patch from Tony Lindgren This patch by Paul Mundt and other OMAP developers modifies ARM specific Kconfig to allow sharing code between OMAP1 and OMAP2 architectures. In order to share code between OMAP1 and OMAP2, all OMAP1 specific code is moved into mach-omap1 directory in the following patch. A new mach-omap2 directory will be added later on. Signed-off-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * [PATCH] ARM: 2797/1: OMAP update 1/11: Update include filesTony Lindgren2005-07-108-27/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch from Tony Lindgren This patch by various OMAP developers syncs the OMAP specific include files with the linux-omap tree. Signed-off-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * [PATCH] ARM: 2796/1: Fix ARMv5[TEJ] check in MMU initalizationDeepak Saxena2005-07-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch from Deepak Saxena The code in mm-armv.c checks for the condition (cpu_architecture()<= ARMv5) in a few places but should be checking for ARMv5TEJ as the MMU is shared across all v5 variations. Signed-off-by: Deepak Saxena <dsaxena@plexity.net> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * [PATCH] ARM: 2795/1: update ixp2000 defconfigsLennert Buytenhek2005-07-105-75/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | Patch from Lennert Buytenhek Update the ixp2000 defconfigs from 2.6.12-git6 to 2.6.13-rc2. Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * [PATCH] ARM: 2793/1: platform serial support for ixp2000Lennert Buytenhek2005-07-105-15/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch from Lennert Buytenhek This patch converts the ixp2000 serial port over to a platform serial device. Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org> Signed-off-by: Deepak Saxena <dsaxena@plexity.net> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | [PATCH] remove asm-xtensa/ipc.hStephen Rothwell2005-07-102-17/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that sys_ipc has been removed from xtensa, asm/ipc.h is no longer needed for that architecture. Not tested, but obviously correct. This file is included only from arch code and this patch also removes the only inclusion. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | [PATCH] Sync up ieee-1394Ben Collins2005-07-1013-63/+260
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Lots of this patch is trivial code cleanups (static vars were being intialized to 0, etc). There's also some fixes for ISO transmits (max buffer handling). Aswell, we have a few fixes to disable IRM capabilites correctly. We've also disabled, by default some generally unused EXPORT symbols for the sake of cleanliness in the kernel. However, instead of removing them completely, we felt it necessary to have a config option that allowed them to be enabled for the many projects outside of the main kernel tree that use our API for driver development. The primary reason for this patch is to revert a MODE6->MODE10 RBC conversion patch from the SCSI maintainers. The new conversions handled directly in the scsi layer do not seem to work for SBP2. This patch reverts to our old working code so that users can enjoy using Firewire disks and dvd drives again. We are working with the SCSI maintainers to resolve this issue outside of the main kernel tree. We'll merge the patch once the SCSI layer's handling of the MODE10 conversion is working for us. Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * drm: fix stupid missing semicolon.Dave Airlie2005-07-101-1/+1
| | | | | | | | | | | | I fixed this in one git tree but that wasn't the one I pushed... Signed-off-by: Dave Airlie <airlied@linux.ie>
| * Merge head 'drm-fixes' of ↵Linus Torvalds2005-07-0925-194/+146
| |\ | | | | | | | | | master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6
| | * drm: wrap config.h include in a ifdef KERNELDave Airlie2005-07-071-0/+2
| | | | | | | | | | | | | | | | | | This file can be included from userspace so wrap the config.h include. Signed-off-by: David Airlie <airlied@linux.ie>
| | * drm: misc cleanupDave Airlie2005-07-0723-178/+135
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch contains the following cleanups: - make needlessly global functions static - remove the following unused global functions: - drm_fops.c: drm_read - i915_dma.c: i915_do_cleanup_pageflip Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Dave Airlie <airlied@linux.ie>
| | * drm: use kcalloc now that it is available..Dave Airlie2005-07-072-14/+7
| | | | | | | | | | | | | | | | | | Make the DRM drm_calloc call kcalloc now. Signed-off-by: Dave Airlie <airlied@linux.ie>
| | * drm: ctx release can happen before dev->ctxlist is allocatedDave Airlie2005-07-071-1/+1
| | | | | | | | | | | | | | | From: Jon Smirl <jonsmirl@gmail.com> Signed-off-by: Dave Airlie <airlied@linux.ie>
| | * drm: fix minor issues caused by core conversionDave Airlie2005-07-071-1/+1
| | | | | | | | | | | | | | | | | | The conversion to core/driver got this check in-correct. Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | Merge head 'drm-3264' of ↵Linus Torvalds2005-07-0910-0/+628
| |\ \ | | | | | | | | | | | | master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6
| | * | drm: add 32/64 support for MGA/R128/i915Dave Airlie2005-07-0710-0/+628
| | |/ | | | | | | | | | | | | | | | | | | This adds compatiblity ioctls for mga/r128 and i915 DRM drivers. From: Paul Mackerras, David Airlie, Alan Hourihane, Egbert Eich. Signed-off-by: David Airlie <airlied@linux.ie>
| * | Merge head 'drm-via' of ↵Linus Torvalds2005-07-0917-0/+5345
| |\ \ | | | | | | | | | | | | master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6
| | * \ Merge ../linux-2.6/Dave Airlie2005-07-07608-13862/+12346
| | |\ \ | | | |/
| | * | drm: Add via unichrome supportDave Airlie2005-06-2817-0/+5345
| | | | | | | | | | | | | | | | | | | | | | | | Add DRM device driver for VIA Unichrome chipsets From: Unichrome Project http://unichrome.sf.net, Erdi Chen, Thomas Hellstrom Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6Linus Torvalds2005-07-093-3/+6
| |\ \ \
| | * | | [SPARC64]: Support CONFIG_HZDavid S. Miller2005-07-082-2/+5
| | | | | | | | | | | | | | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
| | * | | [SPARC64]: Typo in dtlb_backend.S, _PAGE_SZ4M --> _PAGE_SZ4MBDavid S. Miller2005-07-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Noticed by Eddie C. Dost Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | | [SCTP]: Use struct list_head for chunk lists, not sk_buff_head.David S. Miller2005-07-088-66/+86
| | | | | | | | | | | | | | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | | [IPV6]: Fix warning in ip6_mc_msfilter.David S. Miller2005-07-081-0/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | | [IPV4]: fix IPv4 leave-group group matchingDavid L Stevens2005-07-081-12/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes the multicast group matching for IP_DROP_MEMBERSHIP, similar to the IP_ADD_MEMBERSHIP fix in a prior patch. Groups are identifiedby <group address,interface> and including the interface address in the match will fail if a leave-group is done by address when the join was done by index, or if different addresses on the same interface are used in the join and leave. Signed-off-by: David L Stevens <dlstevens@us.ibm.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | | [IPV4]: (INCLUDE,empty)/leave-group equivalence for full-state MSF APIs & ↵David L Stevens2005-07-082-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | errno fix 1) Adds (INCLUDE, empty)/leave-group equivalence to the full-state multicast source filter APIs (IPv4 and IPv6) 2) Fixes an incorrect errno in the IPv6 leave-group (ENOENT should be EADDRNOTAVAIL) Signed-off-by: David L Stevens <dlstevens@us.ibm.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | | [IPV4]: multicast API "join" issuesDavid L Stevens2005-07-082-12/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1) In the full-state API when imsf_numsrc == 0 errno should be "0", but returns EADDRNOTAVAIL 2) An illegal filter mode change errno should be EINVAL, but returns EADDRNOTAVAIL 3) Trying to do an any-source option without IP_ADD_MEMBERSHIP errno should be EINVAL, but returns EADDRNOTAVAIL 4) Adds comments for the less obvious error return values Signed-off-by: David L Stevens <dlstevens@us.ibm.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | | [IPV4]: multicast API "join" issuesDavid L Stevens2005-07-082-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1) Changes IP_ADD_SOURCE_MEMBERSHIP and MCAST_JOIN_SOURCE_GROUP to ignore EADDRINUSE errors on a "courtesy join" -- prior membership or not is ok for these. 2) Adds "leave group" equivalence of (INCLUDE, empty) filters in the delta-based API. Without this, mixing delta-based API calls that end in an (INCLUDE, empty) filter would not allow a subsequent regular IP_ADD_MEMBERSHIP. It also frees socket buffer memory that isn't needed for both the multicast group record and source filter. Signed-off-by: David L Stevens <dlstevens@us.ibm.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | | [IPV4]: multicast API "join" issuesDavid L Stevens2005-07-082-24/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch corrects a few problems with the IP_ADD_MEMBERSHIP socket option: 1) The existing code makes an attempt at reference counting joins when using the ip_mreqn/imr_ifindex interface. Joining the same group on the same socket is an error, whatever the API. This leads to unexpected results when mixing ip_mreqn by index with ip_mreqn by address, ip_mreq, or other API's. For example, ip_mreq followed by ip_mreqn of the same group will "work" while the same two reversed will not. Fixed to always return EADDRINUSE on a duplicate join and removed the (now unused) reference count in ip_mc_socklist. 2) The group-search list in ip_mc_join_group() is comparing a full ip_mreqn structure and all of it must match for it to find the group. This doesn't correctly match a group that was joined with ip_mreq or ip_mreqn with an address (with or without an index). It also doesn't match groups that are joined by different addresses on the same interface. All of these are the same multicast group, which is identified by group address and interface index. Fixed the check to correctly match groups so we don't get duplicate group entries on the ip_mc_socklist. 3) The old code allocates a multicast address before searching for duplicates requiring it to free in various error cases. This patch moves the allocate until after the search and igmp_max_memberships check, so never a need to allocate, then free an entry. Signed-off-by: David L Stevens <dlstevens@us.ibm.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | | [IPV4]: Apply sysctl_icmp_echo_ignore_broadcasts to ICMP_TIMESTAMP as well.Alexey Kuznetsov2005-07-081-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was the full intention of the original code. Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | | [NET]: Fix sparse warningsVictor Fusco2005-07-087-32/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From: Victor Fusco <victor@cetuc.puc-rio.br> Fix the sparse warning "implicit cast to nocast type" Signed-off-by: Victor Fusco <victor@cetuc.puc-rio.br> Signed-off-by: Domen Puncer <domen@coderock.org> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | | [NET]: Transform skb_queue_len() binary tests into skb_queue_empty()David S. Miller2005-07-0834-89/+84
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is part of the grand scheme to eliminate the qlen member of skb_queue_head, and subsequently remove the 'list' member of sk_buff. Most users of skb_queue_len() want to know if the queue is empty or not, and that's trivially done with skb_queue_empty() which doesn't use the skb_queue_head->qlen member and instead uses the queue list emptyness as the test. Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [PATCH] Add MAINTAINERS entry for audit subsystemChris Wright2005-07-071-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I've been asked about this a couple times, and there's no info in MAINTAINERS file. Add MAINTAINERS entry for audit subsystem. Signed-off-by: Chris Wright <chrisw@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | | [PATCH] device-mapper: dm-raid1: Limit bios to size of mirror regionAlasdair G Kergon2005-07-071-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set the target's split_io field when building a dm-mirror device so incoming bios won't span the mirror's internal regions. Without this, regions can be accessed while not holding correct locks and data corruption is possible. Reported-By: "Zhao Qian" <zhaoqian@aaastor.com> From: Kevin Corry <kevcorry@us.ibm.com> Signed-Off-By: Alasdair G Kergon <agk@redhat.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | | [PATCH] video doc: one more system where video works with S3Pavel Machek2005-07-071-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | One more system where video works with S3. Signed-off-by: Pavel Machek <pavel@suse.cz> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
OpenPOWER on IntegriCloud