Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
tag: v3.1-rc10

Oct 18, 2011

  1. Linus Torvalds

    Linux 3.1-rc10

    torvalds authored

Oct 17, 2011

  1. Linus Torvalds

    Avoid using variable-length arrays in kernel/sys.c

    The size is always valid, but variable-length arrays generate worse code
    for no good reason (unless the function happens to be inlined and the
    compiler sees the length for the simple constant it is).
    
    Also, there seems to be some code generation problem on POWER, where
    Henrik Bakken reports that register r28 can get corrupted under some
    subtle circumstances (interrupt happening at the wrong time?).  That all
    indicates some seriously broken compiler issues, but since variable
    length arrays are bad regardless, there's little point in trying to
    chase it down.
    
    "Just don't do that, then".
    
    Reported-by: Henrik Grindal Bakken <henribak@cisco.com>
    Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Cc: stable@kernel.org
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    torvalds authored

Oct 16, 2011

  1. Linus Torvalds

    Merge branch 'fixes' of http://ftp.arm.linux.org.uk/pub/linux/arm/ker…

    …nel/git-cur/linux-2.6-arm
    
    * 'fixes' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm:
      ARM: 7128/1: vic: Don't write to the read-only register VIC_IRQ_STATUS
      ARM: 7122/1: localtimer: add header linux/errno.h explicitly
      ARM: 7117/1: perf: fix HW_CACHE_* events on Cortex-A9
      ARM: 7113/1: mm: Align bank start to MAX_ORDER_NR_PAGES
    torvalds authored

Oct 15, 2011

  1. ARM: 7128/1: vic: Don't write to the read-only register VIC_IRQ_STATUS

    This is unneeded and causes an abort on the SPMP8000 platform.
    
    Acked-by: Linus Walleij <linus.walleij@linaro.org>
    Signed-off-by: Zoltan Devai <zoss@devai.org>
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
    Zoltan Devai authored Russell King committed
  2. ARM: 7122/1: localtimer: add header linux/errno.h explicitly

    Per the text in  Documentation/SubmitChecklist as below, we should
    explicitly have header linux/errno.h in localtimer.h for ENXIO
    reference.
    
    1: If you use a facility then #include the file that defines/declares
       that facility.  Don't depend on other header files pulling in ones
       that you use.
    
    Otherwise, we may run into some compiling error like the following one,
    if any file includes localtimer.h without CONFIG_LOCAL_TIMERS defined.
    
      arch/arm/include/asm/localtimer.h: In function ‘local_timer_setup’:
      arch/arm/include/asm/localtimer.h:53:10: error: ‘ENXIO’ undeclared (first use in this function)
    
    Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
    Shawn Guo authored Russell King committed
  3. ARM: 7117/1: perf: fix HW_CACHE_* events on Cortex-A9

    Using COHERENT_LINE_{MISS,HIT} for cache misses and references
    respectively is completely wrong. Instead, use the L1D events which
    are a better and more useful approximation despite ignoring instruction
    traffic.
    
    Reported-by: Alasdair Grant <alasdair.grant@arm.com>
    Reported-by: Matt Horsnell <matt.horsnell@arm.com>
    Reported-by: Michael Williams <michael.williams@arm.com>
    Cc: stable@kernel.org
    Cc: Jean Pihet <j-pihet@ti.com>
    Signed-off-by: Will Deacon <will.deacon@arm.com>
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
    Will Deacon authored Russell King committed

