Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
tag: v2.6.33-rc5-gi…

Jan 27, 2010

  1. Linus Torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixe…

    …s-2.6
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
      [SCSI] aic79xx: check for non-NULL scb in ahd_handle_nonpkt_busfree
      [SCSI] zfcp: Set hardware timeout as requested by BSG request.
      [SCSI] zfcp: Introduce bsg_timeout callback.
      [SCSI] scsi_transport_fc: Allow LLD to reset FC BSG timeout
      [SCSI] zfcp: add missing compat ptr conversion
      [SCSI] zfcp: Fix linebreak in hba trace
      [SCSI] zfcp: Issue zfcp_fc_wka_port_put after FC CT BSG request
      [SCSI] qla2xxx: Update version number to 8.03.01-k10.
      [SCSI] fc-transport: Use packed modifier for fc_bsg_request structure.
      [SCSI] qla2xxx: Perform fast mailbox read of flash regardless of size nor address alignment.
      [SCSI] qla2xxx: Correct FCP2 recovery handling.
      [SCSI] scsi_lib: Fix bug in completion of bidi commands
      [SCSI] mptsas: Fix issue with chain pools allocation on katmai
      [SCSI] aacraid: fix File System going into read-only mode
      [SCSI] lpfc: fix file permissions
    torvalds authored
  2. Linus Torvalds

    Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6

    * 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
      [S390] fix single stepped svcs with TRACE_IRQFLAGS=y
      [S390] zcrypt: Do not remove coprocessor for error 8/72
      [S390] sclp_vt220: set initial terminal window size
      [S390] use set_current_state in sigsuspend
      [S390] irqflags: add missing types.h include
      [S390] dasd: fix possible NULL pointer errors
    torvalds authored
  3. ickle

    drm/i915: Selectively enable self-reclaim

    Having missed the ENOMEM return via i915_gem_fault(), there are probably
    other paths that I also missed. By not enabling NORETRY by default these
    paths can run the shrinker and take memory from the system (but not from
    our own inactive lists because our shrinker can not run whilst we hold
    the struct mutex) and this may allow the system to survive a little longer
    whilst our drivers consume all available memory.
    
    References:
      OOM killer unexpectedly called with kernel 2.6.32
      http://bugzilla.kernel.org/show_bug.cgi?id=14933
    
    v2: Pass gfp into page mapping.
    v3: Use new read_cache_page_gfp() instead of open-coding.
    
    Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
    Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
    Cc: Hugh Dickins <hugh.dickins@tiscali.co.uk>
    Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
    Cc: Eric Anholt <eric@anholt.net>
    Cc: stable@kernel.org
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    ickle authored torvalds committed
  4. Linus Torvalds

    mm: add new 'read_cache_page_gfp()' helper function

    It's a simplified 'read_cache_page()' which takes a page allocation
    flag, so that different paths can control how aggressive the memory
    allocations are that populate a address space.
    
    In particular, the intel GPU object mapping code wants to be able to do
    a certain amount of own internal memory management by automatically
    shrinking the address space when memory starts getting tight.  This
    allows it to dynamically use different memory allocation policies on a
    per-allocation basis, rather than depend on the (static) address space
    gfp policy.
    
    The actual new function is a one-liner, but re-organizing the helper
    functions to the point where you can do this with a single line of code
    is what most of the patch is all about.
    
    Tested-by: Chris Wilson <chris@chris-wilson.co.uk>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    torvalds authored
  5. Linus Torvalds

    Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/li…

    …nux/kernel/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, msr/cpuid: Pass the number of minors when unregistering MSR and CPUID drivers.
      x86: Remove "x86 CPU features in debugfs" (CONFIG_X86_CPU_DEBUG)
      Revert "x86: ucode-amd: Load ucode-patches once ..."
      x86: Disable HPET MSI on ATI SB700/SB800
      x86: Set hotpluggable nodes in nodes_possible_map
    torvalds authored
  6. Linus Torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
      sparc64: Fix UP build.
    torvalds authored
  7. [S390] fix single stepped svcs with TRACE_IRQFLAGS=y

    If irq flags tracing is enabled the TRACE_IRQS_ON macros expands to
    a function call which clobbers registers %r0-%r5. The macro is used
    in the code path for single stepped system calls. The argument
    registers %r2-%r6 need to be restored from the stack before the system
    call function is called.
    
    Cc: stable@kernel.org
    Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
    Martin Schwidefsky authored Martin Schwidefsky committed
  8. [S390] zcrypt: Do not remove coprocessor for error 8/72

    In a case where the number of the input data is bigger than the
    modulus of the key, the coprocessor adapters will report an 8/72
    error. This case is not caught yet, thus the adapter will be taken
    offline. To prevent this, we return an -EINVAL instead.
    
    Signed-off-by: Felix Beck <felix.beck@de.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
    Felix Beck authored Martin Schwidefsky committed
  9. [S390] sclp_vt220: set initial terminal window size

    When opening a SCLP VT220 terminal, the terminal window size is not
    initialized (defaults to zero).
    Since the SCLP VT220 terminal supports only 80x24, explicitly set
    the window size to prevent (n)curses applications from guessing
    the default setting.
    
    Signed-off-by: Hendrik Brueckner <brueckner@linux.vnet.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
    Hendrik Brueckner authored Martin Schwidefsky committed
  10. [S390] use set_current_state in sigsuspend

    Use set_current_state instead of a direct assignment to set the
    task state of the current process.
    
    Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
    Martin Schwidefsky authored Martin Schwidefsky committed
  11. [S390] irqflags: add missing types.h include

    Add missing types.h include. Otherwise would cause build breakages on
    hw breakpoint support, because of undefined BITS_PER_LONG.
    Also fix up the copyright line and remove the superfluous __KERNEL__
    ifdef.
    
    Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
    Heiko Carstens authored Martin Schwidefsky committed
  12. [S390] dasd: fix possible NULL pointer errors

    Fix possible NULL pointer in DASD messages and correct discipline
    checking.
    
    Signed-off-by: Stefan Haberland <stefan.haberland@de.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
    Stefan Haberland authored Martin Schwidefsky committed
  13. x86, msr/cpuid: Pass the number of minors when unregistering MSR and …

    …CPUID drivers.
    
    Pass the number of minors when unregistering MSR and CPUID drivers.
    
    Reported-by: Dean Nelson <dnelson@redhat.com>
    Signed-off-by: Dean Nelson <dnelson@redhat.com>
    LKML-Reference: <20100127023722.GA22305@sgi.com>
    Signed-off-by: Russ Anderson <rja@sgi.com>
    Signed-off-by: H. Peter Anvin <hpa@zytor.com>
    Russ Anderson authored H. Peter Anvin committed
  14. Greg Kroah-Hartman

    fnctl: f_modown should call write_lock_irqsave/restore

    Commit 7036251 exposed that f_modown()
    should call write_lock_irqsave instead of just write_lock_irq so that
    because a caller could have a spinlock held and it would not be good to
    renable interrupts.
    
    Cc: Eric W. Biederman <ebiederm@xmission.com>
    Cc: Al Viro <viro@ZenIV.linux.org.uk>
    Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
    Cc: Tavis Ormandy <taviso@google.com>
    Cc: stable <stable@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    gregkh authored torvalds committed

