04 Nov, 2009

1 commit


23 Oct, 2009

1 commit


17 Oct, 2009

1 commit

  • * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
    sata_mv: Prevent PIO commands to be defered too long if traffic in progress.
    pata_sc1200: Fix crash on boot
    libata: fix internal command failure handling
    libata: fix PMP initialization
    sata_nv: make sure link is brough up online when skipping hardreset
    ahci / atiixp / pci quirks: rename AMD SB900 into Hudson-2
    ahci: Add the AHCI controller Linux Device ID for NVIDIA chipsets.
    pata_via: extend the rev_max for VT6330

    Linus Torvalds
     

16 Oct, 2009

2 commits

  • This patch renames the code name SB900 into Hudson-2

    Signed-off-by: Shane Huang
    Signed-off-by: Jeff Garzik

    Shane Huang
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (53 commits)
    vmxnet: fix 2 build problems
    net: add support for STMicroelectronics Ethernet controllers.
    net: ks8851_mll uses mii interfaces
    net/fec_mpc52xx: Fix kernel panic on FEC error
    net: Fix OF platform drivers coldplug/hotplug when compiled as modules
    TI DaVinci EMAC: Clear statistics register properly.
    r8169: partial support and phy init for the 8168d
    irda/sa1100_ir: check return value of startup hook
    udp: Fix udp_poll() and ioctl()
    WAN: fix Cisco HDLC handshaking.
    tcp: fix tcp_defer_accept to consider the timeout
    3c574_cs: spin_lock the set_multicast_list function
    net: Teach pegasus driver to ignore bluetoother adapters with clashing Vendor:Product IDs
    netxen: fix pci bar mapping
    ethoc: fix warning from 32bit build
    libertas: fix build
    net: VMware virtual Ethernet NIC driver: vmxnet3
    net: Fix IXP 2000 network driver building.
    libertas: fix build
    mac80211: document ieee80211_rx() context requirement
    ...

    Linus Torvalds
     

15 Oct, 2009

1 commit


14 Oct, 2009

3 commits

  • David S. Miller
     
  • * 'for-linus' of git://git.kernel.dk/linux-2.6-block:
    cciss: Add cciss_allow_hpsa module parameter
    cciss: Fix multiple calls to pci_release_regions
    blk-settings: fix function parameter kernel-doc notation
    writeback: kill space in debugfs item name
    writeback: account IO throttling wait as iowait
    elv_iosched_store(): fix strstrip() misuse
    cfq-iosched: avoid probable slice overrun when idling
    cfq-iosched: apply bool value where we return 0/1
    cfq-iosched: fix think time allowed for seekers
    cfq-iosched: fix the slice residual sign
    cfq-iosched: abstract out the 'may this cfqq dispatch' logic
    block: use proper BLK_RW_ASYNC in blk_queue_start_tag()
    block: Seperate read and write statistics of in_flight requests v2
    block: get rid of kblock_schedule_delayed_work()
    cfq-iosched: fix possible problem with jiffies wraparound
    cfq-iosched: fix issue with rq-rq merging and fifo list ordering

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes:
    kbuild: revert "save ARCH & CROSS_COMPILE ..."
    warn about use of uninstalled kernel headers
    kbuild: mkcompile_h: trivial cleanups
    kbuild: fix warning when domainname is not available
    kbuild: Fix size_append issue for bzip2/lzma kernel
    kbuild,scripts: use non-builtin echo for '-e'
    kbuild: fix the binrpm-pkg target to work with KBUILD_OUTPUT set

    Linus Torvalds
     

13 Oct, 2009

2 commits

  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
    PCI: Prevent AER driver from being loaded on non-root port PCIE devices
    PCI: get larger bridge ranges when space is available
    PCI: pci.c: fix kernel-doc notation
    PCI quirk: TI XIO200a erroneously reports support for fast b2b transfers
    PCI PM: Read device power state from register after updating it
    PCI: remove pci_assign_resource_fixed()
    PCI: PCIe portdrv: remove "-driver" from driver name

    Linus Torvalds
     
  • ieee80211_rx() must be called with softirqs disabled
    since the networking stack requires this for netif_rx()
    and some code in mac80211 can assume that it can not
    be processing its own tasklet and this call at the same
    time.

    It may be possible to remove this requirement after a
    careful audit of mac80211 and doing any needed locking
    improvements in it along with disabling softirqs around
    netif_rx(). An alternative might be to push all packet
    processing to process context in mac80211, instead of
    to the tasklet, and add other synchronisation.

    Signed-off-by: Johannes Berg
    Signed-off-by: John W. Linville

    Johannes Berg
     