Oct 14, 2011

  1. Linus Torvalds

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

    …kernel/git/groeck/linux-staging
    
    * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
      hwmon: (w83627ehf) Properly report thermal diode sensors
    torvalds authored
  2. Linus Torvalds

    Merge branch 'gpio/merge' of git://git.secretlab.ca/git/linux-2.6

    * 'gpio/merge' of git://git.secretlab.ca/git/linux-2.6:
      gpio-pca953x: fix gpio_base
      gpio/omap: fix build error with certain OMAP1 configs
    torvalds authored
  3. Linus Torvalds

    Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs

    * 'for-linus' of git://oss.sgi.com/xfs/xfs:
      xfs: revert to using a kthread for AIL pushing
      xfs: force the log if we encounter pinned buffers in .iop_pushbuf
      xfs: do not update xa_last_pushed_lsn for locked items
    torvalds authored
  4. Linus Torvalds

    Merge branch 'stable' of git://github.com/cmetcalf-tilera/linux-tile

    * 'stable' of git://github.com/cmetcalf-tilera/linux-tile:
      tile: revert change from <asm/atomic.h> to <linux/atomic.h> in asm files
    torvalds authored
  5. Linus Torvalds

    Merge branch 'x86-urgent-for-linus' of git://tesla.tglx.de/git/linux-…

    …2.6-tip
    
    * 'x86-urgent-for-linus' of git://tesla.tglx.de/git/linux-2.6-tip:
      x86: Default to vsyscall=native for now
    torvalds authored
  6. Mika Westerberg

    x86, mrst: use a temporary variable for SFI irq

    SFI tables reside in RAM and should not be modified once they are
    written.  Current code went to set pentry->irq to zero which causes
    subsequent reads to fail with invalid SFI table checksum.  This will
    break kexec as the second kernel fails to validate SFI tables.
    
    To fix this we use temporary variable for irq number.
    
    Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
    Reviewed-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
    Cc: stable@kernel.org
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    westeri authored torvalds committed

Oct 13, 2011

  1. hwmon: (w83627ehf) Properly report thermal diode sensors

    The w83627ehf driver is improperly reporting thermal diode sensors as
    type 2, instead of 3. This caused "sensors" and possibly other
    monitoring tools to report these sensors as "transistor" instead of
    "thermal diode".
    
    Furthermore, diode subtype selection (CPU vs. external) is only
    supported by the original W83627EHF/EHG. All later models only support
    CPU diode type, and some (NCT6776F) don't even have the register in
    question so we should avoid reading from it.
    
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
    Cc: stable@kernel.org
    Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
    Jean Delvare authored Guenter Roeck committed
  2. gpio-pca953x: fix gpio_base

    gpio_base was set to 0 if no system platform data or open firmware
    platform data was provided. This led to conflicts, if any other gpiochip
    with a gpiobase of 0 was instantiated already. Setting it to -1 will
    automatically use the first one available.
    
    Signed-off-by: Hartmut Knaack <knaack.h@gmx.de>
    Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
    Hartmut Knaack authored Grant Likely committed
  3. gpio/omap: fix build error with certain OMAP1 configs

    With commit f64ad1a, "gpio/omap: cleanup _set_gpio_wakeup(), remove
    ifdefs", access to build time conditionally omitted 'suspend_wakeup'
    member of the 'gpio_bank' structure has been placed unconditionally in
    function _set_gpio_wakeup(), which is always built. This resulted in the
    driver compilation broken for certain OMAP1, i.e., non-OMAP16xx,
    configurations.
    
    Really required or not in previously excluded cases, define this
    structure member unconditionally as a fix.
    
    Tested with a custom OMAP1510 only configuration.
    
    Signed-off-by: Janusz Krzysztofik <jkrzyszt@tis.icnet.pl>
    Acked-by: Kevin Hilman <khilman@ti.com>
    Tested-by: Aaro Koskinen <aaro.koskinen@iki.fi>
    Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
    Janusz Krzysztofik authored Grant Likely committed
  4. cmetcalf-tilera

    tile: revert change from <asm/atomic.h> to <linux/atomic.h> in asm files

    The 32-bit TILEPro support uses some #defines in <asm/atomic_32.h>
    for atomic support routines in assembly.  To make this more explicit,
    I've turned those includes into includes of <asm/atomic_32.h>, which
    should hopefully make it clear that they shouldn't be bombed into
    <linux/atomic.h> in any cleanups.
    
    Signed-off-by: Chris Metcalf <cmetcalf@tilera.com>
    cmetcalf-tilera authored
  5. Linus Torvalds

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

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
      mscan: too much data copied to CAN frame due to 16 bit accesses
      gro: refetch inet6_protos[] after pulling ext headers
      bnx2x: fix cl_id allocation for non-eth clients for NPAR mode
      mlx4_en: fix endianness with blue frame support
    torvalds authored
  6. johfel

    ide: Fix file references in drivers/ide/

    Fix file references in drivers/ide/
    
    There are a lot of file references to now moved or deleted files in the
    whole tree, especially in documentation and Kconfig files.  This patch
    fixes the references in drivers/ide/.
    
    Signed-off-by: Johann Felix Soden <johfel@users.sourceforge.net>
    Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
    Acked-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    johfel authored torvalds committed
  7. Linus Torvalds

    Merge branch 'btrfs-3.0' of git://github.com/chrismason/linux

    * 'btrfs-3.0' of git://github.com/chrismason/linux:
      Btrfs: make sure not to defrag extents past i_size
      Btrfs: fix recursive auto-defrag
    torvalds authored

