1. 20 2月, 2007 38 次提交
    • D
      backlight: Remove excessive (un)likelys · 90968e8e
      Dmitry Torokhov 提交于
      Remove excessive numbers of (un)likely()s in the backlight core.
      
      There are no hot paths in this code so rely on compiler to do
      the right thing.
      Signed-off-by: NDmitry Torokhov <dtor@mail.ru>
      Signed-off-by: NRichard Purdie <rpurdie@rpsys.net>
      90968e8e
    • R
      backlight: Remove unneeded owner field · dfcba200
      Richard Purdie 提交于
      Remove uneeded owner field from backlight_properties structure.
      
      Nothing uses it and it is unlikely that it will ever be used. The
      backlight class uses other means to ensure that nothing references
      unloaded code.
      
      Based on a patch from Dmitry Torokhov <dtor@insightbb.com>
      Signed-off-by: NRichard Purdie <rpurdie@rpsys.net>
      dfcba200
    • D
      backlight: Fix error handling · 2fd5a154
      Dmitry Torokhov 提交于
      Fix error handling when registering new device
      Signed-off-by: NDmitry Torokhov <dtor@mail.ru>
      Signed-off-by: NRichard Purdie <rpurdie@rpsys.net>
      2fd5a154
    • M
      backlight: Add Frontpath ProGear HX1050+ driver · 7a208463
      Marcin Juszkiewicz 提交于
      Add control of LCD backlight for Frontpath ProGear HX1050+.
      Patch is based on http://downloads.sf.net/progear/progear-lcd-0.2.tar.gz
      driver by M Schacht.
      Signed-off-by: NMarcin Juszkiewicz <openembedded@hrw.one.pl>
      Signed-off-by: NRichard Purdie <rpurdie@rpsys.net>
      7a208463
    • R
      backlight: Add maintainer entry · 300abeb5
      Richard Purdie 提交于
      Add myself as the backlight class/subsystem maintainer.
      Signed-off-by: NRichard Purdie <rpurdie@rpsys.net>
      300abeb5
    • L
      Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus · 1ca94929
      Linus Torvalds 提交于
      * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
        [MIPS] Cobalt: Fix UART I/O type
        [MIPS] Fixup copy_from_user_inatomic
        [MIPS] Fix struct sigcontext for N32 userland
        [MIPS] Make some __setup functions static
        [MIPS] Declare highstart_pfn, highend_pfn only if CONFIG_HIGHMEM=y
        [MIPS] Allow selection of KGDB only on platforms where it's supported.
      1ca94929
    • Y
      [MIPS] Cobalt: Fix UART I/O type · 0cfd5267
      Yoichi Yuasa 提交于
      The Cobalt UART is actually connected to memory resource area.
      Signed-off-by: NYoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
      Signed-off-by: NRalf Baechle <ralf@linux-mips.org>
      0cfd5267
    • R
      [MIPS] Fixup copy_from_user_inatomic · e03b5269
      Ralf Baechle 提交于
      From the 01408c49 log message:
      
      The problem is that when we write to a file, the copy from userspace to
      pagecache is first done with preemption disabled, so if the source
      address is not immediately available the copy fails *and* *zeros* *the*
      *destination*.
      
      This is a problem because a concurrent read (which admittedly is an odd
      thing to do) might see zeros rather that was there before the write, or
      what was there after, or some mixture of the two (any of these being a
      reasonable thing to see).
      
      If the copy did fail, it will immediately be retried with preemption
      re-enabled so any transient problem with accessing the source won't
      cause an error.
      
      The first copying does not need to zero any uncopied bytes, and doing
      so causes the problem.  It uses copy_from_user_atomic rather than
      copy_from_user so the simple expedient is to change copy_from_user_atomic
      to *not* zero out bytes on failure.
      
      < --- end cite --- >
      
      This patch finally implements at least a not so pretty solution by
      duplicating the relevant part of __copy_user.
      Signed-off-by: NRalf Baechle <ralf@linux-mips.org>
      e03b5269
    • A
      [MIPS] Fix struct sigcontext for N32 userland · 269dd2b2
      Atsushi Nemoto 提交于
      The kernel use 64-bit for sc_regs[0], and both N32/N64 userland
      expects it was 64-bit.  But size of 'long' on N32 is actually 32-bit.
      So this definition make some confusion.  Use __u32 and __u64 for
      N32/N64 sigcontext to get rid of this confusion.
      Signed-off-by: NAtsushi Nemoto <anemo@mba.ocn.ne.jp>
      Signed-off-by: NRalf Baechle <ralf@linux-mips.org>
      269dd2b2
    • A
      [MIPS] Make some __setup functions static · f49a747c
      Atsushi Nemoto 提交于
      This fixes some sparse warnings. ("warning: symbol 'foo' was not
      declared. Should it be static?")
      Signed-off-by: NAtsushi Nemoto <anemo@mba.ocn.ne.jp>
      Signed-off-by: NRalf Baechle <ralf@linux-mips.org>
      f49a747c
    • R
    • R
    • G
      [PATCH] Fix a free-wrong-pointer bug in nfs/acl server. · c9ce2283
      Greg Banks 提交于
      Due to type confusion, when an nfsacl verison 2 'ACCESS' request
      finishes and tries to clean up, it calls fh_put on entiredly the
      wrong thing and this can cause an oops.
      Signed-off-by: NNeil Brown <neilb@suse.de>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      c9ce2283
    • T
      [PATCH] tick management: make broadcast dependent on local APIC · 575d5e72
      Thomas Gleixner 提交于
      The broadcast functionality is only necessary when a local APIC is
      available. Make the config switch depend on X86_LOCAL_APIC. This
      resolves the mach-voyager breakage introduced by the tick managament
      code.
      Signed-off-by: NThomas Gleixner <tglx@linutronix.de>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      575d5e72
    • A
      [PATCH] Declare init_irq_proc before we use it. · 6168a702
      Andrew Morton 提交于
      powerpc gets:
      
      init/main.c: In function `do_basic_setup':
      init/main.c:714: warning: implicit declaration of function `init_irq_proc'
      
      but we cannot include linux/irq.h in generic code.
      
      Fix it by moving the declaration into linux/interrupt.h instead.
      
      And make sure all code that defines init_irq_proc() is including
      linux/interrupt.h.
      
      And nuke an ifdef-in-C
      
      Cc: Thomas Gleixner <tglx@linutronix.de>
      Cc: Ingo Molnar <mingo@elte.hu>
      Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
      Cc: Paul Mackerras <paulus@samba.org>
      Signed-off-by: NAndrew Morton <akpm@osdl.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      6168a702
    • E
      [PATCH] fs/stack.c: Copy i_nlink after all other attributes are copied · a6e6df25
      Erez Zadok 提交于
      A user-specified get_nlinks may depend on other inode attributes.
      
      Cc: Michael Halcrow <mhalcrow@us.ibm.com>
      Signed-off-by: NErez Zadok <ezk@cs.sunysb.edu>
      Signed-off-by: NJosef 'Jeff' Sipek <jsipek@cs.sunysb.edu>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      a6e6df25
    • T
      [PATCH] NOHZ: Produce debug output instead of a BUG() · bc5393a6
      Thomas Gleixner 提交于
      The BUG_ON() in tick_nohz_stop_sched_tick() triggers on some boxen.
      Remove the BUG_ON and print information about the pending softirq
      to allow better debugging of the problem.
      Signed-off-by: NThomas Gleixner <tglx@linutronix.de>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      bc5393a6
    • I
      [PATCH] NOHZ: Fix RCU handling · 6ba9b346
      Ingo Molnar 提交于
      When a CPU is needed for RCU the tick has to continue even when it was
      stopped before.
      Signed-off-by: NIngo Molnar <mingo@elte.hu>
      Signed-off-by: NThomas Gleixner <tglx@linutronix.de>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      6ba9b346
    • L
      Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog · 2aa6eb31
      Linus Torvalds 提交于
      * master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
        [WATCHDOG] machzwd warning fix
      2aa6eb31
    • L
      Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus · cb553c48
      Linus Torvalds 提交于
      * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
        [MIPS] Update defconfigs
        [MIPS] Support for several more SNI RM models.
        [MIPS] Include <asm/bugs> to for declaration of check_bugs32.
        [MIPS] Add external declaration of pagetable_init() to pgalloc.h
        [MIPS] Make kernel_thread_helper() static
        [MIPS] Make __declare_dbe_table static and avoid it getting optimized away
        [MIPS] Use MIPS R2 instructions for bitops.
        [MIPS] signals: Share even more code.
        [MIPS] Fix CONFIG_MIPS32_N32=y CONFIG_MIPS32_O32=n build
        [MIPS] Iomap implementation.
        [MIPS] <asm/compat-signal.h> needs to include <asm/uaccess.h>.
        [MIPS] IP27: Fix warning.
        [MIPS] Fix sigset_t endianess swapping issues in 32-bit compat code.
      cb553c48
    • L
      Merge branch 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6 · 42eaf0d8
      Linus Torvalds 提交于
      * 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
        hwmon/vt1211: Add probing of alternate config index port
        hwmon/f71805f: Fix a race condition
        hwmon/abituguru: Fix unchecked return status
        hwmon: New driver for the Analog Devices ADM1029
        hwmon/w83627ehf: Add support for the W83627DHG chip
        hwmon: Use subsys_initcall
        hwmon/lm70: Make lm70_remove a __devexit function
        hwmon: Cleanup a bogus legacy comment
        hwmon: Simplify the locking model of two drivers
        hwmon: Drop unused mutexes in two drivers
        hwmon/it87: Add PWM base frequency control
      42eaf0d8
    • L
      Merge git://git.infradead.org/mtd-2.6 · 49353617
      Linus Torvalds 提交于
      * git://git.infradead.org/mtd-2.6: (49 commits)
        [MTD] [NAND] S3C2412 fix hw ecc
        [MTD] [NAND] Work around false compiler warning in CAFÉ driver
        [JFFS2] printk warning fixes
        [MTD] [MAPS] ichxrom warning fix
        [MTD] [MAPS] amd76xrom warning fix
        [MTD] [MAPS] esb2rom warning fixes
        [MTD] [MAPS] ck804xrom warning fix
        [MTD] [MAPS] netsc520 warning fix
        [MTD] [MAPS] sc520cdp warning fix
        [MTD] [ONENAND] onenand_base warning fix
        [MTD] [NAND] eXcite nand flash driver
        [MTD] Improve heuristic for detecting wrong-endian RedBoot partition table
        [MTD] Fix RedBoot partition parsing regression harder.
        [MTD] [NAND] S3C2410: Hardware ECC correction code
        [JFFS2] Use MTD_OOB_AUTO to automatically place cleanmarker on NAND
        [MTD] Clarify OOB-operation interface comments
        [MTD] remove unused ecctype,eccsize fields from struct mtd_info
        [MTD] [NOR] Intel: remove ugly PROGREGION macros
        [MTD] [NOR] STAA: use writesize instead off eccsize to represent ECC block
        [MTD] OneNAND: Invalidate bufferRAM after erase
        ...
      49353617
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs · 2874b391
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
        9p: implement optional loose read cache
        9p: Use kthread_stop instead of sending a SIGKILL.
      2874b391
    • L
      Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 · 5fc77247
      Linus Torvalds 提交于
      * master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6:
        [SCSI] SCSI core: better initialization for sdev->scsi_level
        [SCSI] scsi_proc.c: display sdev->scsi_level correctly
        [SCSI] megaraid_sas: update version and author info
        [SCSI] megaraid_sas: return sync cache call with success
        [SCSI] megaraid_sas: replace pci_alloc_consitent with dma_alloc_coherent in ioctl path
        [SCSI] megaraid_sas: add bios_param in scsi_host_template
        [SCSI] megaraid_sas: do not process cmds if hw_crit_error is set
        [SCSI] scsi_transport.h should include scsi_device.h
        [SCSI] aic79xx: remove extra newline from info message
        [SCSI] scsi_scan.c: handle bad inquiry responses
        [SCSI] aic94xx: tie driver to the major number of the sequencer firmware
        [SCSI] lpfc: add PCI error recovery support
        [SCSI] megaraid: pci_module_init to pci_register_driver
        [SCSI] tgt: fix the user/kernel ring buffer interface
        [SCSI] sgiwd93: interfacing to wd33c93
        [SCSI] wd33c93: Fast SCSI with WD33C93B
      5fc77247
    • L
      Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/dtor/input · d43a338e
      Linus Torvalds 提交于
      * 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/dtor/input:
        Input: remove obsolete setup parameters from input drivers
        Input: HIL - fix improper call to release_region()
        Input: hid-lgff - treat devices as joysticks unless told otherwise
        Input: HID - add support for Logitech Formula Force EX
        Input: gpio-keys - switch to common GPIO API
        Input: do not lock device when showing name, phys and uniq
        Input: i8042 - let serio bus suspend ports
        Input: psmouse - properly reset mouse on shutdown/suspend
      d43a338e
    • L
      Merge branch 'audit.b37' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current · cb4aaf46
      Linus Torvalds 提交于
      * 'audit.b37' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current:
        [PATCH] AUDIT_FD_PAIR
        [PATCH] audit config lockdown
        [PATCH] minor update to rule add/delete messages (ver 2)
      cb4aaf46
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial · 874ff01b
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (25 commits)
        Documentation/kernel-docs.txt update.
        arch/cris: typo in KERN_INFO
        Storage class should be before const qualifier
        kernel/printk.c: comment fix
        update I/O sched Kconfig help texts - CFQ is now default, not AS.
        Remove duplicate listing of Cris arch from README
        kbuild: more doc. cleanups
        doc: make doc. for maxcpus= more visible
        drivers/net/eexpress.c: remove duplicate comment
        add a help text for BLK_DEV_GENERIC
        correct a dead URL in the IP_MULTICAST help text
        fix the BAYCOM_SER_HDX help text
        fix SCSI_SCAN_ASYNC help text
        trivial documentation patch for platform.txt
        Fix typos concerning hierarchy
        Fix comment typo "spin_lock_irqrestore".
        Fix misspellings of "agressive".
        drivers/scsi/a100u2w.c: trivial typo patch
        Correct trivial typo in log2.h.
        Remove useless FIND_FIRST_BIT() macro from cardbus.c.
        ...
      874ff01b
    • L
      Merge branch 'kill-jffs' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6 · ebbe46f7
      Linus Torvalds 提交于
      * 'kill-jffs' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6:
        Remove JFFS (version 1), as scheduled.
      ebbe46f7
    • L
      Merge branch 'acpi' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev · 901ea4a0
      Linus Torvalds 提交于
      * 'acpi' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
        [PATCH] libata: wrong sizeof for BUFFER
        [PATCH] libata: change order of _SDD/_GTF execution (resend #3)
        [PATCH] libata: ACPI _SDD support
        [PATCH] libata: ACPI and _GTF support
      901ea4a0
    • L
      Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 · 2370965c
      Linus Torvalds 提交于
      * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (51 commits)
        sk98lin: mark deprecated in Kconfig
        Hostess SV-11 depends on INET
        Fix link autonegotiation timer.
        sk98lin: planned removal
        B44: increase wait loop
        b44: replace define
        e1000: allow ethtool to see link status when down
        e1000: remove obsolete custom pci_save_state code
        e1000: fix shared interrupt warning message
        atm: Use ARRAY_SIZE macro when appropriate
        bugfixes and new hardware support for arcnet driver
        pcnet32 NAPI no longer experimental
        MAINTAINER
        macb: Remove inappropriate spinlocks around mii calls
        Convert meth to netdev_priv
        sky2: v1.13
        sky2: receive error handling improvements
        sky2: transmit timeout
        sky2: flow control negotiation for Yukon-FE
        sky2: no need to reset pause bits on shutdown
        ...
      2370965c
    • L
      Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm · 59b8175c
      Linus Torvalds 提交于
      * 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (117 commits)
        [ARM] 4058/2: iop32x: set ->broken_parity_status on n2100 onboard r8169 ports
        [ARM] 4140/1: AACI stability add ac97 timeout and retries
        [ARM] 4139/1: AACI record support
        [ARM] 4138/1: AACI: multiple channel support for IRQ handling
        [ARM] 4211/1: Provide a defconfig for ns9xxx
        [ARM] 4210/1: base for new machine type "NetSilicon NS9360"
        [ARM] 4222/1: S3C2443: Remove reference to missing S3C2443_PM
        [ARM] 4221/1: S3C2443: DMA support
        [ARM] 4220/1: S3C24XX: DMA system initialised from sysdev
        [ARM] 4219/1: S3C2443: DMA source definitions
        [ARM] 4218/1: S3C2412: fix CONFIG_CPU_S3C2412_ONLY wrt to S3C2443
        [ARM] 4217/1: S3C24XX: remove the dma channel show at startup
        [ARM] 4090/2: avoid clash between PXA and SA1111 defines
        [ARM] 4216/1: add .gitignore entries for ARM specific files
        [ARM] 4214/2: S3C2410: Add Armzone QT2410
        [ARM] 4215/1: s3c2410 usb device:  per-platform vbus_draw
        [ARM] 4213/1: S3C2410 - Update definition of ADCTSC_XY_PST
        [ARM] 4098/1: ARM: rtc_lock only used with rtc_cmos
        [ARM] 4137/1: Add kexec support
        [ARM] 4201/1: SMP barriers pair needed for the secondary boot process
        ...
      
      Fix up conflict due to typedef removal in sound/arm/aaci.h
      59b8175c
    • L
      Merge branch 'for-linus' of ssh://master.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6 · 920841d8
      Linus Torvalds 提交于
      * 'for-linus' of ssh://master.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
        ieee1394: fix another deadlock in nodemgr
        ieee1394: cycle timer read extension for raw1394
      920841d8
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc · 5c56f466
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (34 commits)
        [POWERPC] 86xx: Cleaned up platform dts files
        [POWERPC] 85xx: Renamed MPC8568 MDS board code to match other boards
        [POWERPC] 85xx: Cleaning up machine probing
        [POWERPC] QE: clean up ucc_slow.c and ucc_fast.c
        [POWERPC] 85xx: Cleaned up platform dts files
        [POWERPC] 83xx: Renamed MPC8323 MDS dts and defconfig to match other boards
        [POWERPC] 83xx: Updated and renamed MPC8360PB to MPC836x MDS
        [POWERPC] 83xx: Use of_platform_bus_probe to setup QE devices
        [POWERPC] 83xx: use default value of loops_per_jiffy
        [POWERPC] 83xx: Remove obsolete setting of ROOT_DEV.
        [POWERPC] 83xx: Cleaning up machine probing and board initcalls
        [POWERPC] Dispose irq mapping when done in mpc52xx_serial.c
        [POWERPC] 86xx: Add missing of_node_put() in mpc86xx_hpcn_init_irq().
        [POWERPC] 8[56]xx: Remove obsolete setting of ROOT_DEV for 85xx and 86xx platforms.
        [POWERPC] pseries: Enabling auto poweron after power is restored.
        [POWERPC] use winbond libata instead of ide driver for pseries CD drives
        [POWERPC] powerpc: remove references to the obsolete linux,platform property
        [POWERPC] add of_get_mac_address and update fsl_soc.c to use it
        [POWERPC] 83xx: Cleaned up 83xx platform dts files
        [POWERPC] Fix bug with early ioremap and 64k pages
        ...
      5c56f466
    • L
      Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6 · dd397a6d
      Linus Torvalds 提交于
      * master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6: (30 commits)
        ide: make ide_hwif_t.ide_dma_host_on void (v2)
        ide: make ide_hwif_t.ide_dma_{host_off,off_quietly} void (v2)
        ide: add ide_set_dma() helper (v2)
        sgiioc4: fix sgiioc4_ide_dma_check() to enable/disable DMA properly
        ide: disable DMA in ->ide_dma_check for "no IORDY" case (v2)
        ide: convert ide_hwif_t.mmio into flag (v2)
        ide: use PIO/MMIO operations directly where possible (v2)
        ide: add ide_use_fast_pio() helper (v3)
        ide: unexport ide_set_xfer_rate() (v2)
        ide: remove ide_drive_t.usage
        ide: remove ide_pci_device_t tables with only one entry
        ide: remove write-only ide_hwif_t.no_dsc flag
        ide: remove write-only ide_pio_data_t.blacklisted
        sis5513: sis5513_config_xfer_rate() cleanup
        piix: cleanup
        svwks: small cleanup
        cs5530: small cleanup
        hpt366: remove redundant check from init_dma_hpt366()
        trm290: remove redundant CONFIG_BLK_DEV_IDEDMA #ifdef-s
        au1xxx-ide: remove dead code
        ...
      dd397a6d
    • L
      Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband · 976fd0e2
      Linus Torvalds 提交于
      * 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband:
        IB/core: Set static rate in ib_init_ah_from_path()
        IB/ipath: Make ipath_map_sg() static
        IB/core: Fix sparse warnings about shadowed declarations
        RDMA/cma: Add multicast communication support
        IB/sa: Track multicast join/leave requests
        IPoIB: CM error handling thinko fix
        RDMA/cxgb3: Remove Open Grid Computing copyrights in iw_cxgb3 driver
        RDMA/cxgb3: Fail posts synchronously when in TERMINATE state
        RDMA/iwcm: iw_cm_id destruction race fixes
        IB/ehca: Change query_port() to return LINK_UP instead UNKNOWN
        IB/ehca: Allow en/disabling scaling code via module parameter
        IB/ehca: Fix race condition/locking issues in scaling code
        IB/ehca: Rework irq handler
        IPoIB: Only allow root to change between datagram and connected mode
        IB/mthca: Fix allocation of ICM chunks in coherent memory
        IB/mthca: Allow the QP state transition RESET->RESET
      976fd0e2
    • L
      Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6 · 733abe4f
      Linus Torvalds 提交于
      * master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6:
        PCI: Make PCI device numa-node attribute visible in sysfs
        PCI: add systems for automatic breadth-first device sorting
        PCI: PCI devices get assigned redundant IRQs
        PCI: Make CARDBUS_MEM_SIZE and CARDBUS_IO_SIZE boot options
        PCI: pci.txt fix __devexit() usage
        PCI/sysfs/kobject kernel-doc fixes
      733abe4f
    • L
      Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6 · 5fe8252f
      Linus Torvalds 提交于
      * master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6:
        sysfs: fix build errors: uevent with CONFIG_SYSFS=n
        pcmcia: some class_device fallout
        Driver core: device_add_attrs() cleanup
        debugfs: Remove misleading comments.
        debugfs: implement symbolic links
        Driver: remove redundant kobject_unregister checks
        kobject: kobj->k_name verification fix
        serial: Add PCMCIA IDs for Quatech DSP-100 dual RS232 adapter.
        Driver core: let request_module() send a /sys/modules/kmod/-uevent
        Driver.h copyright update
      5fe8252f
    • L
      Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6 · 460223d2
      Linus Torvalds 提交于
      * master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6: (39 commits)
        USB: at91-ohci, handle extra at91sam9261 ahb clock
        USB: another id for cp2101 driver
        USB: ueagle-atm.c needs sched.h
        USB: at91_udc, shrink runtime footprint
        usbnet: add missing Kconfig for KC2190 cables
        usbnet: init fault (oops) cleanup, whitespace fixes
        usbnet: recognize SiteCom CN-124
        usb: Remove Airprime device from option.c
        USB: change __init to __devinit for isp116x_probe
        USB: ps3: don't call ps3_system_bus_driver_register on other platforms
        USB: hid-core.c: Removes GTCO CalComp Interwrite IPanel PIDs from blacklist
        USB: kernel-doc fixes
        USB: quirky device for cdc-acm
        USB: cdc-acm: fix incorrect throtteling, make set_control optional
        USB: unconfigure devices which have config 0
        USB: make usb_iso_packet_descriptor.status signed
        USB: fix g_serial small error
        USB: use __u32 rather than u32 in userspace ioctls in usbdevice_fs.h
        USB Storage: US_FL_IGNORE_RESIDUE needed for Aiptek MP3 Player
        USB: Fix misspelled "USBNET_MII" kernel config option.
        ...
      460223d2
  2. 19 2月, 2007 2 次提交