12 Oct, 2009

6 commits

  • Since commit a98b65a3 (net: annotate struct sock bitfield), we lost
    8 bytes in struct sock on 64bit arches because of
    kmemcheck_bitfield_end(flags) misplacement.

    Fix this by putting together sk_shutdown, sk_no_check, sk_userlocks,
    sk_protocol and sk_type in the 'flags' 32bits bitfield

    Signed-off-by: Eric Dumazet
    Signed-off-by: David S. Miller

    Eric Dumazet
     
  • User applications frequently hit problems when they try to use
    the kernel headers directly, rather than the exported headers.

    This adds an explicit warning for this case, and points to
    a URL holding an explanation of why this is wrong and what
    to do about it.

    Signed-off-by: Arnd Bergmann
    Signed-off-by: Sam Ravnborg

    Arnd Bergmann
     
  • * 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6: (21 commits)
    [S390] dasd: fix race condition in resume code
    [S390] Add EX_TABLE for addressing exception in usercopy functions.
    [S390] 64-bit register support for 31-bit processes
    [S390] hibernate: Use correct place for CPU address in lowcore
    [S390] pm: ignore time spend in suspended state
    [S390] zcrypt: Improve some comments
    [S390] zcrypt: Fix sparse warning.
    [S390] perf_counter: fix vdso detection
    [S390] ftrace: drop nmi protection
    [S390] compat: fix truncate system call wrapper
    [S390] Provide arch specific mdelay implementation.
    [S390] Fix enabled udelay for short delays.
    [S390] cio: allow setting boxed devices offline
    [S390] cio: make not operational handling consistent
    [S390] cio: make disconnected handling consistent
    [S390] Fix memory leak in /proc/cio_ignore
    [S390] cio: channel path memory leak
    [S390] module: fix memory leak in s390 module loader
    [S390] Enable kmemleak on s390.
    [S390] 3270 console build fix
    ...

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (32 commits)
    USB: serial: no unnecessary GFP_ATOMIC in oti6858
    USB: serial: fix race between unthrottle and completion handler in visor
    USB: serial: fix assumption that throttle/unthrottle cannot sleep
    USB: serial: fix race between unthrottle and completion handler in symbolserial
    USB: serial: fix race between unthrottle and completion handler in opticon
    USB: ehci: Fix isoc scheduling boundary checking.
    USB: storage: When a device returns no sense data, call it a Hardware Error
    USB: small fix in error case of suspend in generic usbserial code
    USB: visor: fix trivial accounting bug in visor driver
    USB: Fix throttling in generic usbserial driver
    USB: cp210x: Add support for the DW700 UART
    USB: ipaq: fix oops when device is plugged in
    USB: isp1362: fix build warnings on 64-bit systems
    USB: gadget: imx_udc: Use resource size
    USB: storage: iRiver P7 UNUSUAL_DEV patch
    USB: musb: make HAVE_CLK support optional
    USB: xhci: Fix dropping endpoints from the xHC schedule.
    USB: xhci: Don't wait for a disable slot cmd when HC dies.
    USB: xhci: Handle canceled URBs when HC dies.
    USB: xhci: Stop debugging polling loop when HC dies.
    ...

    Linus Torvalds
     
  • After m68k's task_thread_info() doesn't refer to current,
    it's possible to remove sched.h from interrupt.h and not break m68k!
    Many thanks to Heiko Carstens for allowing this.

    Signed-off-by: Alexey Dobriyan

    Alexey Dobriyan
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6: (34 commits)
    [SCSI] qla2xxx: Fix NULL ptr deref bug in fail path during queue create
    [SCSI] st: fix possible memory use after free after MTSETBLK ioctl
    [SCSI] be2iscsi: Moving to pci_pools v3
    [SCSI] libiscsi: iscsi_session_setup to allow for private space
    [SCSI] be2iscsi: add 10Gbps iSCSI - BladeEngine 2 driver
    [SCSI] zfcp: Fix hang when offlining device with offline chpid
    [SCSI] zfcp: Fix lockdep warning when offlining device with offline chpid
    [SCSI] zfcp: Fix oops during shutdown of offline device
    [SCSI] zfcp: Fix initial device and cfdc for delayed adapter allocation
    [SCSI] zfcp: correctly initialize unchained requests
    [SCSI] mpt2sas: Bump version 02.100.03.00
    [SCSI] mpt2sas: Support dev remove when phy status is MPI2_EVENT_SAS_TOPO_PHYSTATUS_VACANT
    [SCSI] mpt2sas: Timeout occurred within the HANDSHAKE logic while waiting on firmware to ACK.
    [SCSI] mpt2sas: Call init_completion on a per request basis.
    [SCSI] mpt2sas: Target Reset will be issued from Interrupt context.
    [SCSI] mpt2sas: Added SCSIIO, Internal and high priority memory pools to support multiple TM
    [SCSI] mpt2sas: Copyright change to 2009.
    [SCSI] mpt2sas: Added mpi2_history.txt for MPI2 headers.
    [SCSI] mpt2sas: Update driver to MPI2 REV K headers.
    [SCSI] bfa: Brocade BFA FC SCSI driver
    ...

    Linus Torvalds
     

