Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
tag: v3.1-rc3

Aug 22, 2011

  1. Linus Torvalds

    Linux 3.1-rc3

    torvalds authored
  2. Linus Torvalds

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

    …linux/kernel/git/tip/linux-2.6-tip
    
    * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      perf tools: Add group event scheduling option to perf record/stat
      MAINTAINERS: Fix list of perf events source files
      perf tools: Fix build against newer glibc
      perf tools: Fix error handling of unknown events
      perf evlist: Fix missing event name init for default event
      perf list: Fix exit value
    torvalds authored
  3. Linus Torvalds

    Merge branch 'stable/bug.fixes' of git://git.kernel.org/pub/scm/linux…

    …/kernel/git/konrad/xen
    
    * 'stable/bug.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
      xen/tracing: Fix tracing config option properly
      xen: Do not enable PV IPIs when vector callback not present
      xen/x86: replace order-based range checking of M2P table by linear one
      xen: xen-selfballoon.c needs more header files
    torvalds authored
  4. xen/tracing: Fix tracing config option properly

    Steven Rostedt says we should use CONFIG_EVENT_TRACING.
    
    Cc:Steven Rostedt <rostedt@goodmis.org>
    Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
    Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
    Jeremy Fitzhardinge authored Konrad Rzeszutek Wilk committed
  5. sstabellini

    xen: Do not enable PV IPIs when vector callback not present

    Fix regression for HVM case on older (<4.1.1) hypervisors caused by
    
      commit 99bbb3a
      Author: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
      Date:   Thu Dec 2 17:55:10 2010 +0000
    
        xen: PV on HVM: support PV spinlocks and IPIs
    
    This change replaced the SMP operations with event based handlers without
    taking into account that this only works when the hypervisor supports
    callback vectors. This causes unexplainable hangs early on boot for
    HVM guests with more than one CPU.
    
    BugLink: http://bugs.launchpad.net/bugs/791850
    
    CC: stable@kernel.org
    Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
    Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
    Tested-and-Reported-by: Stefan Bader <stefan.bader@canonical.com>
    Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
    sstabellini authored Konrad Rzeszutek Wilk committed
  6. Linus Torvalds

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

    …/ieee1394/linux1394-2.6
    
    * 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
      firewire: core: handle ack_busy when fetching the Config ROM
    torvalds authored

