1. 16 Aug, 2013 1 commit
  2. 14 Aug, 2013 1 commit
    • Olof Johansson's avatar
      Merge tag 'v3.12-pwm-cleanup-for-olof' of git://github.com/tom3q/linux into next/cleanup · 8b2496a2
      Olof Johansson authored
      From Tomasz Figa:
      Here is the Samsung PWM cleanup series. Particular patches of the series
      involve following modifications:
       - fixing up few things in samsung_pwm_timer clocksource driver,
       - moving remaining Samsung platforms to the new clocksource driver,
       - removing old clocksource driver,
       - adding new multiplatform- and DT-aware PWM driver,
       - moving all Samsung platforms to use the new PWM driver,
       - removing old PWM driver,
       - removing all PWM-related code that is not used anymore.
      
      * tag 'v3.12-pwm-cleanup-for-olof' of git://github.com/tom3q/linux: (684 commits)
        ARM: SAMSUNG: Remove plat/regs-timer.h header
        ARM: SAMSUNG: Remove remaining uses of plat/regs-timer.h header
        ARM: SAMSUNG: Remove pwm-clock infrastructure
        ARM: SAMSUNG: Remove old PWM timer platform devices
        pwm: Remove superseded pwm-samsung-legacy driver
        ARM: SAMSUNG: Modify board files to use new PWM platform device
        ARM: SAMSUNG: Rework private data handling in dev-backlight
        pwm: Add new pwm-samsung driver
        pwm: samsung: Rename to pwm-samsung-legacy
        ARM: SAMSUNG: Remove unused PWM timer IRQ chip code
        ARM: SAMSUNG: Remove old samsung-time driver
        ARM: SAMSUNG: Move all platforms to new clocksource driver
        ARM: SAMSUNG: Set PWM platform data
        ARM: SAMSUNG: Add new PWM platform device
        ARM: SAMSUNG: Unify base address definitions of timer block
        clocksource: samsung_pwm_timer: Handle suspend/resume correctly
        clocksource: samsung_pwm_timer: Do not use clocksource_mmio
        clocksource: samsung_pwm_timer: Cache clocksource register address
        clocksource: samsung_pwm_timer: Correct definition of AUTORELOAD bit
        clocksource: samsung_pwm_timer: Do not request PWM mem region
        + v3.11-rc4
      
      Conflicts:
      	arch/arm/Kconfig.debug
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      8b2496a2
  3. 13 Aug, 2013 1 commit
    • Kevin Hilman's avatar
      Merge branch 'msm/cleanup' into next/cleanup · bee22087
      Kevin Hilman authored
      From David Brown <davidb@codeaurora.org>:
      * msm/cleanup:
        ARM: msm: Only compile io.c on platforms that use it
        iommu/msm: Move mach includes to iommu directory
        ARM: msm: Remove devices-iommu.c
        ARM: msm: Move mach/board.h contents to common.h
        ARM: msm: Migrate msm_timer to CLOCKSOURCE_OF_DECLARE
        ARM: msm: Remove TMR and TMR0 static mappings
        ARM: msm: Move debug-macro.S to include/debug
        ARM: msm: Don't compile __msm_ioremap_caller() unless used
        ARM: msm: Remove unused and unmapped MSM_TLMM_BASE for 8x60
      Signed-off-by: default avatarKevin Hilman <khilman@linaro.org>
      bee22087
  4. 12 Aug, 2013 8 commits
  5. 11 Aug, 2013 1 commit
    • Olof Johansson's avatar
      Merge tag 'omap-for-v3.12/cleanup-unused-defines' of... · 311b79bb
      Olof Johansson authored
      Merge tag 'omap-for-v3.12/cleanup-unused-defines' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/cleanup
      
      From Tony Lindgren:
      Removal of unused omap defines via Paul Walmsley <paul@pwsan.com>:
      
      This series removes the currently-unused PRCM macros from
      arch/arm/mach-omap2.
      
      Basic test logs are available at:
      
      http://www.pwsan.com/omap/testlogs/drop_unused_prcm_macros_v3.11-rc/20130721211401/
      
      Once, years ago, we thought that it would be good to document the PRCM
      register bits in the Linux codebase.  Most folks in the broader
      community did not have access to the same documentation, so we thought
      that they might be able to use these bits to fix bugs and improve the
      code.
      
      We were also able to autogenerate most of these macros, so it was
      thought that defining them in advance would reduce the risk of error,
      inconsistencies, and merge conflicts caused when patch sets
      incrementally defined them by hand.
      
      Well, nice thoughts.  But the first rationale was rendered partially
      obsolete when TI started to release public TRM documentation PDFs at
      some point in the OMAP3 timeframe.  (Despite their weaknesses, TI's
      public OMAP TRMs remain the most useful public documentation available
      for any ARM Linux SoC -- at least to the extent of my knowledge.)  And
      then the current Linux development tropism towards
      development-by-negative-diffstat obliterated the remainder of the
      above two philosophies.
      
      So, for the few, the masochistic, out there who wish to continue
      developing TI PRCM code, I would ask that you resurrect any
      additionally-needed macros from these commits, rather than writing
      them manually.  Purely for the sake of a pleasant atavism, perhaps; the
      way one appreciates a used bookstore, or a video rental store...
      
      And thanks to the upstream maintainers for being patient while we
      adjust.
      
      * tag 'omap-for-v3.12/cleanup-unused-defines' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
        ARM: OMAP5: PRM/CM: Cleanup unused header
        ARM: OMAP4: PRM/CM: Cleanup unused header
        ARM: OMAP3: PRM/CM: Cleanup unused header
        ARM: OMAP2: PRM/CM: Cleanup unused header
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      311b79bb
  6. 09 Aug, 2013 1 commit
  7. 06 Aug, 2013 7 commits
  8. 05 Aug, 2013 12 commits
  9. 04 Aug, 2013 7 commits
    • Linus Torvalds's avatar
      Linux 3.11-rc4 · c095ba72
      Linus Torvalds authored
      c095ba72
    • Olof Johansson's avatar
      Merge tag 'renesas-cleanup-for-v3.12' of... · 1cb3fd09
      Olof Johansson authored
      Merge tag 'renesas-cleanup-for-v3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/cleanup
      
      From Simon Horman:
      renesas-cleanup-for-v3.12 Renesas ARM based SoC cleanups for v3.12
      
      * remove mach/dma.h, it is not used
      * r8a7778 SoC: Removed unused r8a7778_init_irq
      * emev2 SoC: Use less verbose resource declarations
      * emev2 SoC: Correct typo in comment
      * r8a7790 SoC: Remove redundant init_machine callback
      * emev2, r8a7740, r8a7778, r8a7779, sh7372 and sh73a0 SoCs: Remove auxdata
      * emev2, r8a73a4, ape6evm, r8a7790 and sh73a0 SoCs, and
        lager and kzm9g boards: remove init_irq declaration in machine description
      * sh73a0 SoC: pinmux platform device cleanup
      * r8a7778 SoC: add __initdata on resource and device data
      * armadillo800eva board: Remove unused commend and define
      
      * tag 'renesas-cleanup-for-v3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: (22 commits)
        ARM: shmobile: Remove unused mach/dma.h
        ARM: shmobile: r8a7778: remove r8a7778_init_irq()
        ARM: shmobile: Fix EMEV2 clock comment typo
        ARM: shmobile: Make EMEV2 platform devices more compact
        ARM: shmobile: Remove unused EMEV2/KZM9D early console
        ARM: shmobile: Remove redundant r8a7790 callback
        ARM: shmobile: Remove unused sh73a0 auxdata table
        ARM: shmobile: Remove unused sh7372 auxdata table
        ARM: shmobile: Remove unused r8a7779 auxdata table
        ARM: shmobile: Remove unused r8a7778 auxdata and callback
        ARM: shmobile: Remove unused r8a7740 auxdata table
        ARM: shmobile: Remove unused EMEV2 auxdata and callback
        ARM: shmobile: kzm9g: Remove init_irq declaration in machine description
        ARM: shmobile: sh73a0: Remove init_irq declaration in machine description
        ARM: shmobile: lager: Remove init_irq declaration in machine description
        ARM: shmobile: r8a7790: Remove init_irq declaration in machine description
        ARM: shmobile: ape6evm: Remove init_irq declaration in machine description
        ARM: shmobile: r8a73a4: Remove init_irq declaration in machine description
        ARM: shmobile: emev2: Remove init_irq declaration in machine description
        ARM: shmobile: sh73a0 pinmux platform device cleanup
        ...
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      1cb3fd09
    • Linus Torvalds's avatar
      Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma · e56c7561
      Linus Torvalds authored
      Pull dmaengine fixes from Vinod Koul:
       "Two fixes for slave dmaengine.  The first fixes cyclic dma transfers
        for pl330 and the second one makes us return the correct error code on
        probe"
      
      * 'fixes' of git://git.infradead.org/users/vkoul/slave-dma:
        dma: pl330: Fix cyclic transfers
        pch_dma: fix error return code in pch_dma_probe()
      e56c7561
    • Linus Torvalds's avatar
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · 3d90268f
      Linus Torvalds authored
      Pull drm fix from Dave Airlie:
       "Just a quick fix that a few people have reported, be nice to have in
        asap"
      
      The drm tree seems to be very confused about 64-bit divides.  Here it
      uses a slow 64-by-64 bit divide to divide by a small constant.  Oh well.
      Doesn't look performance-critical, just stupid.
      
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
        drm/radeon: fix 64 bit divide in SI spm code
      3d90268f
    • Hugh Dickins's avatar
      tmpfs: fix SEEK_DATA/SEEK_HOLE regression · 387aae6f
      Hugh Dickins authored
      Commit 46a1c2c7 ("vfs: export lseek_execute() to modules") broke the
      tmpfs SEEK_DATA/SEEK_HOLE implementation, because vfs_setpos() converts
      the carefully prepared -ENXIO to -EINVAL.  Other filesystems avoid it in
      error cases: do the same in tmpfs.
      Signed-off-by: default avatarHugh Dickins <hughd@google.com>
      Cc: Jie Liu <jeff.liu@oracle.com>
      Cc: Al Viro <viro@zeniv.linux.org.uk>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      387aae6f
    • Linus Torvalds's avatar
      Merge tag 'sound-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · 2f853991
      Linus Torvalds authored
      Pull sound fixes from Takashi Iwai:
       "All small regression or small fixes, nothing surprising at this stage.
      
         - regression fix for intel Mac Mini quirk
         - compress ioctl error fix
         - ASoC fixes for control change notifications, some UI fixes,
           driver-specific fixes (resource leak, build errors, etc)"
      
      * tag 'sound-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
        ALSA: hda - Fix missing fixup for Mac Mini with STAC9221
        ASoC: wm0010: Fix resource leak
        ASoC: au1x: Fix build
        ASoC: bf5xx-ac97: Fix compile error with SND_BF5XX_HAVE_COLD_RESET
        ASoC: bfin-ac97: Fix prototype error following AC'97 refactoring
        ALSA: compress: fix the return value for SNDRV_COMPRESS_VERSION
        ASoC: dapm: Fix return value of snd_soc_dapm_put_{volsw,enum_virt}()
      2f853991
    • Alex Deucher's avatar
      drm/radeon: fix 64 bit divide in SI spm code · adfb8e51
      Alex Deucher authored
      Forgot to use the appropriate math64 function.
      Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
      Signed-off-by: default avatarDave Airlie <airlied@gmail.com>
      adfb8e51
  10. 03 Aug, 2013 1 commit
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 72a67a94
      Linus Torvalds authored
      Pull networking fixes from David Miller:
      
       1) Don't ignore user initiated wireless regulatory settings on cards
          with custom regulatory domains, from Arik Nemtsov.
      
       2) Fix length check of bluetooth information responses, from Jaganath
          Kanakkassery.
      
       3) Fix misuse of PTR_ERR in btusb, from Adam Lee.
      
       4) Handle rfkill properly while iwlwifi devices are offline, from
          Emmanuel Grumbach.
      
       5) Fix r815x devices DMA'ing to stack buffers, from Hayes Wang.
      
       6) Kernel info leak in ATM packet scheduler, from Dan Carpenter.
      
       7) 8139cp doesn't check for DMA mapping errors, from Neil Horman.
      
       8) Fix bridge multicast code to not snoop when no querier exists,
          otherwise mutlicast traffic is lost.  From Linus Lüssing.
      
       9) Avoid soft lockups in fib6_run_gc(), from Michal Kubecek.
      
      10) Fix races in automatic address asignment on ipv6, which can result
          in incorrect lifetime assignments.  From Jiri Benc.
      
      11) Cure build bustage when CONFIG_NET_LL_RX_POLL is not set and rename
          it CONFIG_NET_RX_BUSY_POLL to eliminate the last reference to the
          original naming of this feature.  From Cong Wang.
      
      12) Fix crash in TIPC when server socket creation fails, from Ying Xue.
      
      13) macvlan_changelink() silently succeeds when it shouldn't, from
          Michael S Tsirkin.
      
      14) HTB packet scheduler can crash due to sign extension, fix from
          Stephen Hemminger.
      
      15) With the cable unplugged, r8169 prints out a message every 10
          seconds, make it netif_dbg() instead of netif_warn().  From Peter
          Wu.
      
      16) Fix memory leak in rtm_to_ifaddr(), from Daniel Borkmann.
      
      17) sis900 gets spurious TX queue timeouts due to mismanagement of link
          carrier state, from Denis Kirjanov.
      
      18) Validate somaxconn sysctl to make sure it fits inside of a u16.
          From Roman Gushchin.
      
      19) Fix MAC address filtering on qlcnic, from Shahed Shaikh.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (68 commits)
        qlcnic: Fix for flash update failure on 83xx adapter
        qlcnic: Fix link speed and duplex display for 83xx adapter
        qlcnic: Fix link speed display for 82xx adapter
        qlcnic: Fix external loopback test.
        qlcnic: Removed adapter series name from warning messages.
        qlcnic: Free up memory in error path.
        qlcnic: Fix ingress MAC learning
        qlcnic: Fix MAC address filter issue on 82xx adapter
        net: ethernet: davinci_emac: drop IRQF_DISABLED
        netlabel: use domain based selectors when address based selectors are not available
        net: check net.core.somaxconn sysctl values
        sis900: Fix the tx queue timeout issue
        net: rtm_to_ifaddr: free ifa if ifa_cacheinfo processing fails
        r8169: remove "PHY reset until link up" log spam
        net: ethernet: cpsw: drop IRQF_DISABLED
        htb: fix sign extension bug
        macvlan: handle set_promiscuity failures
        macvlan: better mode validation
        tipc: fix oops when creating server socket fails
        net: rename CONFIG_NET_LL_RX_POLL to CONFIG_NET_RX_BUSY_POLL
        ...
      72a67a94