Jan 26, 2010

  1. davem330

    sparc64: Fix UP build.

    Can't reference irq_desc[].affinity when !SMP.
    
    Reported-by: Alexander Beregalov <a.beregalov@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    davem330 authored
  2. Linus Torvalds

    Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel…

    …/git/tytso/ext4
    
    * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
      ext4: Drop EXT4_GET_BLOCKS_UPDATE_RESERVE_SPACE flag
      ext4: Fix quota accounting error with fallocate
      ext4: Handle -EDQUOT error on write
    torvalds authored
  3. Linus Torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-wat…

    …chdog
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
      [WATCHDOG] sbc_fitpc2_wdt: fix I/O space access technique.
      [WATCHDOG] ixp2000: Fix build failure caused by missing include
    torvalds authored
  4. Linus Torvalds

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    …/git/tiwai/sound-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
      ASoC: fix a memory-leak in wm8903
      ALSA: hda - add possibility to choose speakers configuration for 4930g
      ALSA: hda - Fix HP T5735 automute
      ALSA: hda - Turn on EAPD only if available for Realtek codecs
      ALSA: hda - Fix parsing pin node 0x21 on ALC259
    torvalds authored
  5. Linus Torvalds

    Merge branch 'kvm-updates/2.6.33' of git://git.kernel.org/pub/scm/vir…

    …t/kvm/kvm
    
    * 'kvm-updates/2.6.33' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
      KVM: x86: Fix leak of free lapic date in kvm_arch_vcpu_init()
      KVM: x86: Fix probable memory leak of vcpu->arch.mce_banks
      KVM: S390: fix potential array overrun in intercept handling
      KVM: fix spurious interrupt with irqfd
      eventfd - allow atomic read and waitqueue remove
      KVM: MMU: bail out pagewalk on kvm_read_guest error
      KVM: properly check max PIC pin in irq route setup
      KVM: only allow one gsi per fd
      KVM: x86: Fix host_mapping_level()
      KVM: powerpc: Show timing option only on embedded
      KVM: Fix race between APIC TMR and IRR
    torvalds authored
  6. Linus Torvalds

    Merge branch 'linux-next' of git://git.infradead.org/ubi-2.6

    * 'linux-next' of git://git.infradead.org/ubi-2.6:
      UBI: fix memory leak in update path
      UBI: add more checks to chdev open
      UBI: initialise update marker
    torvalds authored
  7. Linus Torvalds

    Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/…

    …kernel/git/jdelvare/staging
    
    * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
      hwmon: (fschmd) Fix a memleak on multiple opens of /dev/watchdog
      hwmon: (asus_atk0110) Do not fail if MBIF is missing
      hwmon: (amc6821) Double unlock bug
      hwmon: (smsc47m1) Fix section mismatch
    torvalds authored
  8. Linus Torvalds

    Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    …/git/airlied/drm-2.6
    
    * 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (95 commits)
      drm/radeon/kms: preface warning printk with driver name
      drm/radeon/kms: drop unnecessary printks.
      drm: fix regression in fb blank handling
      drm/radeon/kms: make hibernate work on IGPs
      drm/vmwgfx: Optimize memory footprint for DMA buffers.
      drm/ttm: Allow system memory as a busy placement.
      drm/ttm: Fix race condition in ttm_bo_delayed_delete (v3, final)
      drm/nv50: prevent switching off SOR when in use for DVI-over-DP
      drm/nv50: fail auxch transaction if reply count not what we expect
      drm/nouveau: fix failure path if userspace specifies no valid memtypes
      drm/nouveau: report LVDS as disconnected if lid closed
      drm/radeon/kms: fix legacy get_engine/memory clock
      drm/radeon/kms/atom: atom parser fixes
      drm/radeon/kms: clean up atombios pll code
      drm/radeon/kms: clean up pll struct
      drm/radeon/kms/atom: fix crtc lock ordering
      drm/radeon: r6xx/r7xx possible security issue, system ram access
      drm/radeon/kms: r600/r700 don't test ib if ib initialization fails
      drm/radeon/kms: Forbid creation of framebuffer with no valid GEM object
      drm/radeon/kms: r600 handle irq vector ring overflow
      ...
    torvalds authored
  9. Linus Torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
      sparc64: Fix IRQ ->set_affinity() methods.
      sparc: cpumask_of_node() should handle -1 as a node
      sparc64: Update defconfig.
      sparc: Add missing SW perf fault events.
      sparc64: Fully support both performance counters.
      sparc64: Add perf callchain support.
      sparc: convert to arch_gettimeoffset()
      sparc: leds_resource.end assigned to itself in clock_board_probe()
      sparc32: Fix page_to_phys().
      sparc: Simplify param.h by simply including <asm-generic/param.h>
      sparc32: Update defconfig.
      SPARC: use helpers for rlimits
      sparc: copy_from_user() should not return -EFAULT
    torvalds authored
  10. Linus Torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (42 commits)
      virtio_net: Make delayed refill more reliable
      sfc: Use fixed-size buffers for MCDI NVRAM requests
      sfc: Add workspace for GMAC bug workaround to MCDI MAC_STATS buffer
      tcp_probe: avoid modulus operation and wrap fix
      qlge: Only free resources if they were allocated
      netns xfrm: deal with dst entries in netns
      sky2: revert config space change
      vlan: fix vlan_skb_recv()
      netns xfrm: fix "ip xfrm state|policy count" misreport
      sky2: Enable/disable WOL per hardware device
      net: Fix IPv6 GSO type checks in Intel ethernet drivers
      igb/igbvf: cleanup exception handling in tx_map_adv
      MAINTAINERS: Add Intel igbvf maintainer
      e1000/e1000e: don't use small hardware rx buffers
      fmvj18x_cs: add new id (Panasonic lan & modem card)
      be2net: swap only first 2 fields of mcc_wrb
      Please add support for Microsoft MN-120 PCMCIA network card
      be2net: fix bug in rx page posting
      wimax/i2400m: Add support for more i6x50 SKUs
      e1000e: enhance frame fragment detection
      ...
    torvalds authored
  11. Linus Torvalds

    Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/l…

    …inux/kernel/git/tmlind/linux-omap-2.6
    
    * 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: (25 commits)
      OMAP2/3: DMTIMER: Clear pending interrupts when stopping a timer
      PM debug: Fix warning when no CONFIG_DEBUG_FS
      OMAP3: PM: DSS PM_WKEN to refill DMA
      OMAP: timekeeping: time should not stop during suspend
      OMAP3: PM: Force write last pad config register into save area
      OMAP: omap3_pm_get_suspend_state() error ignored in pwrdm_suspend_get()
      OMAP3: PM: Enable wake-up from McBSP2, 3 and 4 modules
      OMAP3: PM debug: fix build error when !CONFIG_DEBUG_FS
      OMAP3: PM: Removing redundant and potentially dangerous PRCM configration
      OMAP3: Fixed ARM aux ctrl register save/restore
      OMAP3: CPUidle: Fixed timer resolution
      OMAP3: PM: Remove duplicate code blocks
      OMAP3: PM: Disable interrupt controller AUTOIDLE before WFI
      OMAP3: PM: Enable system control module autoidle
      OMAP3: PM: Ack pending interrupts before entering suspend
      omap: Enable GPMC clock in gpmc_init
      OMAP1 clock: fix for "BUG: spinlock lockup on CPU#0"
      OMAP4: clocks: Fix the clksel_rate struct DPLL divs
      OMAP4: PRCM: Fix the base address for CHIRONSS reg defines
      OMAP: dma_chan[lch_head].flag & OMAP_DMA_ACTIVE tested twice in omap_dma_unlink_lch()
      ...
    torvalds authored