Aug 21, 2011

  1. Btrfs: fix 64 bit divide problem

    This fixes a regression introduced by commit cdcb725 ("Btrfs: check
    if there is enough space for balancing smarter").  We can't do 64-bit
    divides on 32-bit architectures.
    
    In cases where we need to divide/multiply by 2 we should just left/right
    shift respectively, and in cases where theres N number of devices use
    do_div.  Also make the counters u64 to match up with rw_devices.
    Thanks,
    
    Signed-off-by: Josef Bacik <josef@redhat.com>
    Acked-and-tested-by: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Josef Bacik authored torvalds committed
  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: flush any pending end_io requests before DIO reads w/dioread_nolock
      ext4: fix nomblk_io_submit option so it correctly converts uninit blocks
      ext4: Resolve the hang of direct i/o read in handling EXT4_IO_END_UNWRITTEN.
      ext4: call ext4_ioend_wait and ext4_flush_completed_IO in ext4_evict_inode
      ext4: Fix ext4_should_writeback_data() for no-journal mode
    torvalds authored
  3. 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:
      ALSA: sound/aoa/fabrics/layout.c: remove unneeded kfree
      ALSA: hda - Fix error check from snd_hda_get_conn_index() in patch_cirrus.c
      ALSA: hda - Don't spew too many ELD errors
      ALSA: usb-audio - Fix missing mixer dB information
      ALSA: hda - Add "PCM" volume to vmaster slave list
      ALSA: hda - Fix duplicated capture-volume creation for ALC268 models
      ALSA: ac97: Add HP Compaq dc5100 SFF(PT003AW) to Headphone Jack Sense whitelist
      ALSA: snd_usb_caiaq: track submitted output urbs
    torvalds authored
  4. pci: fix new kernel-doc warning in pci.c

    Fix new kernel-doc warning in pci.c:
    
      Warning(drivers/pci/pci.c:3259): No description found for parameter 'mps'
      Warning(drivers/pci/pci.c:3259): Excess function parameter 'rq' description in 'pcie_set_mps'
    
    Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
    Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Randy Dunlap authored torvalds committed

Aug 20, 2011

  1. JuliaLawall

    ALSA: sound/aoa/fabrics/layout.c: remove unneeded kfree

    The label outnodev is only used when kzalloc has not yet taken place or has
    failed, so there is no need for the call for kfree under this label.
    
    A simplified version of the semantic match that finds this problem is as
    follows: (http://coccinelle.lip6.fr/)
    
    // <smpl>
    @@
    identifier x;
    expression E1!=0,E2,E3,E4;
    statement S;
    iterator I;
    @@
    
    (
    if (...) { ... when != kfree(x)
                   when != x = E3
                   when != E3 = x
    *  return ...;
     }
    ... when != x = E2
        when != I(...,x,...) S
    if (...) { ... when != x = E4
     kfree(x); ... return ...; }
    )
    // </smpl>
    
    Signed-off-by: Julia Lawall <julia@diku.dk>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
    JuliaLawall authored tiwai committed
  2. Takashi Iwai

    ALSA: hda - Fix error check from snd_hda_get_conn_index() in patch_ci…

    …rrus.c
    
    snd_hda_get_conn_index() returns a negative value while the current code
    stores it in an unsigned int.  It must be stored in a signed integer.
    
    Reported-by: Jesper Juhl <jj@chaosbits.net>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
    tiwai authored
  3. Takashi Iwai

    ALSA: hda - Don't spew too many ELD errors

    Currently HD-audio driver shows the all error ELD byte as an error
    in the kernel message.  This is annoying when the video driver doesn't
    set the correct ELD from the beginning. e.g. radeon sends a zero-byte
    data, but we still check ELD with the fixed 128 byte as a workaround
    for some broken devices, it spews 128-times errors.
    
    For avoiding this, the driver aborts reading when the first byte is
    invalid.  In such a case, the whole data is certainly invalid.
    
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
    tiwai authored
  4. Linus Torvalds

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

    …/git/jbarnes/drm-intel
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/drm-intel:
      drm/i915: set GFX_MODE to pre-Ivybridge default value even on Ivybridge
    torvalds authored

Aug 19, 2011

  1. ext4: flush any pending end_io requests before DIO reads w/dioread_no…

    …lock
    
    There is a race between ext4 buffer write and direct_IO read with
    dioread_nolock mount option enabled. The problem is that we clear
    PageWriteback flag during end_io time but will do
    uninitialized-to-initialized extent conversion later with dioread_nolock.
    If an O_direct read request comes in during this period, ext4 will return
    zero instead of the recently written data.
    
    This patch checks whether there are any pending uninitialized-to-initialized
    extent conversion requests before doing O_direct read to close the race.
    Note that this is just a bandaid fix. The fundamental issue is that we
    clear PageWriteback flag before we really complete an IO, which is
    problem-prone. To fix the fundamental issue, we may need to implement an
    extent tree cache that we can use to look up pending to-be-converted extents.
    
    Signed-off-by: Jiaying Zhang <jiayingz@google.com>
    Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
    Cc: stable@kernel.org
    Jiaying Zhang authored tytso committed
  2. drm/i915: set GFX_MODE to pre-Ivybridge default value even on Ivybridge

    Prior to Ivybridge, the GFX_MODE would default to 0x800, meaning that
    MI_FLUSH would flush the TLBs in addition to the rest of the caches
    indicated in the MI_FLUSH command.  However starting with Ivybridge, the
    register defaults to 0x2800 out of reset, meaning that to invalidate the
    TLB we need to use PIPE_CONTROL.  Since we're not doing that yet, go
    back to the old default so things work.
    
    v2: don't forget to actually *clear* the new bit
    
    Reviewed-by: Eric Anholt <eric@anholt.net>
    Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
    Tested-by: Kenneth Graunke <kenneth@whitecape.org>
    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
    Jesse Barnes authored
  3. Linus Torvalds

    Merge branch 'for-linus' of git://git.kernel.dk/linux-block

    * 'for-linus' of git://git.kernel.dk/linux-block: (23 commits)
      Revert "cfq: Remove special treatment for metadata rqs."
      block: fix flush machinery for stacking drivers with differring flush flags
      block: improve rq_affinity placement
      blktrace: add FLUSH/FUA support
      Move some REQ flags to the common bio/request area
      allow blk_flush_policy to return REQ_FSEQ_DATA independent of *FLUSH
      xen/blkback: Make description more obvious.
      cfq-iosched: Add documentation about idling
      block: Make rq_affinity = 1 work as expected
      block: swim3: fix unterminated of_device_id table
      block/genhd.c: remove useless cast in diskstats_show()
      drivers/cdrom/cdrom.c: relax check on dvd manufacturer value
      drivers/block/drbd/drbd_nl.c: use bitmap_parse instead of __bitmap_parse
      bsg-lib: add module.h include
      cfq-iosched: Reduce linked group count upon group destruction
      blk-throttle: correctly determine sync bio
      loop: fix deadlock when sysfs and LOOP_CLR_FD race against each other
      loop: add BLK_DEV_LOOP_MIN_COUNT=%i to allow distros 0 pre-allocated loop devices
      loop: add management interface for on-demand device allocation
      loop: replace linked list of allocated devices with an idr index
      ...
    torvalds authored
  4. Linus Torvalds

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

    …/git/jbarnes/pci-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
      PCI: OF: Don't crash when bridge parent is NULL.
      PCI: export pcie_bus_configure_settings symbol
      PCI: code and comments cleanup
      PCI: make cardbus-bridge resources optional
      PCI: make SRIOV resources optional
      PCI : ability to relocate assigned pci-resources
      PCI: honor child buses add_size in hot plug configuration
      PCI: Set PCI-E Max Payload Size on fabric
    torvalds authored
  5. PCI: OF: Don't crash when bridge parent is NULL.

    In pcibios_get_phb_of_node(), we will crash while booting if
    bus->bridge->parent is NULL.
    
    Check for this case and avoid dereferencing the NULL pointer.
    
    Signed-off-by: David Daney <david.daney@cavium.com>
    Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Acked-by: Grant Likely <grant.likely@secretlab.ca>
    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
    David Daney authored Jesse Barnes committed
  6. Revert "cfq: Remove special treatment for metadata rqs."

    We have a kernel build regression since 3.1-rc1, which is about 10%
    regression. The kernel source is in an ext3 filesystem.
    Alex Shi bisect it to commit:
    commit a07405b
    Author: Justin TerAvest <teravest@google.com>
    Date:   Sun Jul 10 22:09:19 2011 +0200
    
        cfq: Remove special treatment for metadata rqs.
    
    Apparently this is caused by lack metadata preemption, where ext3/ext4
    do use READ_META. I didn't see a way to fix the issue, so suggest
    reverting the patch.
    
    This reverts commit a07405b.
    
    Reported-by: Alex Shi<alex.shi@intel.com>
    Reported-by: Shaohua Li<shaohua.li@intel.com>
    Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
    Jens Axboe authored
  7. Takashi Iwai

    ALSA: usb-audio - Fix missing mixer dB information

    The recent fix for testing dB range at the mixer creation time seems
    to cause regressions in some devices.  In such devices, reading the dB
    info at probing time gives an error, thus both dBmin and dBmax are still
    zero, and TLV flag isn't set although the later read of dB info succeeds.
    
    This patch adds a workaround for such a case by assuming that the later
    read will succeed.  In future, a similar test should be performed in a
    case where a wrong dB range is seen even in the later read.
    
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
    Cc: <stable@kernel.org>
    tiwai authored
  8. Linus Torvalds

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

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
      sparc: fix array bounds error setting up PCIC NMI trap
    torvalds authored
  9. Linus Torvalds

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

    …ernel/git/jgarzik/libata-dev
    
    * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
      drivers/ata/sata_dwc_460ex.c: add missing kfree
      ata: Add iMX pata support
      pata_via: disable ATAPI DMA on AVERATEC 3200
      [libata] sata_sil: fix used-uninit warning
    torvalds authored
  10. Linus Torvalds

    Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/l…

    …inux-nfs
    
    * 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
      NFSv4.1: Return NFS4ERR_BADSESSION to callbacks during session resets
      NFSv4.1: Fix the callback 'highest_used_slotid' behaviour
      pnfs-obj: Fix the comp_index != 0 case
      pnfs-obj: Bug when we are running out of bio
      nfs: add missing prefetch.h include
    torvalds authored
  11. sparc: fix array bounds error setting up PCIC NMI trap

      CC      arch/sparc/kernel/pcic.o
    arch/sparc/kernel/pcic.c: In function 'pcic_probe':
    arch/sparc/kernel/pcic.c:359:33: error: array subscript is above array bounds [-Werror=array-bounds]
    arch/sparc/kernel/pcic.c:359:8: error: array subscript is above array bounds [-Werror=array-bounds]
    arch/sparc/kernel/pcic.c:360:33: error: array subscript is above array bounds [-Werror=array-bounds]
    arch/sparc/kernel/pcic.c:360:8: error: array subscript is above array bounds [-Werror=array-bounds]
    arch/sparc/kernel/pcic.c:361:33: error: array subscript is above array bounds [-Werror=array-bounds]
    arch/sparc/kernel/pcic.c:361:8: error: array subscript is above array bounds [-Werror=array-bounds]
    cc1: all warnings being treated as errors
    
    I'm not particularly familiar with sparc but t_nmi (defined in head_32.S via
    the TRAP_ENTRY macro) and pcic_nmi_trap_patch (defined in entry.S) both appear
    to be 4 instructions long and I presume from the usage that instructions are
    int sized.
    
    Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
    Cc: "David S. Miller" <davem@davemloft.net>
    Cc: sparclinux@vger.kernel.org
    Reviewed-by: Sam Ravnborg <sam@ravnborg.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Ian Campbell authored davem330 committed
  12. JuliaLawall

    drivers/ata/sata_dwc_460ex.c: add missing kfree

    Currently, error handling code in this function calls the function
    sata_dwc_port_stop, but this function has essentially no effect if hsdevp
    has not been stored in ap, which is the case throughout this function.  The
    only effect is to print a debugging message including ap->print_id.
    
    The code is rewritten to not call sata_dwc_port_stop, but instead to jump
    to a local label that prints the original error message and the print_id
    information.  In the case where hsdevp has been already allocated (but not
    yet stored in ap), this value is freed as well.
    
    A simplified version of the semantic match that finds this problem is as
    follows: (http://coccinelle.lip6.fr/)
    
    // <smpl>
    @exists@
    local idexpression x;
    statement S,S1;
    expression E;
    identifier fl;
    expression *ptr != NULL;
    @@
    
    x = \(kmalloc\|kzalloc\|kcalloc\)(...);
    ...
    if (x == NULL) S
    <... when != x
         when != if (...) { <+...kfree(x)...+> }
         when any
         when != true x == NULL
    x->fl
    ...>
    (
    if (x == NULL) S1
    |
    if (...) { ... when != x
                   when forall
    (
     return \(0\|<+...x...+>\|ptr\);
    |
    * return ...;
    )
    }
    )
    // </smpl>
    
    Signed-off-by: Julia Lawall <julia@diku.dk>
    Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
    JuliaLawall authored Jeff Garzik committed
  13. rtp

    ata: Add iMX pata support

    Add basic support for pata on iMX. It has been tested only on imx51.
    SDMA support will probably be added later so this version supports only
    PIO.
    
    v2:
      - enable only when needed IORDY
      - use dev_get_drvdata
    v3:
      - add missing clk_put() calls
      - use platform_get_irq()
      - fix resume code to avoid disabling IORDY on resume
    v4:
      - Remove EXPERIMENTAL and switch to depends on ARCH_MXC
      - Use devm_kzalloc()
      - make clock a must-have
      - Use only 1 ioremap
    
    Signed-off-by: Arnaud Patard <arnaud.patard@rtp-net.org>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
    thertp authored Jeff Garzik committed
  14. pata_via: disable ATAPI DMA on AVERATEC 3200

    On AVERATEC 3200, pata_via causes memory corruption with ATAPI DMA,
    which often leads to random kernel oops.  The cause of the problem is
    not well understood yet and only small subset of machines using the
    controller seem affected.  Blacklist ATAPI DMA on the machine.
    
    Signed-off-by: Tejun Heo <tj@kernel.org>
    Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=11426
    Reported-and-tested-by: Jim Bray <jimsantelmo@gmail.com>
    Cc: Alan Cox <alan@linux.intel.com>
    Cc: stable@kernel.org
    Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
    Tejun Heo authored Jeff Garzik committed
  15. [libata] sata_sil: fix used-uninit warning

    Init 'serror' to silence the following warning:
    
    drivers/ata/sata_sil.c: In function ‘sil_interrupt’:
    drivers/ata/sata_sil.c:453:14: warning: ‘serror’ may be used uninitialized in
    this function [-Wuninitialized]
    
    This is not a 'can never happen' but is nonetheless extremely unlikely.
    The easiest and cleanest warning fix is simply to init the var,
    rather than worry about marking the var uninit-ok.
    
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
    Jeff Garzik authored Jeff Garzik committed

Aug 18, 2011

  1. Linus Torvalds

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

    …/git/mason/btrfs-unstable
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
      Btrfs: set i_size properly when fallocating and we already
      btrfs: unlock on error in btrfs_file_llseek()
      btrfs: btrfs_permission's RO check shouldn't apply to device nodes
      Btrfs: truncate pages from clone ioctl target range
      Btrfs: fix uninitialized sync_pending
      Btrfs: fix wrong free space information
      btrfs: memory leak in btrfs_add_inode_defrag()
      Btrfs: use plain page_address() in header fields setget functions
      Btrfs: forced readonly when btrfs_drop_snapshot() fails
      Btrfs: check if there is enough space for balancing smarter
      Btrfs: fix a bug of balance on full multi-disk partitions
      Btrfs: fix an oops of log replay
      Btrfs: detect wether a device supports discard
      Btrfs: force unplugs when switching from high to regular priority bios
    torvalds authored
  2. Linus Torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6

    * git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
      update cifs version to 1.75
      [CIFS] possible memory corruption on mount
      cifs: demote cERROR in build_path_from_dentry to cFYI
    torvalds authored
  3. Linus Torvalds

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

    …/git/roland/infiniband
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
      IB/iser: Support iSCSI PDU padding
      IBiser: Fix wrong mask when sizeof (dma_addr_t) > sizeof (unsigned long)
      IPoIB: Fix possible NULL dereference in ipoib_start_xmit()
    torvalds authored
  4. Linus Torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/hirofumi/fatfs-2.6

    * git://git.kernel.org/pub/scm/linux/kernel/git/hirofumi/fatfs-2.6:
      fat: fat16 support maximum 4GB file/vol size as WinXP or 7.
      fat: fix utf8 iocharset warning message
      fat: fix build warning
    torvalds authored
  5. irqdesc: fix new kernel-doc warning

    Fix kernel-doc warning in irqdesc.c:
    
      Warning(kernel/irq/irqdesc.c:353): No description found for parameter 'owner'
    
    Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Randy Dunlap authored torvalds committed
  6. minipli

    i7core_edac: fixed typo in error count calculation

    Based on a patch from the PaX Team, found during a clang analysis pass.
    
    Signed-off-by: Mathias Krause <minipli@googlemail.com>
    Acked-by: Mauro Carvalho Chehab <mchehab@redhat.com>
    Cc: PaX Team <pageexec@freemail.hu>
    Cc: stable@kernel.org [v2.6.35+]
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    minipli authored torvalds committed
Something went wrong with that request. Please try again.