10 Oct, 2009

3 commits

  • This patch (as1295) fixes a recently-added bug in the USB serial core.
    If certain kinds of errors occur during probing, the core may call a
    serial driver's release method without previously calling the attach
    method. This causes some drivers (io_ti in particular) to perform an
    invalid memory access.

    The patch adds a new flag to keep track of whether or not attach has
    been called.

    Signed-off-by: Alan Stern
    Tested-by: Jean-Denis Girard
    CC: stable
    Signed-off-by: Greg Kroah-Hartman

    Alan Stern
     
  • Since the beginnings in aafe4dbed0bf6cbdb2e9f03e1d42f8a540d8541d
    ("asm-generic: add generic versions of common headers") the generic
    version of defined __softirq_pending as unsigned long.

    Which is different from other architectures for no apparent good reason
    and was causing the following warning:

    kernel/time/tick-sched.c: In function 'tick_nohz_stop_sched_tick':
    kernel/time/tick-sched.c:261: warning: format '%02x' expects type 'unsigned int', but argument 2 has type 'long unsigned int'

    Reported and initial patch by Wu Zhangjin .

    Signed-off-by: Ralf Baechle
    Acked-by: Arnd Bergmann
    [ Arnd points out that we really should make sure parisc and alpha are
    ok with this, since they have also been converted to use the generic
    hardirq.h file. But neither seems to use it, although parisc does
    build a IRQSTAT_SIRQ_PEND #define into asm-offsets - but that also
    appears unused.. - Linus ]
    Signed-off-by: Linus Torvalds

    Ralf Baechle
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
    Input: i8042 - print debug data when testing AUX IRQ delivery
    Input: libps2 - fix dependancy on i8042
    Input: fix rx51 board keymap
    Input: ad7879 - pass up error codes from probe functions
    Input: xpad - add BigBen Interactive XBOX 360 Controller
    Input: rotary_encoder - fix relative axis support
    Input: sparkspkr - move remove() functions to .devexit.text
    Input: wistron_btns - add DMI entry for Medion WIM2030 laptop

    Linus Torvalds
     

09 Oct, 2009

