summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2006-01-1820-207/+193
|\
| * Merge master.kernel.org:/pub/scm/linux/kernel/git/tmlind/linux-omap-upstreamRussell King2006-01-1812-189/+152
| |\
| | * ARM: OMAP: 4/4 Fix clock framework to use clk_enable/disable miscTony Lindgren2006-01-176-21/+21
| | | | | | | | | | | | | | | | | | | | | This patch fixes OMAP clock framework to use clk_enable/disable instead of clk_use/unuse as specified in include/linux/clk.h. Signed-off-by: Tony Lindgren <tony@atomide.com>
| | * ARM: OMAP: 3/4 Fix clock framework to use clk_enable/disable for omap2Tony Lindgren2006-01-172-23/+21
| | | | | | | | | | | | | | | | | | | | | This patch fixes OMAP clock framework to use clk_enable/disable instead of clk_use/unuse as specified in include/linux/clk.h. Signed-off-by: Tony Lindgren <tony@atomide.com>
| | * ARM: OMAP: 2/4 Fix clock framework to use clk_enable/disable for omap1Tony Lindgren2006-01-172-106/+106
| | | | | | | | | | | | | | | | | | | | | This patch fixes OMAP clock framework to use clk_enable/disable instead of clk_use/unuse as specified in include/linux/clk.h. Signed-off-by: Tony Lindgren <tony@atomide.com>
| | * ARM: OMAP: 1/4 Fix clock framework to use clk_enable/disableTony Lindgren2006-01-172-39/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes OMAP clock framework to use clk_enable/disable instead of clk_use/unuse as specified in include/linux/clk.h. Instances of clk_use/unuse are renamed to clk_enable/disable, and references clk_use/unuse are removed. Signed-off-by: Tony Lindgren <tony@atomide.com>
| * | [ARM] 3281/1: ixp4xx: export ixp4xx_exp_bus_size for modulesDavid Vrabel2006-01-181-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch from David Vrabel Export ixp4xx_exp_bus_size so modules can use the IXP4XX_EXP_BUS_BASE(n) macro. Also, fix a printk format warning. Signed-off-by: David Vrabel <dvrabel@arcom.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | [ARM] 3272/1: fix kernel decompressor crashNicolas Pitre2006-01-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch from Nicolas Pitre Commit f4619025a51747a3788fd1bb6bdc46e368a889a7 broke the kernel decompressor (at least on PXA). Here's the fix. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | [ARM] 3271/1: ARM EABI: fix calling of cmpxchg syscall emulationNicolas Pitre2006-01-181-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch from Nicolas Pitre This is kernel provided user space code. Since a syscall is used, it has to be updated to work with EABI. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | [ARM] 3270/1: ARM EABI: fix sigreturn and rt_sigreturnNicolas Pitre2006-01-182-12/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch from Nicolas Pitre The signal return path consists of user code provided by the kernel. Since a syscall is used, it has to be updated to work with EABI. Noticed by Daniel Jacobowitz. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | [ARM] 3268/1: AT91RM9200 serial update for 2.6.15-git12Andrew Victor2006-01-182-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch from Andrew Victor This patch fixes two small issues with 2.6.15-git12. 1) Corrected major/minor numbers for ttyAT devices in the KConfig help. (Patch from Karl Olsen) 2) tty->flip.count has been removed. Signed-off-by: Andrew Victor <andrew@sanpeople.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | [ARM] 3267/1: PXA27x SSP controller register definesDavid Vrabel2006-01-181-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | Patch from David Vrabel PXA27x SSP controller has a few different registers, including SCR (serial clock rate) in SSCR0. Signed-off-by: David Vrabel <dvrabel@arcom.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2006-01-1853-1744/+1870
|\ \ \
| * | | [MAINTAINERS]: add entry for wireless networkingJohn W. Linville2006-01-181-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add an entry to MAINTAINERS for wireless networking, just so people know whom to bless with patches. Signed-off-by: John W. Linville <linville@tuxdriver.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [MAINTAINERS]: correct location for net-2.6.gitJohn W. Linville2006-01-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Correct location info for net-2.6 git tree. Signed-off-by: John W. Linville <linville@tuxdriver.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | Merge git://tipc.cslab.ericsson.net/pub/git/tipcDavid S. Miller2006-01-1849-1705/+1702
| |\ \ \
| | * | | [TIPC] Avoid polluting the global namespacePer Liden2006-01-1844-1673/+1654
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds a tipc_ prefix to all externally visible symbols. Signed-off-by: Per Liden <per.liden@ericsson.com>
| | * | | [TIPC] Group protocols with sub-options in KconfigPer Liden2006-01-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is just a cosmetic change that moves the TIPC configuration entry next to the other protocols that also have sub-options. Makes the the networking options menu look a bit better. Signed-off-by: Per Liden <per.liden@ericsson.com>
| | * | | [TIPC] Add help text for TIPC configuration optionPer Liden2006-01-181-1/+6
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Per Liden <per.liden@ericsson.com>
| | * | | [TIPC] Remove unused #includesPer Liden2006-01-183-4/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Per Liden <per.liden@ericsson.com>
| | * | | [TIPC] Move ethernet protocol id to linux/if_ether.hPer Liden2006-01-182-3/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Per Liden <per.liden@ericsson.com>
| | * | | [TIPC] Provide real email addresses in MAINTAINERSPer Liden2006-01-181-3/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Per Liden <per.liden@ericsson.com>
| | * | | [TIPC] Updated link priority macrosPer Liden2006-01-185-14/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added macros for min/default/max link priority in tipc_config.h. Also renamed TIPC_NUM_LINK_PRI to TIPC_MEDIA_LINK_PRI since that is a more accurate description of what it is used for. Signed-off-by: Per Liden <per.liden@ericsson.com>
| | * | | [TIPC] Minor changes to #includesJon Maloy2006-01-186-6/+10
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jon Maloy <jon.maloy@ericsson.com>
| * | | | [IPV4]: Fix multiple bugs in IGMPv3David L Stevens2006-01-181-30/+122
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1) fix "mld_marksources()" to a) send nothing when all queried sources are excluded b) send full exclude report when source queried sources are not excluded c) don't schedule a timer when there's nothing to report 2) fix "add_grec()" to send empty-source records when it should The original check doesn't account for a non-empty source list with all sources inactive; the new code keeps that short-circuit case, and also generates the group header with an empty list if needed. 3) fix mca_crcount decrement to be after add_grec(), which needs its original value 4) add/remove delete records and prevent current advertisements when an exclude-mode filter moves from "active" to "inactive" or vice versa based on new filter additions. Items 1-3 are just IPv4 versions of the IPv6 bugs found by Yan Zheng and fixed earlier. Item #4 is a related bug that affects exclude-mode change records only (but not queries) and also occurs in IPv6 (IPv6 version coming soon). Signed-off-by: David L Stevens <dlstevens@us.ibm.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | | [PKTGEN]: Respect hard_header_len of device.David S. Miller2006-01-181-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't assume 16. Found by Ben Greear. Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | | [IRDA]: maintainer statusStephen Hemminger2006-01-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Jean says he really doesn't have time to much IRDA any more. The following would help motivate someone who has more time. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | | [CASSINI]: dont touch page_countNick Piggin2006-01-181-4/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove page refcount manipulations from cassini driver by using another field in struct page. Needed for lockless pagecache. Signed-off-by: Nick Piggin <npiggin@suse.de> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | | [IPV4]: RT_CACHE_STAT_INC() warning fixAndrew Morton2006-01-171-1/+2
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG: using smp_processor_id() in preemptible [00000001] code: rpc.statd/2408 And it _is_ a bug, but I guess we don't care enough to add preempt_disable(). Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: David S. Miller <davem@davemloft.net>
* | | | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6Linus Torvalds2006-01-187-11/+70
|\ \ \ \
| * | | | [SPARC64]: Fix build with CONFIG_COMPAT disabled.David S. Miller2006-01-181-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Based upon a report and preliminary patch from Jim Gifford. Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | | [SPARC64]: Serial Console for E250 PatchEddie C. Dost2006-01-185-5/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From: Eddie C. Dost <ecd@brainaid.de> I have the following patch for serial console over the RSC (remote system controller) on my E250 machine. It basically adds support for input-device=rsc and output-device=rsc from OBP, and allows 115200,8,n,1,- serial mode setting. Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | | [SPARC64]: Update defconfig.David S. Miller2006-01-181-6/+18
| |/ / / | | | | | | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
* | | | [PATCH] e1000: fix compile warningJesse Brandeburg2006-01-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: John Ronciak <john.ronciak@intel.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
* | | | [PATCH] e1000: fix receive breakageJesse Brandeburg2006-01-181-11/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in attempting to not send the "prefetch" patch, we broke the receive code, this patch fixes that issue. Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: John Ronciak <john.ronciak@intel.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
* | | | [PATCH] e1000: Added driver commentsJesse Brandeburg2006-01-181-5/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: John Ronciak <john.ronciak@intel.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
* | | | [PATCH] e1000: Fix whitespaceJesse Brandeburg2006-01-186-441/+443
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: John Ronciak <john.ronciak@intel.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
* | | | [PATCH] e1000: Added functions declarationsJesse Brandeburg2006-01-181-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added e1000_mc_addr_list_update Added e1000_read_reg_io Added e1000_enable_pciex_master These are not static functions, that is why we have them declared in the header. Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: John Ronciak <john.ronciak@intel.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
* | | | [PATCH] e1000: Added functions to save and restore configJesse Brandeburg2006-01-181-2/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These functions help restore the driver to active configuration when coming out of resume for power management. Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: John Ronciak <john.ronciak@intel.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
* | | | [PATCH] e1000: Added RX buffer enhancementsJesse Brandeburg2006-01-181-59/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Align the prefetches to a dword to help speed them up. Recycle skb's and early replenish. Force memory writes to complete before fetching more descriptors. Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: John Ronciak <john.ronciak@intel.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
* | | | [PATCH] e1000: Added disable packet split capabilityJesse Brandeburg2006-01-1826-2/+36
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | Adds the ability to disability packet split at compile time and use the legacy receive path on PCI express hardware. Made this a CONFIG option and modified the Kconfig, to reflect the new option. Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: John Ronciak <john.ronciak@intel.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
* | | Merge git://oss.sgi.com:8090/oss/git/xfs-2.6Linus Torvalds2006-01-171-3/+26
|\ \ \
| * | | [XFS] Fix a race in xfs_submit_ioend() where we can be completing I/O forDavid Chinner2006-01-181-3/+26
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | a page while we are still submitting other buffers on the same page for I/O. SGI-PV: 948197 SGI-Modid: xfs-linux-melb:xfs-kern:25004a Signed-off-by: David Chinner <dgc@sgi.com> Signed-off-by: Nathan Scott <nathans@sgi.com>
* | | Merge branch 'upstream-linus' of ↵Linus Torvalds2006-01-177-14/+105
|\ \ \ | | | | | | | | | | | | master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
| * | | [PATCH] libata: Code for the IRQ mask flagAlan Cox2006-01-171-4/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Alan Cox <alan@redhat.com> Somewhat cleaner in the resync as someone cleaned up the pio xfer users Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | | [PATCH] libata: Fix sector lock to apply to both drives not drive 0 twiceAlan Cox2006-01-171-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Alan Cox <alan@redhat.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | | [PATCH] libata: Fix heuristic typos add LBA48PIO flag and support code, add ↵Alan Cox2006-01-172-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | IRQ flag for next diff Signed-off-by: Alan Cox <alan@redhat.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | | [PATCH] Intel ICH8 SATA: add PCI device IDsJason Gaston2006-01-172-1/+7
| | | | | | | | | | | | | | | | | | | | Signed-off-by:  Jason Gaston <Jason.d.gaston@intel.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | | [PATCH] libata: add a function to decide if we need iordyAlan Cox2006-01-172-0/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This ought to be simple but for PIO2 we have to poke around the drive data to get it 100% correct. Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | | [PATCH] libata: Pre UDMA EIDE PIO mode selectionAlan Cox2006-01-171-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I misread the spec when doing the original. I've tested the corrected version with pre UDMA drives and it now picks the right modes. This is a specific bug fix rather than an update or new feature item. Signed-off-by: Alan Cox <alan@redhat.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
OpenPOWER on IntegriCloud