Oct 11, 2011

  1. xfs: revert to using a kthread for AIL pushing

    Currently we have a few issues with the way the workqueue code is used to
    implement AIL pushing:
    
     - it accidentally uses the same workqueue as the syncer action, and thus
       can be prevented from running if there are enough sync actions active
       in the system.
     - it doesn't use the HIGHPRI flag to queue at the head of the queue of
       work items
    
    At this point I'm not confident enough in getting all the workqueue flags and
    tweaks right to provide a perfectly reliable execution context for AIL
    pushing, which is the most important piece in XFS to make forward progress
    when the log fills.
    
    Revert back to use a kthread per filesystem which fixes all the above issues
    at the cost of having a task struct and stack around for each mounted
    filesystem.  In addition this also gives us much better ways to diagnose
    any issues involving hung AIL pushing and removes a small amount of code.
    
    Signed-off-by: Christoph Hellwig <hch@lst.de>
    Reported-by: Stefan Priebe <s.priebe@profihost.ag>
    Tested-by: Stefan Priebe <s.priebe@profihost.ag>
    Reviewed-by: Dave Chinner <dchinner@redhat.com>
    Signed-off-by: Alex Elder <aelder@sgi.com>
    Christoph Hellwig authored Alex Elder committed
  2. xfs: force the log if we encounter pinned buffers in .iop_pushbuf

    We need to check for pinned buffers even in .iop_pushbuf given that inode
    items flush into the same buffers that may be pinned directly due operations
    on the unlinked inode list operating directly on buffers.  To do this add a
    return value to .iop_pushbuf that tells the AIL push about this and use
    the existing log force mechanisms to unpin it.
    
    Signed-off-by: Christoph Hellwig <hch@lst.de>
    Reported-by: Stefan Priebe <s.priebe@profihost.ag>
    Tested-by: Stefan Priebe <s.priebe@profihost.ag>
    Reviewed-by: Dave Chinner <dchinner@redhat.com>
    Signed-off-by: Alex Elder <aelder@sgi.com>
    Christoph Hellwig authored Alex Elder committed
  3. xfs: do not update xa_last_pushed_lsn for locked items

    If an item was locked we should not update xa_last_pushed_lsn and thus skip
    it when restarting the AIL scan as we need to be able to lock and write it
    out as soon as possible.  Otherwise heavy lock contention might starve AIL
    pushing too easily, especially given the larger backoff once we moved
    xa_last_pushed_lsn all the way to the target lsn.
    
    Signed-off-by: Christoph Hellwig <hch@lst.de>
    Reported-by: Stefan Priebe <s.priebe@profihost.ag>
    Tested-by: Stefan Priebe <s.priebe@profihost.ag>
    Reviewed-by: Dave Chinner <dchinner@redhat.com>
    Signed-off-by: Alex Elder <aelder@sgi.com>
    Christoph Hellwig authored Alex Elder committed
  4. Chris Mason

    Btrfs: make sure not to defrag extents past i_size

    The btrfs file defrag code will loop through the extents and
    force COW on them.  But there is a concurrent truncate in the middle of
    the defrag, it might end up defragging the same range over and over
    again.
    
    The problem is that writepage won't go through and do anything on pages
    past i_size, so the cow won't happen, so the file will appear to still
    be fragmented.  defrag will end up hitting the same extents again and
    again.
    
    In the worst case, the truncate can actually live lock with the defrag
    because the defrag keeps creating new ordered extents which the truncate
    code keeps waiting on.
    
    The fix here is to make defrag check for i_size inside the main loop,
    instead of just once before the looping starts.
    
    Signed-off-by: Chris Mason <chris.mason@oracle.com>
    chrismason-xx authored
  5. AdrianBunk

    x86: Default to vsyscall=native for now

    This UML breakage:
    
      linux-2.6.30.1[3800] vsyscall fault (exploit attempt?) ip:ffffffffff600000 cs:33 sp:7fbfb9c498 ax:ffffffffff600000 si:0 di:606790
      linux-2.6.30.1[3856] vsyscall fault (exploit attempt?) ip:ffffffffff600000 cs:33 sp:7fbfb13168 ax:ffffffffff600000 si:0 di:606790
    
    Is caused by commit 3ae3665 ("x86-64: Rework vsyscall emulation and add
    vsyscall= parameter") - the vsyscall emulation code is not fully cooked
    yet as UML relies on some rather fragile SIGSEGV semantics.
    
    Linus suggested in https://lkml.org/lkml/2011/8/9/376 to default
    to vsyscall=native for now, this patch implements that.
    
    Signed-off-by: Adrian Bunk <bunk@kernel.org>
    Acked-by: Andrew Lutomirski <luto@mit.edu>
    Cc: H. Peter Anvin <hpa@linux.intel.com>
    Link: http://lkml.kernel.org/r/20111005214047.GE14406@localhost.pp.htv.fi
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    AdrianBunk authored Ingo Molnar committed

Oct 10, 2011

  1. Btrfs: fix recursive auto-defrag

    Follow those steps:
    
      # mount -o autodefrag /dev/sda7 /mnt
      # dd if=/dev/urandom of=/mnt/tmp bs=200K count=1
      # sync
      # dd if=/dev/urandom of=/mnt/tmp bs=8K count=1 conv=notrunc
    
    and then it'll go into a loop: writeback -> defrag -> writeback ...
    
    It's because writeback writes [8K, 200K] and then writes [0, 8K].
    
    I tried to make writeback know if the pages are dirtied by defrag,
    but the patch was a bit intrusive. Here I simply set writeback_index
    when we defrag a file.
    
    Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
    Signed-off-by: Chris Mason <chris.mason@oracle.com>
    Li Zefan authored chrismason-xx committed
  2. mscan: too much data copied to CAN frame due to 16 bit accesses

    Due to the 16 bit access to mscan registers there's too much data copied to
    the zero initialized CAN frame when having an odd number of bytes to copy.
    This patch ensures that only the requested bytes are copied by using an
    8 bit access for the remaining byte.
    
    Reported-by: Andre Naujoks <nautsch@gmail.com>
    Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
    Signed-off-by: Wolfgang Grandegger <wg@grandegger.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Wolfgang Grandegger authored davem330 committed
  3. Yan, Zheng

    gro: refetch inet6_protos[] after pulling ext headers

    ipv6_gro_receive() doesn't update the protocol ops after pulling
    the ext headers. It looks like a typo.
    
    Signed-off-by: Zheng Yan <zheng.z.yan@intel.com>
    Acked-by: Eric Dumazet <eric.dumazet@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    ukernel authored davem330 committed
  4. bnx2x: fix cl_id allocation for non-eth clients for NPAR mode

    There are some consolidations of NPAR configuration
    when FCoE and iSCSI L2 clients will get the same id,
    in this case FCoE ring will be non-functional.
    
    Signed-off-by: Dmitry Kravkov <dmitry@broadcom.com>
    Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Dmitry Kravkov authored davem330 committed
  5. mlx4_en: fix endianness with blue frame support

    The doorbell register was being unconditionally swapped. In x86, that
    meant it was being swapped to BE and written to the descriptor and to
    memory, depending on the case of blue frame support or writing to
    doorbell register. On PPC, this meant it was being swapped to LE and
    then swapped back to BE while writing to the register. But in the blue
    frame case, it was being written as LE to the descriptor.
    
    The fix is not to swap doorbell unconditionally, write it to the
    register as BE and convert it to BE when writing it to the descriptor.
    
    Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@linux.vnet.ibm.com>
    Reported-by: Richard Hendrickson <richhend@us.ibm.com>
    Cc: Eli Cohen <eli@dev.mellanox.co.il>
    Cc: Yevgeny Petrilin <yevgenyp@mellanox.co.il>
    Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Thadeu Lima de Souza Cascardo authored davem330 committed
  6. Linus Torvalds

    Merge git://git.samba.org/sfrench/cifs-2.6

    * git://git.samba.org/sfrench/cifs-2.6:
      [CIFS] Fix first time message on mount, ntlmv2 upgrade delayed to 3.2
    torvalds authored
  7. Linus Torvalds

    Merge branch 'fixes' of git://git.linaro.org/people/arnd/arm-soc

    * 'fixes' of git://git.linaro.org/people/arnd/arm-soc:
      ARM: mach-ux500: enable fix for ARM errata 754322
      ARM: OMAP: musb: Remove a redundant omap4430_phy_init call in usb_musb_init
      ARM: OMAP: Fix i2c init for twl4030
      ARM: OMAP4: MMC: fix power and audio issue, decouple USBC1 from MMC1
    torvalds authored
  8. marvintwentyfour

    ARM: tegra: fix compilation error due to mach/hardware.h removal

    This fixes a compilation error in cpu-tegra.c which was introduced in
    dc8d966 ("ARM: convert PCI defines to variables") which removed the
    now obsolete mach/hardware.h from the mach-tegra subtree.
    
    Signed-off-by: Marc Dietrich <marvin24@gmx.de>
    Signed-off-by: Olof Johansson <olof@lixom.net>
    Cc: Sergei Shtylyov <sshtylyov@ru.mvista.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    marvintwentyfour authored torvalds committed
  9. Linus Torvalds

    Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux

    * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
      drm/radeon/kms: use hardcoded dig encoder to transmitter mapping for DCE4.1
      drm/radeon/kms: fix dp_detect handling for DP bridge chips
      drm/radeon/kms: retry aux transactions if there are status flags
    torvalds authored
  10. Olof Johansson

    MAINTAINERS: Update tegra maintainer information

    A couple of changes to the Tegra maintainership setup:
    
    I'm very glad to bring on Stephen Warren on board as a maintainer. The
    work he has done so far is excellent, and the fact that he works for
    Nvidia means he has long-term interest in the platform.
    
    Erik Gilling did an astounding amount of work on getting things up and
    running but has been a silent partner on the maintainership side for a
    while, and is stepping down. Thanks for your contributions so far, Erik.
    
    Finally, update the git URL since I'll take over running the main repo
    for a while.
    
    Overall maintainership model isn't changing much at this time: We'll all
    three review patches as appropriate, and one of us will collect the main
    repo (me at this time).
    
    Signed-off-by: Olof Johansson <olof@lixom.net>
    Cc: Erik Gilling <konkers@android.com>
    Acked-by: Colin Cross <ccross@android.com>
    Acked-by: Stephen Warren <swarren@nvidia.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    olofj authored torvalds committed
  11. Linus Torvalds

    Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-…

    …linus
    
    * 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus: (29 commits)
      MIPS: Call oops_enter, oops_exit in die
      staging/octeon: Software should check the checksum of no tcp/udp packets
      MIPS: Octeon: Enable C0_UserLocal probing.
      MIPS: No branches in delay slots for huge pages in handle_tlbl
      MIPS: Don't clobber CP0_STATUS value for CONFIG_MIPS_MT_SMTC
      MIPS: Octeon: Select CONFIG_HOLES_IN_ZONE
      MIPS: PM: Use struct syscore_ops instead of sysdevs for PM (v2)
      MIPS: Compat: Use 32-bit wrapper for compat_sys_futex.
      MIPS: Do not use EXTRA_CFLAGS
      MIPS: Alchemy: DB1200: Disable cascade IRQ in handler
      SERIAL: Lantiq: Set timeout in uart_port
      MIPS: Lantiq: Fix setting the PCI bus speed on AR9
      MIPS: Lantiq: Fix external interrupt sources
      MIPS: tlbex: Fix build error in R3000 code.
      MIPS: Alchemy: Include Au1100 in PM code.
      MIPS: Alchemy: Fix typo in MAC0 registration
      MIPS: MSP71xx: Fix build error.
      MIPS: Handle __put_user() sleeping.
      MIPS: Allow forced irq threading
      MIPS: i8259: Mark cascade interrupt non-threaded
      ...
    torvalds authored
Something went wrong with that request. Please try again.