8 commits

  • * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
    pata_atp867x: add Power Management support
    pata_atp867x: PIO support fixes
    pata_atp867x: clarifications in timings calculations and cable detection
    pata_atp867x: fix it to not claim MWDMA support
    libata: fix incorrect link online check during probe
    ahci: filter FPDMA non-zero offset enable for Aspire 3810T
    libata: make gtf_filter per-dev
    libata: implement more acpi filtering options
    libata: cosmetic updates
    ahci: display all AHCI 1.3 HBA capability flags (v2)
    pata_ali: trivial fix of a very frequent spelling mistake
    ahci: disable 64bit DMA by default on SB600s

    Linus Torvalds
     
  • …/git/tip/linux-2.6-tip

    * 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    futex: fix requeue_pi key imbalance
    futex: Fix typo in FUTEX_WAIT/WAKE_BITSET_PRIVATE definitions
    rcu: Place root rcu_node structure in separate lockdep class
    rcu: Make hot-unplugged CPU relinquish its own RCU callbacks
    rcu: Move rcu_barrier() to rcutree
    futex: Move exit_pi_state() call to release_mm()
    futex: Nullify robust lists after cleanup
    futex: Fix locking imbalance
    panic: Fix panic message visibility by calling bust_spinlocks(0) before dying
    rcu: Replace the rcu_barrier enum with pointer to call_rcu*() function
    rcu: Clean up code based on review feedback from Josh Triplett, part 4
    rcu: Clean up code based on review feedback from Josh Triplett, part 3
    rcu: Fix rcu_lock_map build failure on CONFIG_PROVE_LOCKING=y
    rcu: Clean up code to address Ingo's checkpatch feedback
    rcu: Clean up code based on review feedback from Josh Triplett, part 2
    rcu: Clean up code based on review feedback from Josh Triplett

    Linus Torvalds
     
  • …git/tip/linux-2.6-tip

    * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    x86, pci: Correct spelling in a comment
    x86: Simplify bound checks in the MTRR code
    x86: EDAC: carve out AMD MCE decoding logic
    initcalls: Add early_initcall() for modules
    x86: EDAC: MCE: Fix MCE decoding callback logic

    Linus Torvalds
     
  • …nel/git/tip/linux-2.6-tip

    * 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    tracing: user local buffer variable for trace branch tracer
    tracing: fix warning on kernel/trace/trace_branch.c andtrace_hw_branches.c
    ftrace: check for failure for all conversions
    tracing: correct module boundaries for ftrace_release
    tracing: fix transposed numbers of lock_depth and preempt_count
    trace: Fix missing assignment in trace_ctxwake_*
    tracing: Use free_percpu instead of kfree
    tracing: Check total refcount before releasing bufs in profile_enable failure

    Linus Torvalds
     
  • …/linux/kernel/git/tip/linux-2.6-tip

    * 'sparc-perf-events-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    mm, perf_event: Make vmalloc_user() align base kernel virtual address to SHMLBA
    perf_event: Provide vmalloc() based mmap() backing

    Linus Torvalds
     
  • …el/git/tip/linux-2.6-tip

    * 'perf-fixes-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    perf_events: Make ABI definitions available to userspace
    perf tools: elf_sym__is_function() should accept "zero" sized functions
    tracing/syscalls: Use long for syscall ret format and field definitions
    perf trace: Update eval_flag() flags array to match interrupt.h
    perf trace: Remove unused code in builtin-trace.c
    perf: Propagate term signal to child

    Linus Torvalds
     
  • * 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (24 commits)
    drm/radeon/kms: fix vline register for second head.
    drm/r600: avoid assigning vb twice in blit code
    drm/radeon: use list_for_each_entry instead of list_for_each
    drm/radeon/kms: Fix AGP support for R600/RV770 family (v2)
    drm/radeon/kms: Fallback to non AGP when acceleration fails to initialize (v2)
    drm/radeon/kms: Fix RS600/RV515/R520/RS690 IRQ
    drm/radeon: Fix setting of bits
    drm/ttm: fix refcounting in ttm global code.
    drm/fb: add more correct 8/16/24/32 bpp fb support.
    drm/fb: add setcmap and fix 8-bit support.
    drm/radeon/kms: respect single crtc cards, only create one crtc. (v2)
    drm: Delete the DRM_DEBUG_KMS in drm_mode_cursor_ioctl
    drm/radeon/kms: add support for "Surround View"
    drm/radeon/kms: Fix irq handling on AVIVO hw
    drm/radeon/kms: R600/RV770 remove dead code and print message for wrong BIOS
    drm/radeon/kms: Fix R600/RV770 disable acceleration path
    drm/radeon/kms: Fix R600/RV770 startup path & reset
    drm/radeon/kms: Fix R600 write back buffer
    drm/radeon/kms: Remove old init path as no hw use it anymore
    drm/radeon/kms: Convert RS600 to new init path
    ...

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (40 commits)
    ethoc: limit the number of buffers to 128
    ethoc: use system memory as buffer
    ethoc: align received packet to make IP header at word boundary
    ethoc: fix buffer address mapping
    ethoc: fix typo to compute number of tx descriptors
    au1000_eth: Duplicate test of RX_OVERLEN bit in update_rx_stats()
    netxen: Fix Unlikely(x) > y
    pasemi_mac: ethtool get settings fix
    add maintainer for network drop monitor kernel service
    tg3: Fix phylib locking strategy
    rndis_host: support ETHTOOL_GPERMADDR
    ipv4: arp_notify address list bug
    gigaset: add kerneldoc comments
    gigaset: correct debugging output selection
    gigaset: improve error recovery
    gigaset: fix device ERROR response handling
    gigaset: announce if built with debugging
    gigaset: handle isoc frame errors more gracefully
    gigaset: linearize skb
    gigaset: fix reject/hangup handling
    ...

    Linus Torvalds
     

