1. 24 1月, 2013 1 次提交
  2. 12 1月, 2013 1 次提交
    • M
      vfs: re-implement writeback_inodes_sb(_nr)_if_idle() and rename them · 10ee27a0
      Miao Xie 提交于
      writeback_inodes_sb(_nr)_if_idle() is re-implemented by replacing down_read()
      with down_read_trylock() because
      
      - If ->s_umount is write locked, then the sb is not idle. That is
        writeback_inodes_sb(_nr)_if_idle() needn't wait for the lock.
      
      - writeback_inodes_sb(_nr)_if_idle() grabs s_umount lock when it want to start
        writeback, it may bring us deadlock problem when doing umount. In order to
        fix the problem, ext4 and btrfs implemented their own writeback functions
        instead of writeback_inodes_sb(_nr)_if_idle(), but it introduced the redundant
        code, it is better to implement a new writeback_inodes_sb(_nr)_if_idle().
      
      The name of these two functions is cumbersome, so rename them to
      try_to_writeback_inodes_sb(_nr).
      
      This idea came from Christoph Hellwig.
      Some code is from the patch of Kamal Mostafa.
      Reviewed-by: NJan Kara <jack@suse.cz>
      Signed-off-by: NMiao Xie <miaox@cn.fujitsu.com>
      Signed-off-by: NFengguang Wu <fengguang.wu@intel.com>
      10ee27a0
  3. 10 1月, 2013 5 次提交
  4. 09 1月, 2013 6 次提交
    • L
      Merge tag 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 974b3358
      Linus Torvalds 提交于
      Pull ARM SoC fixes from Olof Johansson:
       "People are back from the holiday breaks, and it shows.  Here are a
        bunch of fixes for a number of platforms:
         - A couple of small fixes for Nomadik
         - A larger set of changes for kirkwood/mvebu
           - uart driver selection, dt clocks, gpio-poweroff fixups, a few
             __init annotation fixes and some error handling improvement in
             their xor dma driver.
         - i.MX had a couple of minor fixes (and a critical one for flexcan2
           clock setup)
         - MXS has a small board fix and a framebuffer bugfix
         - A set of fixes for Samsung Exynos, fixing default bootargs and some
           Exynos5440 clock issues
         - A set of OMAP changes including PM fixes and a few sparse warning
           fixups
      
        All in all a bit more positive code delta than we'd ideally want to
        see here, mostly from the OMAP PM changes, but nothing overly crazy."
      
      * tag 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (44 commits)
        ARM: clps711x: Fix bad merge of clockevents setup
        ARM: highbank: save and restore L2 cache and GIC on suspend
        ARM: highbank: add a power request clear
        ARM: highbank: fix secondary boot and hotplug
        ARM: highbank: fix typos with hignbank in power request functions
        ARM: dts: fix highbank cpu mpidr values
        ARM: dts: add device_type prop to cpu nodes on Calxeda platforms
        ARM: mx5: Fix MX53 flexcan2 clock
        ARM: OMAP2+: am33xx-hwmod: Fix wrongly terminated am33xx_usbss_mpu_irqs array
        pinctrl: mvebu: make pdma clock on dove mandatory
        ARM: Dove: Add pinctrl clock to DT
        dma: mv_xor: fix error handling for clocks
        dma: mv_xor: fix error handling of mv_xor_channel_add()
        arm: mvebu: Add missing ; for cpu node.
        arm: mvebu: Armada XP MV78230 has only three Ethernet interfaces
        arm: mvebu: Armada XP MV78230 has two cores, not one
        clk: mvebu: Remove inappropriate __init tagging
        ARM: Kirkwood: Use fixed-regulator instead of board gpio call
        ARM: Kirkwood: Fix missing sdio clock
        ARM: Kirkwood: Switch TWSI1 of 88f6282 to DT clock providers
        ...
      974b3358
    • L
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · ca5c8a4c
      Linus Torvalds 提交于
      Pull drm update from Dave Airlie:
       "Exynos and Radeon mostly, with a dma-buf and ttm fix thrown in.
      
        It's a bit big but its mostly exynos license fix ups and I'd rather
        not hold those up since its legally stuff.
      
        Radeon has a couple of fixes from dma engine work, TTM is just a
        locking fix, and dma-buf fix has been hanging around and I finally got
        a chance to review it."
      
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: (30 commits)
        drm/ttm: fix fence locking in ttm_buffer_object_transfer
        drm/prime: drop reference on imported dma-buf come from gem
        drm/radeon: add quirk for d3 delay during switcheroo poweron for apple macbooks
        drm/exynos: move finish page flip to a common place
        drm/exynos: fimd: modify condition in fimd resume
        drm/radeon: fix DMA CS parser for r6xx linear copy packet
        drm/radeon: split r6xx and r7xx copy_dma functions
        drm/exynos: Use devm_clk_get in exynos_drm_gsc.c
        drm/exynos: Remove redundant NULL check in exynos_drm_gsc.c
        drm/exynos: Remove explicit freeing using devm_* APIs in exynos_drm_gsc.c
        drm/exynos: Use devm_clk_get in exynos_drm_rotator.c
        drm/exynos: Remove redundant NULL check in exynos_drm_rotator.c
        drm/exynos: Remove unnecessary devm_* freeing APIs in exynos_drm_rotator.c
        drm/exynos: Use devm_clk_get in exynos_drm_fimc.c
        drm/exynos: Remove redundant NULL check
        drm/exynos: Remove explicit freeing using devm_* APIs in exynos_drm_fimc.c
        drm/exynos: Use devm_kzalloc in exynos_drm_ipp.c
        drm/exynos: fix gem buffer allocation type checking
        drm/exynos: remove needless parenthesis.
        drm/exynos: fix incorrect interrupt induced by m2m operation.
        ...
      ca5c8a4c
    • O
      Merge tag 'omap-for-v3.8-rc2/fixes-signed-v2' of... · 434fec16
      Olof Johansson 提交于
      Merge tag 'omap-for-v3.8-rc2/fixes-signed-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes
      
      From Tony Lindgren:
      The biggest change is a fix to deal with different power state
      on omap2 registers that causes issues trying to use common PM code.
      Also fix few incorrect registers, and an issue for omap1 USB, and
      few sparse fixes for issues that sneaked in with all the clean-up.
      
      * tag 'omap-for-v3.8-rc2/fixes-signed-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
        ARM: OMAP2+: am33xx-hwmod: Fix wrongly terminated am33xx_usbss_mpu_irqs array
        ARM: OMAP1: fix USB configuration use-after-release
        ARM: OMAP2/3: PRM: fix bogus OMAP2xxx powerstate return values
        ARM: OMAP3: clock data: Add missing enable/disable for EMU clock
        ARM: OMAP4: PRM: Correct wrong instance usage for reading reset sources
        ARM: OMAP4: PRM: fix RSTTIME and RSTST offsets
        ARM: OMAP4: PRM: Correct reset source map
        ARM: OMAP: SRAM: resolve sparse warnings
        ARM: OMAP AM33xx: hwmod data: resolve sparse warnings
        ARM: OMAP: 32k counter: resolve sparse warnings
      Signed-off-by: NOlof Johansson <olof@lixom.net>
      434fec16
    • O
      Merge branch 'v3.8-samsung-fixes-2' of... · 2f64a8d7
      Olof Johansson 提交于
      Merge branch 'v3.8-samsung-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fixes
      
      From Kukjin Kim:
      Most of them are EXYNOS5440 fixes which are for changing uart console,
      cpu id (typo)  and silent complaining gpio error in kernel boot.
      
      * 'v3.8-samsung-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
        ARM: EXYNOS: skip the clock initialization for exynos5440
        ARM: EXYNOS: enable PINCTRL for EXYNOS5440
        ARM: dts: use uart port1 for console on exynos4210-smdkv310
        ARM: dts: use uart port0 for console on exynos5440-ssdk5440
        ARM: SAMSUNG: fix the cpu id for EXYNOS5440
        ARM: EXYNOS: Revise HDMI resource size
      2f64a8d7
    • O
      Merge tag 'mxs-fixes-3.8' of git://git.linaro.org/people/shawnguo/linux-2.6 into fixes · 5595e755
      Olof Johansson 提交于
      From Shawn Guo:
      I have to send one critical mxsfb fix through arm-soc, as FB maintainer
      is unresponsive for quite a while.  People start complaining the missing
      of such an important fix.
      
      * tag 'mxs-fixes-3.8' of git://git.linaro.org/people/shawnguo/linux-2.6:
        video: mxsfb: fix crash when unblanking the display
        ARM: dts: imx23-olinuxino: Fix IOMUX settings
      5595e755
    • O
      Merge tag 'imx-fixes-3.8' of git://git.linaro.org/people/shawnguo/linux-2.6 into fixes · 2d9e02ca
      Olof Johansson 提交于
      From Shawn Guo:
      
      It includes one critical fix - wrong flexcan2 clock will hang system
      when the port gets brought up.  The other two are non-critical fixes,
      which are sent together here, since it's still early -rc stage.
      
      * tag 'imx-fixes-3.8' of git://git.linaro.org/people/shawnguo/linux-2.6:
        ARM: mx5: Fix MX53 flexcan2 clock
        ARM: dts: imx31-bug: Fix manufacturer compatible string
        clk: imx: Remove 'clock-output-names' from the examples
      2d9e02ca
  5. 08 1月, 2013 27 次提交
    • L
      Merge tag 'sound-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · ed2c8911
      Linus Torvalds 提交于
      Pull sound fixes from Takashi Iwai:
       "Nothing too exciting here, just a few regression and trivial fixes,
        and new quirks for HD-audio and USB-audio.
      
         - HD-audio mute LED mode enum fix
         - Fix kernel panic of Digidesign Mbox2 usb-audio quirk (which was new
           in 3.8-rc1)
         - Creative BT-D1 usb-audio quirk
         - mute LED fixup for HP Pavillion 17 laptop"
      
      * tag 'sound-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
        ALSA: hda - add mute LED for HP Pavilion 17 (Realtek codec)
        ALSA: au88x0: fix incorrect left shift
        sound: oss/pas2: Fix possible access out of array
        ALSA: usb-audio: Fix kernel panic of Digidesign Mbox2 quirk
        ALSA: usb-audio: Add support for Creative BT-D1 via usb sound quirks
        ALSA: hda - Switch "On" and "Off" for "Mute-LED Mode" kcontrol
      ed2c8911
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 5c33d9b2
      Linus Torvalds 提交于
      Pull networking fixes from David Miller:
      
       1) New sysctl ndisc_notify needs some documentation, from Hanns
          Frederic Sowa.
      
       2) Netfilter REJECT target doesn't set transport header of SKB
          correctly, from Mukund Jampala.
      
       3) Forcedeth driver needs to check for DMA mapping failures, from Larry
          Finger.
      
       4) brcmsmac driver can't use usleep_range while holding locks, use
          udelay instead.  From Niels Ole Salscheider.
      
       5) Fix unregister of netlink bridge multicast database handlers, from
          Vlad Yasevich and Rami Rosen.
      
       6) Fix checksum calculations in netfilter's ipv6 network prefix
          translation module.
      
       7) Fix high order page allocation failures in netfilter xt_recent, from
          Eric Dumazet.
      
       8) mac802154 needs to use netif_rx_ni() instead of netif_rx() because
          mac802154_process_data() can execute in process rather than
          interrupt context.  From Alexander Aring.
      
       9) Fix splice handling of MSG_SENDPAGE_NOTLAST, otherwise we elide one
          tcp_push() too many.  From Eric Dumazet and Willy Tarreau.
      
      10) Fix skb->truesize tracking in XEN netfront driver, from Ian
          Campbell.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (46 commits)
        xen/netfront: improve truesize tracking
        ipv4: fix NULL checking in devinet_ioctl()
        tcp: fix MSG_SENDPAGE_NOTLAST logic
        net/ipv4/ipconfig: really display the BOOTP/DHCP server's address.
        ip-sysctl: fix spelling errors
        mac802154: fix NOHZ local_softirq_pending 08 warning
        ipv6: document ndisc_notify in networking/ip-sysctl.txt
        ath9k: Fix Kconfig for ATH9K_HTC
        netfilter: xt_recent: avoid high order page allocations
        netfilter: fix missing dependencies for the NOTRACK target
        netfilter: ip6t_NPT: fix IPv6 NTP checksum calculation
        bridge: add empty br_mdb_init() and br_mdb_uninit() definitions.
        vxlan: allow live mac address change
        bridge: Correctly unregister MDB rtnetlink handlers
        brcmfmac: fix parsing rsn ie for ap mode.
        brcmsmac: add copyright information for Canonical
        rtlwifi: rtl8723ae: Fix warning for unchecked pci_map_single() call
        rtlwifi: rtl8192se: Fix warning for unchecked pci_map_single() call
        rtlwifi: rtl8192de: Fix warning for unchecked pci_map_single() call
        rtlwifi: rtl8192ce: Fix warning for unchecked pci_map_single() call
        ...
      5c33d9b2
    • D
      drm/ttm: fix fence locking in ttm_buffer_object_transfer · e8e89622
      Daniel Vetter 提交于
      Noticed while reviewing the fence locking in the radeon pageflip
      handler.
      
      v2: Instead of grabbing the bdev->fence_lock in object_transfer just
      move the single callsite of that function a few lines, so that it is
      protected by the fence_lock. Suggested by Jerome Glisse.
      
      v3: Fix typo in commit message.
      Reviewed-by: NJerome Glisse <jglisse@redhat.com>
      Signed-off-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
      Signed-off-by: NDave Airlie <airlied@redhat.com>
      e8e89622
    • O
      Merge tag 'mvebu_fixes_for_v3.8' of git://git.infradead.org/users/jcooper/linux into fixes · 5cf87a12
      Olof Johansson 提交于
      From Jason Cooper:
      
      fixes for mvebu/kirkwood v3.8
       - use correct uart driver for mvebu boards
       - add a missing DT clocks
       - gpio-poweroff level vs. edge triggering, use gpio_is_valid()
       - remove an inappropriate __init, modules need to access function.
       - various DT fixes
       - error handling in mv_xor
      
      * tag 'mvebu_fixes_for_v3.8' of git://git.infradead.org/users/jcooper/linux:
        pinctrl: mvebu: make pdma clock on dove mandatory
        ARM: Dove: Add pinctrl clock to DT
        dma: mv_xor: fix error handling for clocks
        dma: mv_xor: fix error handling of mv_xor_channel_add()
        arm: mvebu: Add missing ; for cpu node.
        arm: mvebu: Armada XP MV78230 has only three Ethernet interfaces
        arm: mvebu: Armada XP MV78230 has two cores, not one
        clk: mvebu: Remove inappropriate __init tagging
        ARM: Kirkwood: Use fixed-regulator instead of board gpio call
        ARM: Kirkwood: Fix missing sdio clock
        ARM: Kirkwood: Switch TWSI1 of 88f6282 to DT clock providers
        Power: gpio-poweroff: Fix documentation and gpio_is_valid
        ARM: Kirkwood: Fix missing clk for USB device.
        arm: mvebu: Use dw-apb-uart instead of ns16650 as UART driver
      Signed-off-by: NOlof Johansson <olof@lixom.net>
      5cf87a12
    • O
      ARM: clps711x: Fix bad merge of clockevents setup · 0e3a4a2e
      Olof Johansson 提交于
      I mismerged a previous branch from Alexander, and accidentally left
      in ARCH_USES_GETTIMEOFFSET. Remove it.
      Signed-off-by: NOlof Johansson <olof@lixom.net>
      Cc: Alexander Shiyan <shc_work@mail.ru>
      0e3a4a2e
    • O
      Merge tag 'nomadik-fixes-for-arm-soc' of... · daaeec93
      Olof Johansson 提交于
      Merge tag 'nomadik-fixes-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik into fixes
      
      From Linus Walleij:
      Two fixes to the Nomadik:
      - Delete a dangling include
      - Bump IRQ numbers to offset at 32
      
      * tag 'nomadik-fixes-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik:
        ARM: nomadik: bump the IRQ numbers again
        ARM: nomadik: delete dangling include
      daaeec93
    • R
      ARM: highbank: save and restore L2 cache and GIC on suspend · 1ddda1cd
      Rob Herring 提交于
      This fixes suspend to RAM adding necessary save and restore of L2 and GIC.
      Signed-off-by: NRob Herring <rob.herring@calxeda.com>
      Signed-off-by: NOlof Johansson <olof@lixom.net>
      1ddda1cd
    • R
      ARM: highbank: add a power request clear · 9852910a
      Rob Herring 提交于
      When we fail to power down, we need to clear out the power request.
      Signed-off-by: NRob Herring <rob.herring@calxeda.com>
      Signed-off-by: NOlof Johansson <olof@lixom.net>
      9852910a
    • R
      ARM: highbank: fix secondary boot and hotplug · 0b3455a7
      Rob Herring 提交于
      With commit 384a2902 (ARM: gic: use a private mapping for CPU target
      interfaces), wake-up IPIs now go to all cores as the gic cpu interface
      numbering may not follow core numbering. This broke secondary boot on
      highbank since the boot address was already set for all secondary cores,
      this caused all cores to boot before the kernel was ready.
      
      Fix this by moving the setting of the jump address to
      highbank_boot_secondary instead of highbank_smp_prepare_cpus and
      highbank_cpu_die. Also, clear the address when we boot. This prevents
      cores from booting before they are actually triggered and is also necessary
      to get suspend/resume to work.
      Signed-off-by: NRob Herring <rob.herring@calxeda.com>
      Cc: Nicolas Pitre <nicolas.pitre@linaro.org>
      Signed-off-by: NOlof Johansson <olof@lixom.net>
      0b3455a7
    • R
      ARM: highbank: fix typos with hignbank in power request functions · c05ee88f
      Rob Herring 提交于
      s/hignbank/highbank/
      Signed-off-by: NRob Herring <rob.herring@calxeda.com>
      Signed-off-by: NOlof Johansson <olof@lixom.net>
      c05ee88f
    • R
      ARM: dts: fix highbank cpu mpidr values · 3943deed
      Rob Herring 提交于
      With the addition of commit a0ae0240 (ARM: kernel: add device tree init
      map function), the cpu reg values must match the cpu mpidr register or we'll
      get warnings. For some reason, the CLUSTERID on highbank is 9, so the reg
      value needs to be 0x90n to quiet the warnings.
      Signed-off-by: NRob Herring <rob.herring@calxeda.com>
      Signed-off-by: NOlof Johansson <olof@lixom.net>
      3943deed
    • R
      ARM: dts: add device_type prop to cpu nodes on Calxeda platforms · 36ff67bc
      Rob Herring 提交于
      While device_type is considered deprecated, it is still needed for tools
      like lshw to identify cpu nodes.
      Signed-off-by: NRob Herring <rob.herring@calxeda.com>
      Signed-off-by: NOlof Johansson <olof@lixom.net>
      36ff67bc
    • D
      Merge branch 'drm-fixes-3.8' of git://people.freedesktop.org/~agd5f/linux into drm-next · c75be259
      Dave Airlie 提交于
      Alex writes:
       A few more fixes for DMA and a mac quirk.
      
      * 'drm-fixes-3.8' of git://people.freedesktop.org/~agd5f/linux:
        drm/radeon: add quirk for d3 delay during switcheroo poweron for apple macbooks
        drm/radeon: fix DMA CS parser for r6xx linear copy packet
        drm/radeon: split r6xx and r7xx copy_dma functions
      c75be259
    • S
      drm/prime: drop reference on imported dma-buf come from gem · be8a42ae
      Seung-Woo Kim 提交于
      Increasing ref counts of both dma-buf and gem for imported dma-buf come from gem
      makes memory leak. release function of dma-buf cannot be called because f_count
      of dma-buf increased by importing gem and gem ref count cannot be decrease
      because of exported dma-buf.
      
      So I add dma_buf_put() for imported gem come from its own gem into each drivers
      having prime_import and prime_export capabilities. With this, only gem ref
      count is increased if importing gem exported from gem of same driver.
      Signed-off-by: NSeung-Woo Kim <sw0312.kim@samsung.com>
      Signed-off-by: NKyungmin.park <kyungmin.park@samsung.com>
      Cc: Inki Dae <inki.dae@samsung.com>
      Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
      Cc: Rob Clark <rob.clark@linaro.org>
      Cc: Alex Deucher <alexander.deucher@amd.com>
      Cc: stable <stable@vger.kernel.org>
      Signed-off-by: NDave Airlie <airlied@redhat.com>
      be8a42ae
    • I
      xen/netfront: improve truesize tracking · d9a58a78
      Ian Campbell 提交于
      Using RX_COPY_THRESHOLD is incorrect if the SKB is actually smaller
      than that. We have already accounted for this in
      NETFRONT_SKB_CB(skb)->pull_to so use that instead.
      
      Fixes WARN_ON from skb_try_coalesce.
      Signed-off-by: NIan Campbell <ian.campbell@citrix.com>
      Cc: Sander Eikelenboom <linux@eikelenboom.it>
      Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
      Cc: annie li <annie.li@oracle.com>
      Cc: xen-devel@lists.xen.org
      Cc: netdev@vger.kernel.org
      Cc: stable@kernel.org # 3.7.x only
      Acked-by: NEric Dumazet <edumazet@google.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      d9a58a78
    • D
      Merge branch 'exynos-drm-fixes' of... · f3215be9
      Dave Airlie 提交于
      Merge branch 'exynos-drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into drm-next
      
      Summary:
      - change exynos file license
        . Most of exynos files had been copied from some randome
          file and not updated correctly(wrong company name used).
          This was our mistakes so chagnes it correctly. For this,
          I'm not sure that this patch should go to -fix or -next.
          So please give me any comment if there is any problem.
      - consider buffer allocation without iommu
        . Without iommu, dma_alloc_attrs function allocates some
          memory region and returns cpu address so this patch makes
          the cpu address to be set to buf->kvaddr correctly
      - cleanups to ipp relevant codes.
      - use common finish page flip function
        . to avoid the duplication of same code, use
          exynos_drm_crtc_finish_pageflip function commonly instead
          of each one.
      - fix fimd resume issue.
        . when fimd was turned off by suspend, there was one issue that
          the fimd wasn't turned on by resume so fix it chaing resume
          condition.
      
      * 'exynos-drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos: (25 commits)
        drm/exynos: move finish page flip to a common place
        drm/exynos: fimd: modify condition in fimd resume
        drm/exynos: Use devm_clk_get in exynos_drm_gsc.c
        drm/exynos: Remove redundant NULL check in exynos_drm_gsc.c
        drm/exynos: Remove explicit freeing using devm_* APIs in exynos_drm_gsc.c
        drm/exynos: Use devm_clk_get in exynos_drm_rotator.c
        drm/exynos: Remove redundant NULL check in exynos_drm_rotator.c
        drm/exynos: Remove unnecessary devm_* freeing APIs in exynos_drm_rotator.c
        drm/exynos: Use devm_clk_get in exynos_drm_fimc.c
        drm/exynos: Remove redundant NULL check
        drm/exynos: Remove explicit freeing using devm_* APIs in exynos_drm_fimc.c
        drm/exynos: Use devm_kzalloc in exynos_drm_ipp.c
        drm/exynos: fix gem buffer allocation type checking
        drm/exynos: remove needless parenthesis.
        drm/exynos: fix incorrect interrupt induced by m2m operation.
        drm/exynos: remove color bar pattern operation.
        drm/exynos: correct some comments to abbreviation.
        drm/exynos: fix build warning.
        drm/exynos: consider both case of vflip and hflip.
        drm/exynos: remove needless error handling to property.
        ...
      f3215be9
    • D
      Merge branch 'master' of git://1984.lsi.us.es/nf · 32fa10b2
      David S. Miller 提交于
      Pablo Neira Ayuso says:
      
      ====================
      The following batch contains Netfilter fixes for 3.8-rc2, they are:
      
      * Fix IPv6 stateless network/port translation (NPT) checksum
        calculation, from Ulrich Weber.
      
      * Fix for xt_recent to avoid memory allocation failures if large
        hashtables are used, from Eric Dumazet.
      
      * Fix missing dependencies in Kconfig for the deprecated NOTRACK,
        from myself.
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      32fa10b2
    • M
      ARM: mx5: Fix MX53 flexcan2 clock · e37f0d5b
      Marek Vasut 提交于
      The second FlexCAN port uses different clock than the first one, configure
      correct clock to prevent hanging of the system during bringing up of the port.
      Signed-off-by: NMarek Vasut <marex@denx.de>
      Cc: Fabio Estevam <fabio.estevam@freescale.com>
      Acked-by: NSascha Hauer <s.hauer@pengutronix.de>
      Signed-off-by: NShawn Guo <shawn.guo@linaro.org>
      e37f0d5b
    • L
      Merge tag 'pm+acpi-for-3.8-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 2a893f91
      Linus Torvalds 提交于
      Pull ACPI and power management fixes from Rafael Wysocki:
      
       - Removal of some ACPICA code that the kernel will never use from Lv
         Zheng.
      
       - APEI fix from Adrian Huang.
      
       - Removal of unnecessary ACPI memory hotplug driver code from Liu
         Jinsong.
      
       - Minor ACPI power management fixes.
      
       - ACPI debug code fix from Joe Perches.
      
       - ACPI fix to make system bus device nodes get the right names.
      
       - PNP resources handling fixes from Witold Szczeponik.
      
       - cpuidle fix for a recent regression stalling boot on systems with
         great numbers of CPUs from Daniel Lezcano.
      
       - cpuidle fixes from Sivaram Nair.
      
       - intel_idle debug message fix from Youquan Song.
      
       - cpufreq build regression fix from Larry Finger.
      
       - cpufreq fix for an obscure initialization race related to statistics
         from Konstantin Khlebnikov.
      
       - cpufreq change disabling the Longhaul driver by default from Rafał
         Bilski.
      
       - PM core fix preventing device suspend errors from happening during
         system suspend due to obscure race conditions.
      
       - PM QoS local variable name cleanup.
      
      * tag 'pm+acpi-for-3.8-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        PM: Move disabling/enabling runtime PM to late suspend/early resume
        PM / QoS: Rename local variable in dev_pm_qos_add_ancestor_request()
        ACPI / scan: Do not use dummy HID for system bus ACPI nodes
        cpufreq / governor: Fix problem with cpufreq_ondemand or cpufreq_conservative
        cpufreq / Longhaul: Disable driver by default
        cpufreq / stats: fix race between stats allocation and first usage
        cpuidle: fix lock contention in the idle path
        intel_idle: pr_debug information need separated
        cpuidle / coupled: fix ready counter decrement
        cpuidle: Fix finding state with min power_usage
        PNP: Handle IORESOURCE_BITS in resource allocation
        PNP: Simplify setting of resources
        ACPI / power: Remove useless message from device registering routine
        ACPI / glue: Update DBG macro to include KERN_DEBUG
        ACPI / PM: Do not apply ACPI_SUCCESS() to acpi_bus_get_device() result
        ACPI / memhotplug: remove redundant logic of acpi memory hotadd
        ACPI / APEI: Fix the returned value in erst_dbg_read
        ACPICA: Remove useless mini-C library.
      2a893f91
    • L
      Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6 · 127aa930
      Linus Torvalds 提交于
      Pull CIFS fixes from Steve French:
       "Misc small cifs fixes"
      
      * 'for-next' of git://git.samba.org/sfrench/cifs-2.6:
        CIFS: Don't let read only caching for mandatory byte-range locked files
        CIFS: Fix write after setting a read lock for read oplock files
        Revert "CIFS: Fix write after setting a read lock for read oplock files"
        cifs: adjust sequence number downward after signing NT_CANCEL request
        cifs: move check for NULL socket into smb_send_rqst
      127aa930
    • P
      ARM: OMAP2+: am33xx-hwmod: Fix wrongly terminated am33xx_usbss_mpu_irqs array · 6adba67e
      Pantelis Antoniou 提交于
      The IRQ array must be terminated by -1 and not by -1+OMAP_INTC_START
      This led to having a resource list of 100s of IRQs.
      
      Looks like this was caused by commit a2cfc509 (ARM: OMAP3+: hwmod: Add
      AM33XX HWMOD data) that probably had some search and replace updates
      done for the patch for sparse irq support.
      Signed-off-by: NPantelis Antoniou <panto@antoniou-consulting.com>
      Acked-by: NPaul Walmsley <paul@pwsan.com>
      [tony@atomide.com: updated wit information about the breaking commit]
      Signed-off-by: NTony Lindgren <tony@atomide.com>
      6adba67e
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs · d287b875
      Linus Torvalds 提交于
      Pull namei.h missing include fix from Al Viro.
      
      The new use of ESTALE in namei.h can cause compile failures on ARM with
      certain configurations due to lack of errno.h.
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
        namei.h: include errno.h
      d287b875
    • A
      sctp: fix Kconfig bug in default cookie hmac selection · 36a25de2
      Alex Elder 提交于
      Commit 0d0863b0 ("sctp: Change defaults on cookie hmac selection")
      added a "choice" to the sctp Kconfig file.  It introduced a bug which
      led to an infinite loop when while running "make oldconfig".
      
      The problem is that the wrong symbol was defined as the default value
      for the choice.  Using the correct value gets rid of the infinite loop.
      
      Note:  if CONFIG_SCTP_COOKIE_HMAC_SHA1=y was present in the input
      config file, both that and CONFIG_SCTP_COOKIE_HMAC_MD5=y be present
      in the generated config file.
      Signed-off-by: NAlex Elder <elder@inktank.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      36a25de2
    • L
      Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 · f7763720
      Linus Torvalds 提交于
      Pull ext4 regression fixes from Ted Ts'o:
       "Bug fixes, including two regressions introduced in v3.8.  The most
        serious of these regressions is a buffer cache leak."
      
      * tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
        ext4: remove duplicate call to ext4_bread() in ext4_init_new_dir()
        ext4: release buffer in failed path in dx_probe()
        ext4: fix configuration dependencies for ext4 ACLs and security labels
      f7763720
    • L
      EDAC: Cleanup device deregistering path · 44d22e24
      Lans Zhang 提交于
      Use device_unregister to replace put_device + device_del for
      cleanup, and fix the potential use after free.
      Signed-off-by: NLans Zhang <jia.zhang@windriver.com>
      Signed-off-by: NBorislav Petkov <bp@alien8.de>
      44d22e24
    • B
      EDAC: Fix EDAC Kconfig menu · 54451663
      Borislav Petkov 提交于
      After f65aad41("MIPS: Cavium: Add EDAC support."), when entering
      the "Device Drivers" toplevel menu in menuconfig, the suboptions behind
      EDAC appeared merged with the rest of the device drivers types. This was
      because the menuconfig option EDAC is querying an EDAC_SUPPORT Kconfig
      bool which was defined after the menu definition.
      
      When pushing EDAC_SUPPORT up, before the menu definition, the variable
      is defined earlier and the above menuconfig artifact doesn't happen.
      
      Drop a useless menuconfig comment while at it.
      
      Cc: Ralf Baechle <ralf@linux-mips.org>
      Signed-off-by: NBorislav Petkov <bp@alien8.de>
      54451663
    • K
      EDAC: Fix kernel panic on module unloading · 311bd842
      Konstantin Khlebnikov 提交于
      This patch fixes use-after-free and double-free bugs in
      edac_mc_sysfs_exit(). mci_pdev has single reference and put_device()
      calls mc_attr_release() which calls kfree(). The following
      device_del() works with already released memory. An another kfree() in
      edac_mc_sysfs_exit() releses the same memory again. Great.
      Signed-off-by: NKonstantin Khlebnikov <khlebnikov@openvz.org>
      Cc: stable@vger.kernel.org # 3.[67]
      Cc: Denis Kirjanov <kirjanov@gmail.com>
      Cc: Mauro Carvalho Chehab <mchehab@redhat.com>
      Link: http://lkml.kernel.org/r/20121214110310.11019.21098.stgit@zurgSigned-off-by: NBorislav Petkov <bp@alien8.de>
      311bd842