Jan 25, 2010

  1. Herbert Xu

    virtio_net: Make delayed refill more reliable

    I have seen RX stalls on a machine that experienced a suspected
    OOM.  After the stall, the RX buffer is empty on the guest side
    and there are exactly 16 entries available on the host side.  As
    the number of entries is less than that required by a maximal
    skb, the host cannot proceed.
    
    The guest did not have a refill job scheduled.
    
    My diagnosis is that an OOM had occured, with the delayed refill
    job scheduled.  The job was able to allocate at least one skb, but
    not enough to overcome the minimum required by the host to proceed.
    
    As the refill job would only reschedule itself if it failed completely
    to allocate any skbs, this would lead to an RX stall.
    
    The following patch removes this stall possibility by always
    rescheduling the refill job until the ring is totally refilled.
    
    Testing has shown that the RX stall no longer occurs whereas
    previously it would occur within a day.
    
    Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
    Acked-by: Rusty Russell <rusty@rustcorp.com.au>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    herbertx authored davem330 committed
  2. sfc: Use fixed-size buffers for MCDI NVRAM requests

    The low-level MCDI code always uses 32-bit MMIO operations, and
    callers must pad input and output buffers to multiples of 4 bytes.
    The MCDI NVRAM functions are not doing this.  Also, their buffers are
    declared as variable-length arrays with no explicit maximum length.
    
    Switch to a fixed buffer size based on the chunk size used by the
    MTD driver (which is a multiple of 4).
    
    Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Ben Hutchings authored davem330 committed
  3. sfc: Add workspace for GMAC bug workaround to MCDI MAC_STATS buffer

    Due to a hardware bug in the SFC9000 family, the firmware must
    transfer raw GMAC statistics to host memory before aggregating them
    into the cooked (speed-independent) MAC statistics.  Extend the stats
    buffer to support this.
    
    The length of the buffer is explicit in the MAC_STATS command, so this
    change is backward-compatible on both sides.
    
    Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Guido Barzini authored davem330 committed
  4. tcp_probe: avoid modulus operation and wrap fix

    By rounding up the buffer size to power of 2, several expensive
    modulus operations can be avoided.  This patch also solves a bug where
    the gap need when ring gets full was not being accounted for.
    
    Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Stephen Hemminger authored davem330 committed
  5. qlge: Only free resources if they were allocated

    Currently qlge tries to release regions even if they were not allocated.
    This causes messages like the following in the kernel log
    
    Trying to free nonexistent resource <00000000006af400-00000000006af4ff>
    Trying to free nonexistent resource <00003c04ff9f4000-00003c04ff9f7fff>
    Trying to free nonexistent resource <00003c04ffc00000-00003c04ffcfffff>
    
    This patch fixes the goto logic in order to not release the resources
    if they were not allocated.
    
    Signed-off-by: Breno Leitao <leitao@linux.vnet.ibm.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Breno Leitao authored davem330 committed
  6. [WATCHDOG] sbc_fitpc2_wdt: fix I/O space access technique.

    The mdelay function was used between I/O access commands, that causes peak
    in CPU usage. Fix it by substitution mdelay to msleep.
    
    Expand usage on fitPC2 compatible boards according to DMI identification.
    
    Signed-off-by: Denis Turischev <denis@compulab.co.il>
    Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
    Denis Turischev authored Wim Van Sebroeck committed
  7. Takashi Iwai

    Merge branch 'fix/hda' into for-linus

    tiwai authored
  8. lyakh

    ASoC: fix a memory-leak in wm8903

    Remember to free the temporary register-cache.
    
    Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
    Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
    Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
    Cc: stable@kernel.org
    lyakh authored broonie committed
  9. KVM: x86: Fix leak of free lapic date in kvm_arch_vcpu_init()

    In function kvm_arch_vcpu_init(), if the memory malloc for
    vcpu->arch.mce_banks is fail, it does not free the memory
    of lapic date. This patch fixed it.
    
    Cc: stable@kernel.org
    Signed-off-by: Wei Yongjun <yjwei@cn.fujitsu.com>
    Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
    Wei Yongjun authored Marcelo Tosatti committed
  10. KVM: x86: Fix probable memory leak of vcpu->arch.mce_banks

    vcpu->arch.mce_banks is malloc in kvm_arch_vcpu_init(), but
    never free in any place, this may cause memory leak. So this
    patch fixed to free it in kvm_arch_vcpu_uninit().
    
    Cc: stable@kernel.org
    Signed-off-by: Wei Yongjun <yjwei@cn.fujitsu.com>
    Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
    Wei Yongjun authored Marcelo Tosatti committed
Something went wrong with that request. Please try again.