08 Oct, 2009

4 commits


07 Oct, 2009

2 commits

  • Looks like a typo, FUTEX_WAKE_BITS should be FUTEX_WAIT_BITSET.

    Signed-off-by: Anton Blanchard
    LKML-Reference:
    Signed-off-by: Thomas Gleixner

    Anton Blanchard
     
  • Commit a9327cac440be4d8333bba975cbbf76045096275 added seperate read
    and write statistics of in_flight requests. And exported the number
    of read and write requests in progress seperately through sysfs.

    But Corrado Zoccolo reported getting strange
    output from "iostat -kx 2". Global values for service time and
    utilization were garbage. For interval values, utilization was always
    100%, and service time is higher than normal.

    So this was reverted by commit 0f78ab9899e9d6acb09d5465def618704255963b

    The problem was in part_round_stats_single(), I missed the following:
    if (now == part->stamp)
    return;

    - if (part->in_flight) {
    + if (part_in_flight(part)) {
    __part_stat_add(cpu, part, time_in_queue,
    part_in_flight(part) * (now - part->stamp));
    __part_stat_add(cpu, part, io_ticks, (now - part->stamp));

    With this chunk included, the reported regression gets fixed.

    Signed-off-by: Nikanth Karthikesan

    --
    Signed-off-by: Jens Axboe

    Nikanth Karthikesan
     

06 Oct, 2009

6 commits

  • Some architectures such as Sparc, ARM and MIPS (basically
    everything with flush_dcache_page()) need to deal with dcache
    aliases by carefully placing pages in both kernel and user maps.

    These architectures typically have to use vmalloc_user() for this.

    However, on other architectures, vmalloc() is not needed and has
    the downsides of being more restricted and slower than regular
    allocations.

    Signed-off-by: Peter Zijlstra
    Acked-by: David Miller
    Cc: Andrew Morton
    Cc: Jens Axboe
    Cc: Paul Mackerras
    LKML-Reference:
    Signed-off-by: Ingo Molnar

    Peter Zijlstra
     
  • Signed-off-by: Chuck Ebbert
    LKML-Reference:
    Signed-off-by: Ingo Molnar

    Chuck Ebbert
     
  • From: Heiko Carstens
    From: Martin Schwidefsky

    Signed-off-by: Heiko Carstens
    Signed-off-by: Martin Schwidefsky

    Heiko Carstens
     
  • The original driver was written with the KEY() macro defined as (col,
    row) instead of (row, col) as defined by the matrix keypad
    infrastructure. So the keymap was defined accordingly. Since the
    driver that was merged upstream uses the matrix keypad infrastructure,
    modify the keymap accordingly.

    While we are at it, fix the comments in twl4030.h and define
    PERSISTENT_KEY as (r,c) instead of (c, r)

    Tested on a RX51 (N900) device.

    Signed-off-by: Amit Kucheria
    Acked-by: Tony Lindgren
    Signed-off-by: Dmitry Torokhov

    Amit Kucheria
     
  • Add ->gtf_filter to ata_device and set it to ata_acpi_gtf_filter when
    initializing ata_link. This is to allow quirks which apply different
    gtf filters.

    Signed-off-by: Tejun Heo
    Signed-off-by: Jeff Garzik

    Tejun Heo
     
  • Currently libata-acpi can only filter DIPM among SATA feature enables
    via _GTF. This patch adds the capability to filter out FPDMA non-zero
    offset, in-order guarantee and auto-activation.

    Signed-off-by: Tejun Heo
    Signed-off-by: Jeff Garzik

    Tejun Heo