1. 12 Apr, 2012 23 commits
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 174808af
      Linus Torvalds authored
      Pull networking fixes from David Miller:
      
       1) Fix bluetooth userland regression reported by Keith Packard, from
          Gustavo Padovan.
      
       2) Revert ath9k PS idle change, from Sujith Manoharan.
      
       3) Correct default TCP memory limits (again), from Eric Dumazet.
      
       4) Fix tcp_rcv_rtt_update() accidental use of unscaled RTT, from Neal
          Cardwell.
      
       5) We made a facility for layers like wireless to say how much tailroom
          they need in the SKB for link layer stuff such as wireless
          encryption etc., but TCP works hard to fill every SKB out to the end
          defeating this specification.
      
          This leads to every TCP packet getting reallocated by the wireless
          code in order to have the right amount of tailroom available.
      
          Fix TCP to only fill SKBs out to the real amount of data area it
          asked for during the allocation, this way it won't eat into the
          slack added for the device's tailroom needs.
      
          Reported by Marc Merlin and fixed by Eric Dumazet.
      
       6) Leaks, endian bugs, and new device IDs in bluetooth from Santosh
          Nayak, João Paulo Rechi Vita, Cho, Yu-Chen, Andrei Emeltchenko,
          AceLan Kao, and Andrei Emeltchenko.
      
       7) OOPS on tty_close fix in bluetooth's hci_ldisc from Johan Hovold.
      
       8) netfilter erroneously scales TCP window twice, fix from Changli Gao.
      
       9) Memleak fix in wext-core from Julia Lawall.
      
      10) Consistently handle invalid TCP packets in ipv4 vs.  ipv6 conntrack,
          from Jozsef Kadlecsik.
      
      11) Validate IP header length properly in netfilter conntrack's
          ipv4_get_l4proto().
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (39 commits)
        NFC: Fix the LLCP Tx fragmentation loop
        rtlwifi: Add missing DMA buffer unmapping for PCI drivers
        rtlwifi: Preallocate USB read buffers and eliminate kalloc in read routine
        tcp: avoid order-1 allocations on wifi and tx path
        net: allow pskb_expand_head() to get maximum tailroom
        bridge: Do not send queries on multicast group leaves
        MAINTAINERS: Mark NATSEMI driver as orphan'd.
        tcp: fix tcp_rcv_rtt_update() use of an unscaled RTT sample
        tcp: restore correct limit
        Revert "ath9k: fix going to full-sleep on PS idle"
        rt2x00: Fix rfkill_polling register function.
        bcma: fix build error on MIPS; implicit pcibios_enable_device
        netfilter: nf_conntrack: fix incorrect logic in nf_conntrack_init_net
        netfilter: nf_ct_ipv4: packets with wrong ihl are invalid
        netfilter: nf_ct_ipv4: handle invalid IPv4 and IPv6 packets consistently
        net/wireless/wext-core.c: add missing kfree
        rtlwifi: Fix oops on rate-control failure
        mac80211: Convert WARN_ON to WARN_ON_ONCE
        rtlwifi: rtl8192de: Fix firmware initialization
        nl80211: ensure interface is up in various APIs
        ...
      174808af
    • Linus Torvalds's avatar
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · 778c2dee
      Linus Torvalds authored
      Pull drm fixes from Dave Airlie:
       "Mostly exynos and intel.
      
        Intel has 3 regression fixers (more info in intel merge commit), along
        with some other make hw work fixes, exynos has some cleanups and an
        ioctl fix.
      
        A couple of radeon fixes, couple of build fixes, and a savage
        userspace interface possible overflow fix."
      
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: (23 commits)
        drm/exynos: fixed exynos broken ioctl
        drm/i915: clear fencing tracking state when retiring requests
        drm/exynos: fix to pointer manager member of struct exynos_drm_subdrv
        drm/exynos: fix struct for operation callback functions to driver name
        drm/exynos: use define instead of default_win member in struct mixer_context
        drm/exynos: rename s/HDMI_OVERLAY_NUMBER/MIXER_WIN_NR
        drm/exynos: remove unused codes in hdmi and mixer
        drm/exynos: remove unnecessary type conversion of hdmi and mixer
        drm/i915: make rc6 module parameter read-only
        drm/i915: implement ColorBlt w/a
        drm/i915/ringbuffer: Exclude last 2 cachlines of ring on 845g
        Revert "drm/i915: reenable gmbus on gen3+ again"
        drm/radeon: only add the mm i2c bus if the hw_i2c module param is set
        vgaarb.h: fix build warnings
        drm/i915: properly compute dp dithering for user-created modes
        drm/radeon/kms: fix DVO setup on some r4xx chips
        drm/savage: fix integer overflows in savage_bci_cmdbuf()
        drm/radeon: replace udelay with mdelay for long timeouts
        drm/i915: Finish any pending operations on the framebuffer before disabling
        drm/i915: Removed IVB forced enable of sprite dest key.
        ...
      778c2dee
    • Linus Torvalds's avatar
      Merge tag 'md-3.4-fixes' of git://neil.brown.name/md · e42bd6e4
      Linus Torvalds authored
      Pull a few more fixes for md from NeilBrown:
       "Two are tagged for -stable.  They can cause an oops, but very rarely."
      
      * tag 'md-3.4-fixes' of git://neil.brown.name/md:
        md/bitmap: prevent bitmap_daemon_work running while initialising bitmap
        md/raid1,raid10: Fix calculation of 'vcnt' when processing error recovery.
        MD: Bitmap version cleanup.
      e42bd6e4
    • Linus Torvalds's avatar
      Merge tag 'irqdomain-for-linus' of git://git.secretlab.ca/git/linux-2.6 · 7e066489
      Linus Torvalds authored
      Pull irqdomain bug fixes from Grant Likely:
       "This branch fixes a bug in irq_create_mapping() where an error return
        from irq_alloc_desc_from() gets ignored.
      
        It also removes irq_virq_count to fix a bug on powerpc where the
        irqdomain code does not find irqs allocated above the CONFIG_NR_IRQS
        boundary.
      
        The remaining patches get rid of an completely pointless export and
        fix some minor bugs in the irqdomain debug output."
      
      * tag 'irqdomain-for-linus' of git://git.secretlab.ca/git/linux-2.6:
        irq_domain: Move irq_virq_count into NOMAP revmap
        irqdomain: Fix debugfs formatting
        irq_domain: correct the debugfs file name
        irq: Kill pointless irqd_to_hw export
        irq/irq_domain: Quit ignoring error returns from irq_alloc_desc_from().
      7e066489
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · 4abb663b
      Linus Torvalds authored
      Pull input updates from Dmitry Torokhov:
       "Just a few small fixes..."
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
        Input: da9052 - fix memory leak in da9052_onkey_probe()
        Input: gpio_mouse - use linux/gpio.h rather than asm/gpio.h
        Input: trackpoint - use psmouse_fmt() for messages
        Input: elantech - v4 is a clickpad, with only one button
        Input: elantech - reset touchpad before configuring it
        Input: sentelic - filter taps in absolute mode
        Input: tps6507x-ts - fix MODULE_ALIAS to match driver name
      4abb663b
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs · 5ba7026b
      Linus Torvalds authored
      Pull vfs fixes from Al Viro:
       "Regression fix in mtdchar_open(), fix for a really old leak
        (almost never hit in practice - it's a b0rken failure exit in
        simple_fill_super()) and a typo fix in vfs.txt (misspelled
        method type)."
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
        typo fix in Documentation/filesystems/vfs.txt
        dentry leak in simple_fill_super() failure exit
        fix breakage in mtdchar_open(), sanitize failure exits
      5ba7026b
    • Dave Airlie's avatar
      Merge branch 'exynos-drm-fixes' of... · 173fa4ec
      Dave Airlie authored
      Merge branch 'exynos-drm-fixes' of git://git.infradead.org/users/kmpark/linux-samsung into drm-intel-fixes
      
      * 'exynos-drm-fixes' of git://git.infradead.org/users/kmpark/linux-samsung:
        drm/exynos: fixed exynos broken ioctl
        drm/exynos: fix to pointer manager member of struct exynos_drm_subdrv
        drm/exynos: fix struct for operation callback functions to driver name
        drm/exynos: use define instead of default_win member in struct mixer_context
        drm/exynos: rename s/HDMI_OVERLAY_NUMBER/MIXER_WIN_NR
        drm/exynos: remove unused codes in hdmi and mixer
        drm/exynos: remove unnecessary type conversion of hdmi and mixer
        drm/exynos: add format list of plane
        drm/exynos: fixed duplicated page allocation bug.
        drm/exynos: fixed page align and code clean.
      173fa4ec
    • Dave Airlie's avatar
      Merge branch 'drm-intel-fixes' of... · 19e5c4e7
      Dave Airlie authored
      Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel into drm-intel-fixes
      
      Daniel Vetter writes:
      3 regression fixes:
      - disable gmbus again, too broken for 3.4, we'll try again for 3.5
      - dp bandwidth computation fix, we've lost the 6bpc dithering flag
       sometimes, this is a 3.3 regression (maybe even earlier for some
       configurations).
      - fix resume regression caused by the gen2/3 fencing fix merged into -rc2.
      
      And a few other fixes:
      - gpu hang fix for i845 (Chris)
      - sprite fix (Armin Reese)
      - crtc disable vs. scanlinewait race fix (Chris)
      - rc6 module option read-only, it confused testers (Jesse)
      - fbc related blitter death hw workaround, note that we disable fbc on snb
       by default anyway.
      
      With these fixes we have one 3.4 regression outstanding: One of the
      cleanup patches for the interlaced support managed to confuse the lvds
      panel fitter when upscaling. The root-cause is still unclear, but test
      patches are awaiting feedback from the reporter.
      
      * 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel:
        drm/i915: clear fencing tracking state when retiring requests
        drm/i915: make rc6 module parameter read-only
        drm/i915: implement ColorBlt w/a
        drm/i915/ringbuffer: Exclude last 2 cachlines of ring on 845g
        Revert "drm/i915: reenable gmbus on gen3+ again"
        drm/i915: properly compute dp dithering for user-created modes
        drm/i915: Finish any pending operations on the framebuffer before disabling
        drm/i915: Removed IVB forced enable of sprite dest key.
      19e5c4e7
    • John W. Linville's avatar
      Merge branch 'master' of... · 5d949944
      John W. Linville authored
      Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
      5d949944
    • Inki Dae's avatar
      drm/exynos: fixed exynos broken ioctl · 490aa60e
      Inki Dae authored
      this patch removes the pointer of uint64_t *edid. it should be just
      a uint64_t.
      Signed-off-by: default avatarInki Dae <inki.dae@samsung.com>
      Signed-off-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
      490aa60e
    • Daniel Vetter's avatar
      drm/i915: clear fencing tracking state when retiring requests · 15a13bbd
      Daniel Vetter authored
      This fixes a resume regression introduced in
      
      commit 7dd49065
      Author: Chris Wilson <chris@chris-wilson.co.uk>
      Date:   Wed Mar 21 10:48:18 2012 +0000
      
          drm/i915: Mark untiled BLT commands as fenced on gen2/3
      
      which fixed fencing tracking for untiled blt commands.
      
      A side effect of that patch was that now also untiled objects have a
      non-zero obj->last_fenced_seqno to track when a fence can be set up
      after a pipelined tiling change. Unfortunately this was only cleared
      by the fence setup and teardown code, resulting in tons of untiled but
      inactive objects with non-zero last_fenced_seqno.
      
      Now after resume we completely reset the seqno tracking, both on the
      driver side (by setting dev_priv->next_seqno = 1) and on the hw side
      (by allocating a new hws page, which contains the seqnos). Hilarity
      and indefinite waits ensued from the stale seqnos in
      obj->last_fenced_seqno from before the suspend.
      
      The fix is to properly clear the fencing tracking state like we
      already do for the normal gpu rendering while moving objects off the
      active list.
      Reported-and-tested-by: default avatar"Rafael J. Wysocki" <rjw@sisk.pl>
      Cc: Jiri Slaby <jslaby@suse.cz>
      Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
      Signed-Off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
      15a13bbd
    • Grant Likely's avatar
      irq_domain: Move irq_virq_count into NOMAP revmap · 6fa6c8e2
      Grant Likely authored
      This patch replaces the old global setting of irq_virq_count that is only
      used by the NOMAP mapping and instead uses a revmap_data property so that
      the maximum NOMAP allocation can be set per NOMAP irq_domain.
      
      There is exactly one user of irq_virq_count in-tree right now: PS3.
      Also, irq_virq_count is only useful for the NOMAP mapping.  So,
      instead of having a single global irq_virq_count values, this change
      drops it entirely and added a max_irq argument to irq_domain_add_nomap().
      That makes it a property of an individual nomap irq domain instead of
      a global system settting.
      Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
      Tested-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
      Cc: Thomas Gleixner <tglx@linutronix.de>
      Cc: Milton Miller <miltonm@bga.com>
      6fa6c8e2
    • NeilBrown's avatar
      md/bitmap: prevent bitmap_daemon_work running while initialising bitmap · afbaa90b
      NeilBrown authored
      If a bitmap is added while the array is active, it is possible
      for bitmap_daemon_work to run while the bitmap is being
      initialised.
      This is particularly a problem if bitmap_daemon_work sees
      bitmap->filemap as non-NULL before it has been filled in properly.
      So hold bitmap_info.mutex while filling in ->filemap
      to prevent problems.
      
      This patch is suitable for any -stable kernel, though it might not
      apply cleanly before about 3.1.
      
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarNeilBrown <neilb@suse.de>
      afbaa90b
    • majianpeng's avatar
      md/raid1,raid10: Fix calculation of 'vcnt' when processing error recovery. · f4380a91
      majianpeng authored
      If r1bio->sectors % 8 != 0,then the memcmp and a later
      memcpy will omit the last bio_vec.
      
      This is suitable for any stable kernel since 3.1 when bad-block
      management was introduced.
      
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarmajianpeng <majianpeng@gmail.com>
      Signed-off-by: default avatarNeilBrown <neilb@suse.de>
      f4380a91
    • Andrei Warkentin's avatar
      MD: Bitmap version cleanup. · 9e41dd35
      Andrei Warkentin authored
      bitmap_new_disk_sb() would still create V3 bitmap superblock
      with host-endian layout.
      
      Perhaps I'm confused, but shouldn't bitmap_new_disk_sb() be
      creating a V4 bitmap superblock instead, that is portable,
      as per comment in bitmap.h?
      Signed-off-by: default avatarAndrei Warkentin <andrey.warkentin@gmail.com>
      Signed-off-by: default avatarNeilBrown <neilb@suse.de>
      9e41dd35
    • Joonyoung Shim's avatar
      drm/exynos: fix to pointer manager member of struct exynos_drm_subdrv · 677e84c1
      Joonyoung Shim authored
      The struct exynos_drm_manager has to exist for exynos drm sub driver
      using encoder and connector. If it isn't NULL to member of struct
      exynos_drm_subdrv, will create encoder and connector else will not. And
      the is_local member also doesn't need.
      Signed-off-by: default avatarJoonyoung Shim <jy0922.shim@samsung.com>
      Signed-off-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
      Signed-off-by: default avatarInki Dae <inki.dae@samsung.com>
      677e84c1
    • Joonyoung Shim's avatar
      drm/exynos: fix struct for operation callback functions to driver name · 578b6065
      Joonyoung Shim authored
      The mixer driver and hdmi driver have each operation callback functions
      and they is registered to hdmi common driver. Their struct names in hdmi
      common driver include display, manager and overlay. It confuses to
      appear whose operation and two driver cannot register same operation
      callback functions at the same time. Use their struct names to driver
      name.
      Signed-off-by: default avatarJoonyoung Shim <jy0922.shim@samsung.com>
      Signed-off-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
      Signed-off-by: default avatarInki Dae <inki.dae@samsung.com>
      578b6065
    • Joonyoung Shim's avatar
      drm/exynos: use define instead of default_win member in struct mixer_context · a2ee151b
      Joonyoung Shim authored
      The default_win member in struct mixer_context isn't change its value
      after initialized to 0, so it's better using to define.
      Signed-off-by: default avatarJoonyoung Shim <jy0922.shim@samsung.com>
      Signed-off-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
      Signed-off-by: default avatarInki Dae <inki.dae@samsung.com>
      a2ee151b
    • Joonyoung Shim's avatar
      drm/exynos: rename s/HDMI_OVERLAY_NUMBER/MIXER_WIN_NR · a634dd54
      Joonyoung Shim authored
      HDMI_OVERLAY_NUMBER is specific of mixer driver and be used "windows
      layer" term in exynos user manaual, so rename it.
      Signed-off-by: default avatarJoonyoung Shim <jy0922.shim@samsung.com>
      Signed-off-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
      Signed-off-by: default avatarInki Dae <inki.dae@samsung.com>
      a634dd54
    • Joonyoung Shim's avatar
      drm/exynos: remove unused codes in hdmi and mixer · 46da222b
      Joonyoung Shim authored
      Some members in struct mixer_context aren't used and the define
      HDMI_OVERLAY_NUMBER is unused in hdmi driver, remove them.
      Signed-off-by: default avatarJoonyoung Shim <jy0922.shim@samsung.com>
      Signed-off-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
      Signed-off-by: default avatarInki Dae <inki.dae@samsung.com>
      46da222b
    • Joonyoung Shim's avatar
      drm/exynos: remove unnecessary type conversion of hdmi and mixer · f9309d1b
      Joonyoung Shim authored
      When the void pointer type variable is assigned to the specific pointer
      type variable, don't need to do type conversion.
      Signed-off-by: default avatarJoonyoung Shim <jy0922.shim@samsung.com>
      Signed-off-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
      Signed-off-by: default avatarInki Dae <inki.dae@samsung.com>
      f9309d1b
    • Jesper Juhl's avatar
      Input: da9052 - fix memory leak in da9052_onkey_probe() · 0e3d0f3d
      Jesper Juhl authored
      If, in drivers/input/misc/da9052_onkey.c::da9052_onkey_probe(), the
      call to either kzalloc() or input_allocate_device() fails then we will
      return -ENOMEM from the function without freeing the other allocation
      that may have succeeded, thus we leak either the memory allocated for
      'onkey' or the memory allocated for 'input_dev' if one succeeds and
      the other fails.
      Fix that by jumping to the 'err_free_mem' label at the end of the
      function that properly cleans up rather than returning directly.
      Signed-off-by: default avatarJesper Juhl <jj@chaosbits.net>
      Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
      0e3d0f3d
    • Linus Torvalds's avatar
      Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc · 45852766
      Linus Torvalds authored
      Pull powerpc fixes from Benjamin Herrenschmidt:
       "Fixes for two nasty regression affecting powerpc in 3.4."
      
      * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
        powerpc: Fix typo in runlatch code
        powerpc: Fix page fault with lockdep regression
      45852766
  2. 11 Apr, 2012 17 commits