1. 31 Jul, 2012 18 commits
  2. 28 Jul, 2012 3 commits
    • Linus Torvalds's avatar
      Merge branch 'i2c-embedded/for-next' of git://git.pengutronix.de/git/wsa/linux · a410963b
      Linus Torvalds authored
      Pull embedded i2c changes from Wolfram Sang:
       "Changes for the "embedded" part of the I2C subsystem:
      
         - lots of devicetree conversions of drivers (and preparations for
           that)
         - big cleanups for drivers for OMAP, Tegra, Nomadik, Blackfin
         - Rafael's struct dev_pm_ops conversion patches for I2C
         - usual driver cleanups and fixes
      
        All patches have been in linux-next for an apropriate time and all
        patches touching files outside of i2c-folders should have proper acks
        from the maintainers."
      
      * 'i2c-embedded/for-next' of git://git.pengutronix.de/git/wsa/linux: (60 commits)
        Revert "i2c: tegra: convert normal suspend/resume to *_noirq"
        I2C: MV64XYZ: Add Device Tree support
        i2c: stu300: use devm managed resources
        i2c: i2c-ocores: support for 16bit and 32bit IO
        V4L/DVB: mfd: use reg_shift instead of regstep
        i2c: i2c-ocores: Use reg-shift property
        i2c: i2c-ocores: DT bindings and minor fixes.
        i2c: mv64xxxx: remove EXPERIMENTAL tag
        i2c-s3c2410: Use plain pm_runtime_put()
        i2c: s3c2410: Fix pointer type passed to of_match_node()
        i2c: mxs: Set I2C timing registers for mxs-i2c
        i2c: i2c-bfin-twi: Move blackfin TWI register access Macro to head file.
        i2c: i2c-bfin-twi: Move TWI peripheral pin request array to platform data.
        i2c:i2c-bfin-twi: include twi head file
        i2c:i2c-bfin-twi: TWI fails to restart next transfer in high system load.
        i2c: i2c-bfin-twi: Tighten condition when failing I2C transfer if MEN bit is reset unexpectedly.
        i2c: i2c-bfin-twi: Break dead waiting loop if i2c device misbehaves.
        i2c: i2c-bfin-twi: Improve the patch for bug "Illegal i2c bus lock upon certain transfer scenarios".
        i2c: i2c-bfin-twi: Illegal i2c bus lock upon certain transfer scenarios.
        i2c-mv64xxxx: allow more than one driver instance
        ...
      
      Conflicts:
      	drivers/i2c/busses/i2c-nomadik.c
      a410963b
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · f7da9cdf
      Linus Torvalds authored
      Pull networking fixes from David Miller:
       "Several bug fixes, some to new features appearing in this merge
        window, some that have been around for a while.
      
        I have a short list of known problems that need to be sorted out, but
        all of them can be solved easily during the run up to 3.6-final.
      
        I'll be offline until Sunday afternoon, but nothing need hold up
        3.6-rc1 and the close of the merge window, networking wise, at this
        point.
      
        1) Fix interface check in ipv4 TCP early demux, from Eric Dumazet.
      
        2) Fix a long standing bug in TCP DMA to userspace offload that can
           hang applications using MSG_TRUNC, from Jiri Kosina.
      
        3) Don't allow TCP_USER_TIMEOUT to be negative, from Hangbin Liu.
      
        4) Don't use GFP_KERNEL under spinlock in kaweth driver, from Dan
           Carpenter"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
        tcp: perform DMA to userspace only if there is a task waiting for it
        Revert "openvswitch: potential NULL deref in sample()"
        ipv4: fix TCP early demux
        net: fix rtnetlink IFF_PROMISC and IFF_ALLMULTI handling
        USB: kaweth.c: use GFP_ATOMIC under spin_lock
        tcp: Add TCP_USER_TIMEOUT negative value check
        bcma: add missing iounmap on error path
        bcma: fix regression in interrupt assignment on mips
        mac80211_hwsim: fix possible race condition in usage of info->control.sta & control.vif
      f7da9cdf
    • Linus Torvalds's avatar
      Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 · 173f8654
      Linus Torvalds authored
      Pull ext4 updates from Ted Ts'o:
       "The usual collection of bug fixes and optimizations.  Perhaps of
        greatest note is a speed up for parallel, non-allocating DIO writes,
        since we no longer take the i_mutex lock in that case.
      
        For bug fixes, we fix an incorrect overhead calculation which caused
        slightly incorrect results for df(1) and statfs(2).  We also fixed
        bugs in the metadata checksum feature."
      
      * tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: (23 commits)
        ext4: undo ext4_calc_metadata_amount if we fail to claim space
        ext4: don't let i_reserved_meta_blocks go negative
        ext4: fix hole punch failure when depth is greater than 0
        ext4: remove unnecessary argument from __ext4_handle_dirty_metadata()
        ext4: weed out ext4_write_super
        ext4: remove unnecessary superblock dirtying
        ext4: convert last user of ext4_mark_super_dirty() to ext4_handle_dirty_super()
        ext4: remove useless marking of superblock dirty
        ext4: fix ext4 mismerge back in January
        ext4: remove dynamic array size in ext4_chksum()
        ext4: remove unused variable in ext4_update_super()
        ext4: make quota as first class supported feature
        ext4: don't take the i_mutex lock when doing DIO overwrites
        ext4: add a new nolock flag in ext4_map_blocks
        ext4: split ext4_file_write into buffered IO and direct IO
        ext4: remove an unused statement in ext4_mb_get_buddy_page_lock()
        ext4: fix out-of-date comments in extents.c
        ext4: use s_csum_seed instead of i_csum_seed for xattr block
        ext4: use proper csum calculation in ext4_rename
        ext4: fix overhead calculation used by ext4_statfs()
        ...
      173f8654
  3. 27 Jul, 2012 19 commits
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm · cea8f46c
      Linus Torvalds authored
      Pull ARM updates from Russell King:
       "First ARM push of this merge window, post me coming back from holiday.
        This is what has been in linux-next for the last few weeks.  Not much
        to say which isn't described by the commit summaries."
      
      * 'for-linus' of git://git.linaro.org/people/rmk/linux-arm: (32 commits)
        ARM: 7463/1: topology: Update cpu_power according to DT information
        ARM: 7462/1: topology: factorize the update of sibling masks
        ARM: 7461/1: topology: Add arch_scale_freq_power function
        ARM: 7456/1: ptrace: provide separate functions for tracing syscall {entry,exit}
        ARM: 7455/1: audit: move syscall auditing until after ptrace SIGTRAP handling
        ARM: 7454/1: entry: don't bother with syscall tracing on ret_from_fork path
        ARM: 7453/1: audit: only allow syscall auditing for pure EABI userspace
        ARM: 7452/1: delay: allow timer-based delay implementation to be selected
        ARM: 7451/1: arch timer: implement read_current_timer and get_cycles
        ARM: 7450/1: dcache: select DCACHE_WORD_ACCESS for little-endian ARMv6+ CPUs
        ARM: 7449/1: use generic strnlen_user and strncpy_from_user functions
        ARM: 7448/1: perf: remove arm_perf_pmu_ids global enumeration
        ARM: 7447/1: rwlocks: remove unused branch labels from trylock routines
        ARM: 7446/1: spinlock: use ticket algorithm for ARMv6+ locking implementation
        ARM: 7445/1: mm: update CONTEXTIDR register to contain PID of current process
        ARM: 7444/1: kernel: add arch-timer C3STOP feature
        ARM: 7460/1: remove asm/locks.h
        ARM: 7439/1: head.S: simplify initial page table mapping
        ARM: 7437/1: zImage: Allow DTB command line concatenation with ATAG_CMDLINE
        ARM: 7436/1: Do not map the vectors page as write-through on UP systems
        ...
      cea8f46c
    • Russell King's avatar
    • David S. Miller's avatar
      Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless · 7b9b04fb
      David S. Miller authored
      John W. Linville says:
      
      ====================
      These fixes are intended for the 3.6 stream.
      
      Hauke Mehrtens provides a pair of bcma fixes, one to fix a build
      regression on mips and another to correct a pair of missing iounmap
      calls.
      
      Thomas Huehn offers a mac80211_hwsim fix to avoid a possible
      use-after-free bug.
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      7b9b04fb
    • Jiri Kosina's avatar
      tcp: perform DMA to userspace only if there is a task waiting for it · 59ea33a6
      Jiri Kosina authored
      Back in 2006, commit 1a2449a8 ("[I/OAT]: TCP recv offload to I/OAT")
      added support for receive offloading to IOAT dma engine if available.
      
      The code in tcp_rcv_established() tries to perform early DMA copy if
      applicable. It however does so without checking whether the userspace
      task is actually expecting the data in the buffer.
      
      This is not a problem under normal circumstances, but there is a corner
      case where this doesn't work -- and that's when MSG_TRUNC flag to
      recvmsg() is used.
      
      If the IOAT dma engine is not used, the code properly checks whether
      there is a valid ucopy.task and the socket is owned by userspace, but
      misses the check in the dmaengine case.
      
      This problem can be observed in real trivially -- for example 'tbench' is a
      good reproducer, as it makes a heavy use of MSG_TRUNC. On systems utilizing
      IOAT, you will soon find tbench waiting indefinitely in sk_wait_data(), as they
      have been already early-copied in tcp_rcv_established() using dma engine.
      
      This patch introduces the same check we are performing in the simple
      iovec copy case to the IOAT case as well. It fixes the indefinite
      recvmsg(MSG_TRUNC) hangs.
      Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      59ea33a6
    • Jesse Gross's avatar
      Revert "openvswitch: potential NULL deref in sample()" · 60810307
      Jesse Gross authored
      This reverts commit 5b3e7e6c.
      
      The problem that the original commit was attempting to fix can
      never happen in practice because validation is done one a per-flow
      basis rather than a per-packet basis.  Adding additional checks at
      runtime is unnecessary and inconsistent with the rest of the code.
      
      CC: Dan Carpenter <dan.carpenter@oracle.com>
      Signed-off-by: default avatarJesse Gross <jesse@nicira.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      60810307
    • Eric Dumazet's avatar
      ipv4: fix TCP early demux · 505fbcf0
      Eric Dumazet authored
      commit 92101b3b (ipv4: Prepare for change of rt->rt_iif encoding.)
      invalidated TCP early demux, because rx_dst_ifindex is not properly
      initialized and checked.
      
      Also remove the use of inet_iif(skb) in favor or skb->skb_iif
      Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      505fbcf0
    • Jiri Benc's avatar
      net: fix rtnetlink IFF_PROMISC and IFF_ALLMULTI handling · b1beb681
      Jiri Benc authored
      When device flags are set using rtnetlink, IFF_PROMISC and IFF_ALLMULTI
      flags are handled specially. Function dev_change_flags sets IFF_PROMISC and
      IFF_ALLMULTI bits in dev->gflags according to the passed value but
      do_setlink passes a result of rtnl_dev_combine_flags which takes those bits
      from dev->flags.
      
      This can be easily trigerred by doing:
      
      tcpdump -i eth0 &
      ip l s up eth0
      
      ip sets IFF_UP flag in ifi_flags and ifi_change, which is combined with
      IFF_PROMISC by rtnl_dev_combine_flags, causing __dev_change_flags to set
      IFF_PROMISC in gflags.
      Reported-by: default avatarMax Matveev <makc@redhat.com>
      Signed-off-by: default avatarJiri Benc <jbenc@redhat.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      b1beb681
    • Dan Carpenter's avatar
      USB: kaweth.c: use GFP_ATOMIC under spin_lock · e4c7f259
      Dan Carpenter authored
      The problem is that we call this with a spin lock held.  The call tree
      is:
      	kaweth_start_xmit() holds kaweth->device_lock.
      	-> kaweth_async_set_rx_mode()
      	   -> kaweth_control()
      	      -> kaweth_internal_control_msg()
      
      The kaweth_internal_control_msg() function is only called from
      kaweth_control() which used GFP_ATOMIC for its allocations.
      Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      e4c7f259
    • Hangbin Liu's avatar
      tcp: Add TCP_USER_TIMEOUT negative value check · 42493570
      Hangbin Liu authored
      TCP_USER_TIMEOUT is a TCP level socket option that takes an unsigned int. But
      patch "tcp: Add TCP_USER_TIMEOUT socket option"(dca43c75) didn't check the negative
      values. If a user assign -1 to it, the socket will set successfully and wait
      for 4294967295 miliseconds. This patch add a negative value check to avoid
      this issue.
      Signed-off-by: default avatarHangbin Liu <liuhangbin@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      42493570
    • Linus Torvalds's avatar
      Merge tag 'tty-3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty · c1e7179a
      Linus Torvalds authored
      Pull TTY/Serial patches from Greg Kroah-Hartman:
       "Here's the "tiny" set of patches for 3.6-rc1 for the tty layer and
        serial drivers.  They were cherry-picked from the tty-next branch of
        the tty git tree, as they are small and "obvious" fixes.  The larger
        changes, as mentioned before, will be saved for the 3.7-rc1 merge
        window.
      
        All of these changes have been in the linux-next releases for quite a
        while.
      
        Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"
      
      * tag 'tty-3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
        pch_uart: Fix parity setting issue
        pch_uart: Fix rx error interrupt setting issue
        pch_uart: Fix missing break for 16 byte fifo
        tty ldisc: Close/Reopen race prevention should check the proper flag
        pch_uart: Add eg20t_port lock field, avoid recursive spinlocks
        vt: fix race in vt_waitactive()
        serial/of-serial: Add LPC3220 standard UART compatible string
        serial/8250: Add LPC3220 standard UART type
        serial_core: Update buffer overrun statistics.
        serial: samsung: Fixed wrong comparison for baudclk_rate
      c1e7179a
    • Linus Torvalds's avatar
      Merge branch 'kmap_atomic' of git://github.com/congwang/linux · 84eda280
      Linus Torvalds authored
      Pull final kmap_atomic cleanups from Cong Wang:
       "This should be the final round of cleanup, as the definitions of enum
        km_type finally get removed from the whole tree.  The patches have
        been in linux-next for a long time."
      
      * 'kmap_atomic' of git://github.com/congwang/linux:
        pipe: remove KM_USER0 from comments
        vmalloc: remove KM_USER0 from comments
        feature-removal-schedule.txt: remove kmap_atomic(page, km_type)
        tile: remove km_type definitions
        um: remove km_type definitions
        asm-generic: remove km_type definitions
        avr32: remove km_type definitions
        frv: remove km_type definitions
        powerpc: remove km_type definitions
        arm: remove km_type definitions
        highmem: remove the deprecated form of kmap_atomic
        tile: remove usage of enum km_type
        frv: remove the second parameter of kmap_atomic_primary()
        jbd2: remove the second argument of kmap_atomic
      84eda280
    • Linus Torvalds's avatar
      Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc · b387e41e
      Linus Torvalds authored
      Pull powerpc fixes from Benjamin Herrenschmidt:
       "Here's a handful of powerpc patches, a couple of regression fixes for
        problems introduced in the main batch in this merge window, a couple
        of defconfig updates, and some trivials.
      
        The radeonfb one is something that was long standing in SLES which I
        forgot to pickup earlier."
      
      * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
        powerpc/ftrace: Trace function graph entry before updating index
        radeonfb: Add quirk for the graphics adapter in some JSxx
        powerpc: Lack of firmware flash support is not an error
        powerpc: Enable pseries hardware RNG and crypto modules
        powerpc: Update g5_defconfig
        powerpc/kvm/bookehv: Fix build regression
        powerpc: Set stack limit properly in crit_transfer_to_handler
      b387e41e
    • Linus Torvalds's avatar
      Merge tag 'cpumask-for-linus' of... · 43a1141b
      Linus Torvalds authored
      Merge tag 'cpumask-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
      
      Pull cpumask changes from Rusty Russell:
       "Trivial comment changes to cpumask code.  I guess it's getting boring."
      
      Boring is good.
      
      * tag 'cpumask-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
        cpumask: cpulist_parse() comments correction
        init: add comments to keep initcall-names in sync with initcall levels
        cpumask: add a few comments of cpumask functions
      43a1141b
    • John W. Linville's avatar
      Merge branch 'master' of... · 28ea499a
      John W. Linville authored
      Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
      28ea499a
    • Linus Torvalds's avatar
      Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 25918f98
      Linus Torvalds authored
      Pull ARM SoC fixes from Olof Johansson:
       "A mixed bag of fixes, some for merge window fallout (tegra, MXS), and
        a short series of fixes for marvell platforms that didn't make it in
        before 3.5."
      
      * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
        ARM: mxs: fix compile error caused by prom_update_property change
        ARM: dt: tegra trimslice: enable USB2 port
        ARM: dt: tegra trimslice: add vbus-gpio property
        ARM: vt8500: Add maintainer for VT8500 architecture
        ARM: Kirkwood: Replace mrvl with marvell
        ARM: Orion: fix driver probe error handling with respect to clk
        ARM: Dove: Fixup ge00 initialisation
        ARM: Kirkwood: Fix PHY disable clk problems
        ARM: Kirkwood: Ensure runit clock always ticks.
        ARM: versatile: Don't use platform clock for Integrator & VE
        ARM: tegra: harmony: add regulator supply name and its input supply
      25918f98
    • Linus Torvalds's avatar
      Merge branch 'for-3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds · aa0b3b2b
      Linus Torvalds authored
      Pull LED subsystem update from Bryan Wu.
      
      * 'for-3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds: (50 commits)
        leds-lp8788: forgotten unlock at lp8788_led_work
        LEDS: propagate error codes in blinkm_detect()
        LEDS: memory leak in blinkm_led_common_set()
        leds: add new lp8788 led driver
        LEDS: add BlinkM RGB LED driver, documentation and update MAINTAINERS
        leds: max8997: Simplify max8997_led_set_mode implementation
        leds/leds-s3c24xx: use devm_gpio_request
        leds: convert Network Space v2 LED driver to devm_kzalloc() and cleanup error exit path
        leds: convert DAC124S085 LED driver to devm_kzalloc()
        leds: convert LM3530 LED driver to devm_kzalloc() and cleanup error exit path
        leds: convert TCA6507 LED driver to devm_kzalloc()
        leds: convert Freescale MC13783 LED driver to devm_kzalloc() and cleanup error exit path
        leds: convert ADP5520 LED driver to devm_kzalloc() and cleanup error exit path
        leds: convert PCA955x LED driver to devm_kzalloc() and cleanup error exit path
        leds: convert Sun Fire LED driver to devm_kzalloc() and cleanup error exit path
        leds: convert PCA9532 LED driver to devm_kzalloc()
        leds: convert LT3593 LED driver to devm_kzalloc()
        leds: convert Renesas TPU LED driver to devm_kzalloc() and cleanup error exit path
        leds: convert LP5523 LED driver to devm_kzalloc() and cleanup error exit path
        leds: convert PCA9633 LED driver to devm_kzalloc()
        ...
      aa0b3b2b
    • Steven Rostedt's avatar
      powerpc/ftrace: Trace function graph entry before updating index · bac821a6
      Steven Rostedt authored
      As Colin Cross ported my x86 change to ARM, he also pointed out that
      powerpc is also behind in this fix.
      
      The commit 722b3c74 "ftrace/graph: Trace function entry before
      updating index" fixes an issue with function graph tracing for x86,
      where if the called entry function decides not to trace interrupts, it
      can fail the check if an interrupt comes in just after the
      curr_ret_stack is updated.
      
      The solution is to call the entry function first, then update the
      curr_ret_stack if the entry function wants to be traced.
      
      Cc: Colin Cross <ccross@android.com>
      Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
      Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
      bac821a6
    • Tony Breeds's avatar
      radeonfb: Add quirk for the graphics adapter in some JSxx · e5ae3cdf
      Tony Breeds authored
      These devices are set to 640x480 by firmware, switch them to 800x600@60
      so that the graphical installer can run on remote console.
      
      Reported by IBM during SLES10 SP2 beta testing:
      
      https://bugzilla.novell.com/show_bug.cgi?id=461002
      LTC50817
      Signed-off-by: default avatarOlaf Hering <olaf@aepfle.de>
      Signed-off-by: default avatarTony Breeds <tony@bakeyournoodle.com>
      Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
      e5ae3cdf
    • Anton Blanchard's avatar
      powerpc: Lack of firmware flash support is not an error · 0e384983
      Anton Blanchard authored
      Reduce the severity of the warning given when firmware flash is
      not supported. Not all platforms have it.
      Signed-off-by: default avatarAnton Blanchard <anton@samba.org>
      Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
      0e384983