1. 10 May, 2013 2 commits
    • David S. Miller's avatar
      Merge branch 'wireless' · 61f15982
      David S. Miller authored
      John W. Linville says:
      
      ====================
      Here is a batch of fixes intended for the 3.10 stream.
      
      Amitkumar Karwar provides an mwifiex fix to plug a memory leak when
      the driver is unloaded.
      
      Bing Zhao brings an mwifiex fix for some flag handling that leads to
      log spam and an unusable interface.
      
      Daniel Drake offers an mwifiex fix for multicast filter setup, to
      correctly implement wakeup behaviour for multicast WOL.
      
      Felix Fietkau fixes an ath9k problem that produces logspam and keycache
      errors due to a bad return code.
      
      Stanislaw Gruszka produces an fix for a WARNING from ath5k, and an
      iwl4965 workaround to stop advertising a feature that doesn't work with
      the current mac80211 implementation.
      
      Sujith Manoharan gives us an ath9k fix to reprogram the HW beacon timers
      after a TSF update, and an initvals fix for the AR9565 device.
      
      Thommy Jakobsson fixes an rx descriptor underrun on b43.
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      61f15982
    • John W. Linville's avatar
      Merge branch 'master' of... · 4f81d715
      John W. Linville authored
      Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
      4f81d715
  2. 09 May, 2013 38 commits
    • Linus Torvalds's avatar
      Merge tag 'please-pull-pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux · 70eba422
      Linus Torvalds authored
      Pull trivial pstore update from Tony Luck:
       "Couple of pstore cleanups"
      
      It turns out that the kmemdup() conversion ends up being undone by the
      fact that the memory block also needed the ecc information (see commit
      bd08ec33: "pstore/ram: Restore ecc information block"), so all that
      remains after merging is the error return code change.
      
      * tag 'please-pull-pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
        pstore/ram: fix error return code in ramoops_probe()
        fs: pstore: Replaced calls to kmalloc and memcpy with kmemdup
      70eba422
    • Linus Torvalds's avatar
      Merge git://git.infradead.org/users/willy/linux-nvme · 2d4fe278
      Linus Torvalds authored
      Pull NVMe driver update from Matthew Wilcox:
       "Lots of exciting new features in the NVM Express driver this time,
        including support for emulating SCSI commands, discard support and the
        ability to submit per-sector metadata with I/Os.
      
        It's still mostly bugfixes though!"
      
      * git://git.infradead.org/users/willy/linux-nvme: (27 commits)
        NVMe: Use user defined admin ioctl timeout
        NVMe: Simplify Firmware Activate code slightly
        NVMe: Only clear the enable bit when disabling controller
        NVMe: Wait for device to acknowledge shutdown
        NVMe: Schedule timeout for sync commands
        NVMe: Meta-data support in NVME_IOCTL_SUBMIT_IO
        NVMe: Device specific stripe size handling
        NVMe: Split non-mergeable bio requests
        NVMe: Remove dead code in nvme_dev_add
        NVMe: Check for NULL memory in nvme_dev_add
        NVMe: Fix error clean-up on nvme_alloc_queue
        NVMe: Free admin queue on request_irq error
        NVMe: Add scsi unmap to SG_IO
        NVMe: queue usage fixes in nvme-scsi
        NVMe: Set TASK_INTERRUPTIBLE before processing queues
        NVMe: Add a character device for each nvme device
        NVMe: Fix endian-related problems in user I/O submission path
        NVMe: Fix I/O cancellation status on big-endian machines
        NVMe: Fix sparse warnings in scsi emulation
        NVMe: Don't fail initialisation unnecessarily
        ...
      2d4fe278
    • Linus Torvalds's avatar
      Merge tag 'acpi-fixes-3.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 2e99f3a1
      Linus Torvalds authored
      Pull ACPICA fixes from Rafael Wysocki:
      
       - _INI regression fix from Tomasz Nowicki.
      
       - Fix for a possible memory leak in _OSI support routine from Jung-uk
         Kim.
      
       - Fix for a possible buffer overflow during field unit read operation
         from Bob Moore.
      
      * tag 'acpi-fixes-3.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        ACPICA: ACPICA: Fix for _INI regression
        ACPICA: _OSI support: Fix possible memory leak
        ACPICA: Fix possible buffer overflow during a field unit read operation
      2e99f3a1
    • Linus Torvalds's avatar
      Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · fc72053b
      Linus Torvalds authored
      Pull ARM SoC fixes and straggler patches from Olof Johansson:
       "A collection of fixes for fall out from 3.10 merge window, some build
        fixes and warning cleanups and a small handful of patches that were
        small and contained and made sense to still include in 3.10 (some of
        these have also been in -next since the merge window opened).
      
        Largest continous series is for OMAP, but there's a handful for other
        platforms.
      
        For i.MX, one of the patches are framebuffer fixups due to fallout
        during the merge window, and the other removes some stale and broken
        code."
      
      * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (34 commits)
        ARM: exynos: dts: Fixed vbus-gpios
        ARM: EXYNOS5: Fix kernel dump in AFTR idle mode
        ARM: ux500: Rid ignored return value of regulator_enable() compiler warning
        ARM: ux500: read the correct soc_id number
        ARM: exynos: dts: cros5250: add cyapa trackpad
        video: mxsfb: Adapt to new videomode API
        ARM: imx: Select GENERIC_ALLOCATOR
        ARM: imx: compile fix for hotplug.c
        ARM: dts: don't assume boards are using twl4030 for omap3
        ARM: OMAP2+: Remove bogus IS_ERR_OR_NULL checking from id.c
        ARM: dts: Configure and fix the McSPI pins for 4430sdp
        ARM: dts: AM33XX: Add GPMC node
        ARM: dts: OMAP4460: Fix CPU OPP voltages
        ARM: dts: OMAP36xx: Fix CPU OPP voltages
        ARM: OMAP4+: omap2plus_defconfig: Enable audio via TWL6040 as module
        ARM: OMAP2: AM33XX: id: Add support for new AM335x PG2.1 Si
        omap: mux: add AM/DM37x gpios
        ARM: OMAP1: DMA: fix error handling in omap1_system_dma_init()
        ARM: OMAP2+: omap_device: use late_initcall_sync
        ARM: OMAP: RX-51: change probe order of touchscreen and panel SPI devices
        ...
      fc72053b
    • Linus Torvalds's avatar
      Merge tag 'xtensa-next-20130508' of git://github.com/czankel/xtensa-linux · c61c48df
      Linus Torvalds authored
      Pull xtensa updates from Chris Zankel:
       "Support for the latest MMU architecture that allows for a larger
        accessible memory region, and various bug-fixes"
      
      * tag 'xtensa-next-20130508' of git://github.com/czankel/xtensa-linux:
        xtensa: Switch to asm-generic/linkage.h
        xtensa: fix redboot load address
        xtensa: ISS: fix timer_lock usage in rs_open
        xtensa: disable IRQs while IRQ handler is running
        xtensa: enable lockdep support
        xtensa: fix arch_irqs_disabled_flags implementation
        xtensa: add irq flags trace support
        xtensa: provide custom CALLER_ADDR* implementations
        xtensa: add stacktrace support
        xtensa: clean up stpill_registers
        xtensa: don't use a7 in simcalls
        xtensa: don't attempt to use unconfigured timers
        xtensa: provide default platform_pcibios_init implementation
        xtensa: remove KCORE_ELF again
        xtensa: document MMUv3 setup sequence
        xtensa: add MMU v3 support
        xtensa: fix ibreakenable register update
        xtensa: fix oprofile building as module
      c61c48df
    • Linus Torvalds's avatar
      Merge tag 'arc-v3.10-rc1-part1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc · e30f4192
      Linus Torvalds authored
      Pull ARC port updates from Vineet Gupta:
       "Support for two new platforms based on ARC700:
         - Abilis TB10x SoC [Chritisian/Pierrick]
         - Simulator only System-C Model [Mischa]
      
        ARC specific MM improvements:
         - Avoid full TLB flush (ASID increment) on munmap (even single page)
         - VIPT Cache Flushing improvements
           + Delayed dcache flush for non-aliasing dcache (big performance boost)
           + icache flush aliasing agnostic (no need to kill all possible aliases)
      
        Others:
         - Avoid needless rebuild of DTB files for every kernel build
         - Remove builtin cmdline as that is already provided by DeviceTree/bootargs
         - Fixing unaligned access emulation corner case
         - checkpatch fixes [Sachin]
         - Various fixlets [Noam]
         - Minor build failures/cleanups"
      
      * tag 'arc-v3.10-rc1-part1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc: (35 commits)
        ARC: [mm] Lazy D-cache flush (non aliasing VIPT)
        ARC: [mm] micro-optimize page size icache invalidate
        ARC: [mm] remove the pessimistic all-alias-invalidate icache helpers
        ARC: [mm] consolidate icache/dcache sync code
        ARC: [mm] optimise icache flush for kernel mappings
        ARC: [mm] optimise icache flush for user mappings
        ARC: [mm] optimize needless full mm TLB flush on munmap
        ARC: Add support for nSIM OSCI System C model
        ARC: [TB10x] Adapt device tree to new compatible string
        ARC: [TB10x] Add support for TB10x platform
        ARC: [TB10x] Device tree of TB100 and TB101 Development Kits
        ARC: Prepare interrupt code for external controllers
        ARC: Allow embedded arc-intc to be properly placed in DT intc hierarchy
        ARC: [cmdline] Don't overwrite u-boot provided bootargs
        ARC: [cmdline] Remove CONFIG_CMDLINE
        ARC: [plat-arcfpga] defconfig update
        ARC: unaligned access emulation broken if callee-reg dest of LD/ST
        ARC: unaligned access emulation error handling consolidation
        ARC: Debug/crash-printing Improvements
        ARC: fix typo with clock speed
        ...
      e30f4192
    • Linus Torvalds's avatar
      Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile · b32729b1
      Linus Torvalds authored
      Pull tile update from Chris Metcalf:
       "The interesting bug fix is support for the upcoming "4.2" release of
        the Tilera hypervisor, which by default launches Linux at privilege
        level 2 instead of 1.  The fix lets new and old hypervisors and
        Linuxes interoperate more smoothly, so I've tagged it for
        stable@kernel.org so that older Linuxes will be able to boot under the
        newer hypervisor."
      
      * 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
        usb: tilegx: fix memleak when create hcd fail
        arch/tile: remove inline marking of EXPORT_SYMBOL functions
        rtc: rtc-tile: add missing platform_device_unregister() when module exit
        tile: support new Tilera hypervisor
      b32729b1
    • Li Zefan's avatar
      shm: fix null pointer deref when userspace specifies invalid hugepage size · 091d0d55
      Li Zefan authored
      Dave reported an oops triggered by trinity:
      
        BUG: unable to handle kernel NULL pointer dereference at 0000000000000008
        IP: newseg+0x10d/0x390
        PGD cf8c1067 PUD cf8c2067 PMD 0
        Oops: 0000 [#1] PREEMPT SMP DEBUG_PAGEALLOC
        CPU: 2 PID: 7636 Comm: trinity-child2 Not tainted 3.9.0+#67
        ...
        Call Trace:
          ipcget+0x182/0x380
          SyS_shmget+0x5a/0x60
          tracesys+0xdd/0xe2
      
      This bug was introduced by commit af73e4d9 ("hugetlbfs: fix mmap
      failure in unaligned size request").
      Reported-by: default avatarDave Jones <davej@redhat.com>
      Cc: <stable@vger.kernel.org>
      Signed-off-by: default avatarLi Zefan <lizfan@huawei.com>
      Reviewed-by: default avatarNaoya Horiguchi <n-horiguchi@ah.jp.nec.com>
      Acked-by: default avatarRik van Riel <riel@redhat.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      091d0d55
    • Rik van Riel's avatar
      ipc,sem: fix semctl(..., GETNCNT) · de2657f9
      Rik van Riel authored
      The semctl GETNCNT returns the number of semops waiting for the
      specified semaphore to become nonzero.  After commit 9f1bc2c9
      ("ipc,sem: have only one list in struct sem_queue"), the semops waiting
      on just one semaphore are waiting on that semaphore's list.
      
      In order to return the correct count, we have to walk that list too, in
      addition to the sem_array's list for complex operations.
      Signed-off-by: default avatarRik van Riel <riel@redhat.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      de2657f9
    • Rik van Riel's avatar
      ipc,sem: fix semctl(..., GETZCNT) · ebc2e5e6
      Rik van Riel authored
      The semctl GETZCNT returns the number of semops waiting for the
      specified semaphore to become zero.  After commit 9f1bc2c9
      ("ipc,sem: have only one list in struct sem_queue"), the semops waiting
      on just one semaphore are waiting on that semaphore's list.
      
      In order to return the correct count, we have to walk that list too, in
      addition to the sem_array's list for complex operations.
      
      This bug broke dbench; it works again with this patch applied.
      Signed-off-by: default avatarRik van Riel <riel@redhat.com>
      Reported-by: default avatarKent Overstreet <koverstreet@google.com>
      Tested-by: default avatarKent Overstreet <koverstreet@google.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      ebc2e5e6
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs · 07e07450
      Linus Torvalds authored
      Pull more vfs fixes from Al Viro:
       "Regression fix from Geert + yet another open-coded kernel_read()"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
        ecryptfs: don't open-code kernel_read()
        xtensa simdisk: Fix proc_create_data() conversion fallout
      07e07450
    • Doug Anderson's avatar
      ARM: exynos: dts: Fixed vbus-gpios · c58c1a4c
      Doug Anderson authored
      The 'samsung,vbus-gpio' was submitted before pinmux landed for
      exynos5250 and uses the old-style gpio specifier.  Fix the two
      exynos5250 boards that use it.
      Signed-off-by: default avatarDoug Anderson <dianders@chromium.org>
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      c58c1a4c
    • Inderpal Singh's avatar
      ARM: EXYNOS5: Fix kernel dump in AFTR idle mode · 08858461
      Inderpal Singh authored
      The kernel crashes while resuming from AFTR idle mode. It happens
      because L2 cache was not going into retention state.
      
      This patch configures the USE_RETENTION bit of ARM_L2_OPTION register
      so that it does not depend on MANUAL_L2RSTDISABLE_CONTROL of
      ARM_COMMON_OPTION register for L2RSTDISABLE signal.
      Signed-off-by: default avatarInderpal Singh <inderpal.singh@linaro.org>
      Tested-by: default avatarChander Kashyap <chander.kashyap@linaro.org>
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      08858461
    • Olof Johansson's avatar
      Merge tag 'omap-for-v3.10/dt-fixes-for-merge-window' of... · 6e6a3af7
      Olof Johansson authored
      Merge tag 'omap-for-v3.10/dt-fixes-for-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes
      
      From Tony Lindgren:
      Omap device tree fixes for issue discovered during the merge window:
      
      - Fix triggering for GPIO interrupts that's needed for 4430sdp
        Ethernet. Otherwise booting with nfsroot won't work.
      - Fix CPU operating point values
      - Fix wrong assumption that twl PMIC is always connected to omap3
      - Add gpmc for am33xx so beaglebone users can use the bus
      - Cosmetic fix for mcspi pin muxing to avoid confusion
      
      * tag 'omap-for-v3.10/dt-fixes-for-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
        ARM: dts: don't assume boards are using twl4030 for omap3
        ARM: dts: Configure and fix the McSPI pins for 4430sdp
        ARM: dts: AM33XX: Add GPMC node
        ARM: dts: OMAP4460: Fix CPU OPP voltages
        ARM: dts: OMAP36xx: Fix CPU OPP voltages
        ARM: dts: OMAP4: Fix ethernet IRQ for OMAP4 boards
      6e6a3af7
    • Olof Johansson's avatar
      Merge tag 'omap-for-v3.10/fixes-for-merge-window-part2' of... · 474dbaa7
      Olof Johansson authored
      Merge tag 'omap-for-v3.10/fixes-for-merge-window-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes
      
      From Tony Lindgren:
      Omap fixes for things that were discovered during the merge window:
      
      - Few GPMC fixes and binding doc updates noted after sending
        pull requests for the GPMC branch.
      - Board fixes for beagle usb host and rx51 spi probe order
      - SoC fixes dt earlyprintk, omap1 dma and omap2+ id.c error
        handling fixes
      
      Then few minor things that are not strictly fixes but are good
      to get out of the way:
      
      - Add missing legacy mux registers for am/dm73x gpio
      - Add detection for am33xx pg2.1 silicon
      - Enable twl4030 audio modules in defconfig
      
      * tag 'omap-for-v3.10/fixes-for-merge-window-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
        ARM: OMAP2+: Remove bogus IS_ERR_OR_NULL checking from id.c
        ARM: OMAP4+: omap2plus_defconfig: Enable audio via TWL6040 as module
        ARM: OMAP2: AM33XX: id: Add support for new AM335x PG2.1 Si
        omap: mux: add AM/DM37x gpios
        ARM: OMAP1: DMA: fix error handling in omap1_system_dma_init()
        ARM: OMAP2+: omap_device: use late_initcall_sync
        ARM: OMAP: RX-51: change probe order of touchscreen and panel SPI devices
        ARM: OMAP3: Beagle: Fix USB Host on beagle xM Ax/Bx
        ARM: OMAP2+: only WARN if a GPMC child probe function fail
        ARM: OMAP2+: only search for GPMC DT child nodes on probe
        Documentation: dt: update properties in TI GPMC NAND example
        Documentation: dt: update TI GPMC ethernet binding properties
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      474dbaa7
    • Lee Jones's avatar
      ARM: ux500: Rid ignored return value of regulator_enable() compiler warning · 27d4cdca
      Lee Jones authored
      arch/arm/mach-ux500/board-mop500.c: In function ‘mop500_prox_activate’:
      arch/arm/mach-ux500/board-mop500.c:406:18: warning: ignoring return value of
              ‘regulator_enable’, declared with attribute warn_unused_result
              [-Wunused-result]
      Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
      Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      27d4cdca
    • Fabio Baltieri's avatar
      ARM: ux500: read the correct soc_id number · 33c8abce
      Fabio Baltieri authored
      Fix db8500_read_soc_id() to read all five soc_id number locations
      instead of repeating the second one two times.
      Signed-off-by: default avatarFabio Baltieri <fabio.baltieri@linaro.org>
      Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      33c8abce
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs · 983a5f84
      Linus Torvalds authored
      Pull btrfs update from Chris Mason:
       "These are mostly fixes.  The biggest exceptions are Josef's skinny
        extents and Jan Schmidt's code to rebuild our quota indexes if they
        get out of sync (or you enable quotas on an existing filesystem).
      
        The skinny extents are off by default because they are a new variation
        on the extent allocation tree format.  btrfstune -x enables them, and
        the new format makes the extent allocation tree about 30% smaller.
      
        I rebased this a few days ago to rework Dave Sterba's crc checks on
        the super block, but almost all of these go back to rc6, since I
        though 3.9 was due any minute.
      
        The biggest missing fix is the tracepoint bug that was hit late in
        3.9.  I ran into problems with that in overnight testing and I'm still
        tracking it down.  I'll definitely have that fixed for rc2."
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: (101 commits)
        Btrfs: allow superblock mismatch from older mkfs
        btrfs: enhance superblock checks
        btrfs: fix misleading variable name for flags
        btrfs: use unsigned long type for extent state bits
        Btrfs: improve the loop of scrub_stripe
        btrfs: read entire device info under lock
        btrfs: remove unused gfp mask parameter from release_extent_buffer callchain
        btrfs: handle errors returned from get_tree_block_key
        btrfs: make static code static & remove dead code
        Btrfs: deal with errors in write_dev_supers
        Btrfs: remove almost all of the BUG()'s from tree-log.c
        Btrfs: deal with free space cache errors while replaying log
        Btrfs: automatic rescan after "quota enable" command
        Btrfs: rescan for qgroups
        Btrfs: split btrfs_qgroup_account_ref into four functions
        Btrfs: allocate new chunks if the space is not enough for global rsv
        Btrfs: separate sequence numbers for delayed ref tracking and tree mod log
        btrfs: move leak debug code to functions
        Btrfs: return free space in cow error path
        Btrfs: set UUID in root_item for created trees
        ...
      983a5f84
    • Olof Johansson's avatar
      ARM: exynos: dts: cros5250: add cyapa trackpad · ee99ce89
      Olof Johansson authored
      Trivial patch, adding the i2c Cypress trackpad used on Snow.
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      Reviewed-by: default avatarDoug Anderson <dianders@chromium.org>
      Acked-by: default avatarKukjin Kim <kgene.kim@samsung.com>
      ee99ce89
    • Linus Torvalds's avatar
      Merge tag 'for-linus-v3.10-rc1-2' of git://oss.sgi.com/xfs/xfs · 8769e078
      Linus Torvalds authored
      Pull xfs update (#2) from Ben Myers:
      
       - add CONFIG_XFS_WARN, a step between zero debugging and
         CONFIG_XFS_DEBUG.
      
       - fix attrmulti and attrlist to fall back to vmalloc when kmalloc
         fails.
      
      * tag 'for-linus-v3.10-rc1-2' of git://oss.sgi.com/xfs/xfs:
        xfs: fallback to vmalloc for large buffers in xfs_compat_attrlist_by_handle
        xfs: fallback to vmalloc for large buffers in xfs_attrlist_by_handle
        xfs: introduce CONFIG_XFS_WARN
      8769e078
    • Fabio Estevam's avatar
      video: mxsfb: Adapt to new videomode API · d7321df3
      Fabio Estevam authored
      commit 6cd2c7db (videomode: videomode_from_timing work) changed the name of
      the function from videomode_from_timing() to videomode_from_timings().
      
      commit 32ed6ef1 (videomode: create enum for videomode's display flags) changed
      the 'data_flags' field in videomode structure to 'flags'
      
      Adapt to these changes in order to fix the following errors:
      
      drivers/video/mxsfb.c:761:3: error: too many arguments to function 'videomode_from_timing'
      drivers/video/mxsfb.c:761:7: error: void value not ignored as it ought to be
      drivers/video/mxsfb.c:768:9: error: 'struct videomode' has no member named 'data_flags'
      drivers/video/mxsfb.c:770:9: error: 'struct videomode' has no member named 'data_flags'
      
      Also, select VIDEOMODE_HELPER instead of OF_VIDEOMODE, as this one is
      deprecated.
      Signed-off-by: default avatarFabio Estevam <fabio.estevam@freescale.com>
      Acked-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
      Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      d7321df3
    • Fabio Estevam's avatar
      ARM: imx: Select GENERIC_ALLOCATOR · 60371952
      Fabio Estevam authored
      Since commit 657eee7d (media: coda: use genalloc API) the following build
      error happens with imx_v4_v5_defconfig:
      
      drivers/built-in.o: In function 'coda_remove':
      clk-composite.c:(.text+0x112180): undefined reference to 'gen_pool_free'
      drivers/built-in.o: In function 'coda_probe':
      clk-composite.c:(.text+0x112310): undefined reference to 'of_get_named_gen_pool'
      clk-composite.c:(.text+0x1123f4): undefined reference to 'gen_pool_alloc'
      clk-composite.c:(.text+0x11240c): undefined reference to 'gen_pool_virt_to_phys'
      clk-composite.c:(.text+0x112458): undefined reference to 'dev_get_gen_pool'
      
      Select GENERIC_ALLOCATOR and get rid of the custom IRAM_ALLOC.
      Signed-off-by: default avatarFabio Estevam <fabio.estevam@freescale.com>
      Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      60371952
    • Shawn Guo's avatar
      ARM: imx: compile fix for hotplug.c · 009e63f8
      Shawn Guo authored
      Commit bca7a5a0 (ARM: cpu hotplug: remove majority of cache flushing
      from platforms) removes include of <asm/cacheflush.h> and hence
      discovers a few indirect inclusion and declaration problems as below.
      
        CC      arch/arm/mach-imx/hotplug.o
      In file included from arch/arm/mach-imx/hotplug.c:16:0:
      arch/arm/mach-imx/common.h:100:29: warning: ‘struct pt_regs’ declared inside parameter list [enabled by default]
      arch/arm/mach-imx/common.h:100:29: warning: its scope is only this definition or declaration, which is probably not what you want [enabled by default]
      arch/arm/mach-imx/common.h:101:29: warning: ‘struct pt_regs’ declared inside parameter list [enabled by default]
      arch/arm/mach-imx/hotplug.c: In function ‘imx_cpu_die’:
      arch/arm/mach-imx/hotplug.c:53:2: error: implicit declaration of function ‘cpu_do_idle’ [-Werror=implicit-function-declaration]
      arch/arm/mach-imx/hotplug.c: In function ‘imx_cpu_kill’:
      arch/arm/mach-imx/hotplug.c:58:26: error: ‘jiffies’ undeclared (first use in this function)
      arch/arm/mach-imx/hotplug.c:58:26: note: each undeclared identifier is reported only once for each function it appears in
      arch/arm/mach-imx/hotplug.c:58:2: error: implicit declaration of function ‘msecs_to_jiffies’ [-Werror=implicit-function-declaration]
      arch/arm/mach-imx/hotplug.c:61:3: error: implicit declaration of function ‘time_after’ [-Werror=implicit-function-declaration]
      
      Fix them by adding the needed inclusion and declaration.
      Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
      Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
      Acked-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      009e63f8
    • Olof Johansson's avatar
      Merge branch 'late/fixes' into fixes · 5497e7b8
      Olof Johansson authored
      * late/fixes:
        ARM: OMAP2+: Fix unmet direct dependencies for SERIAL_OMAP
        ARM: ux500: always select ABX500_CORE
        ARM: SIRF: select SMP_ON_UP only on SMP builds
        ARM: SPEAr: conditionalize l2x0 support
        ARM: imx: build CPU suspend code only when needed
        ARM: OMAP: build SMP code only for OMAP4/5
        ARM: tegra: Tegra114 needs CPU_FREQ_TABLE
        ARM: default machine descriptor for multiplatform
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      5497e7b8
    • Keith Busch's avatar
      94f370ca
    • Libo Chen's avatar
      usb: tilegx: fix memleak when create hcd fail · abab8761
      Libo Chen authored
      When usb_create_hcd fail, we should call gxio_usb_host_destroy
      Signed-off-by: default avatarLibo Chen <libo.chen@huawei.com>
      Signed-off-by: Chris Metcalf <cmetcalf@tilera.com> [extended to EHCI]
      abab8761
    • Denis Efremov's avatar
      arch/tile: remove inline marking of EXPORT_SYMBOL functions · 4833d7f0
      Denis Efremov authored
      EXPORT_SYMBOL and inline directives are contradictory to each other.
      The patch fixes this inconsistency.
      
      Found by Linux Driver Verification project (linuxtesting.org).
      Signed-off-by: default avatarDenis Efremov <yefremov.denis@gmail.com>
      Signed-off-by: default avatarChris Metcalf <cmetcalf@tilera.com>
      4833d7f0
    • Al Viro's avatar
      ecryptfs: don't open-code kernel_read() · 39dfe6c6
      Al Viro authored
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
      39dfe6c6
    • Linus Torvalds's avatar
      Merge tag 'nfs-for-3.10-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs · 8cbc95ee
      Linus Torvalds authored
      Pull more NFS client bugfixes from Trond Myklebust:
      
       - Ensure that we match the 'sec=' mount flavour against the server list
      
       - Fix the NFSv4 byte range locking in the presence of delegations
      
       - Ensure that we conform to the NFSv4.1 spec w.r.t.  freeing lock
         stateids
      
       - Fix a pNFS data server connection race
      
      * tag 'nfs-for-3.10-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
        NFS4.1 Fix data server connection race
        NFSv3: match sec= flavor against server list
        NFSv4.1: Ensure that we free the lock stateid on the server
        NFSv4: Convert nfs41_free_stateid to use an asynchronous RPC call
        SUNRPC: Don't spam syslog with "Pseudoflavor not found" messages
        NFSv4.x: Fix handling of partially delegated locks
      8cbc95ee
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · ea44083a
      Linus Torvalds authored
      Pull networking update from David Miller:
      
       1) Propagate return error values properly in irda, spider_net, sfc, and
          bfin_mac.  From Wei Yongjun.
      
       2) Fix fec driver OOPS on rapid link up/down, from Frank Li.
      
       3) FIX VF resource allocation and chip message payload length errors in
          be2net driver, from Sathya Perla.
      
       4) Fix inner protocol inspection during GSO from Pravin B Shelar.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
        if_cablemodem.h: Add parenthesis around ioctl macros
        gso: Handle Trans-Ether-Bridging protocol in skb_network_protocol()
        net: fec: fix kernel oops when plug/unplug cable many times
        bfin_mac: fix error return code in bfin_mac_probe()
        sfc: fix return value check in efx_ptp_probe_channel()
        net/spider_net: fix error return code in spider_net_open()
        net/irda: fix error return code in bfin_sir_open()
        net: of_mdio: fix behavior on missing phy device
        sierra_net: keep status interrupt URB active
        usbnet: allow status interrupt URB to always be active
        qmi_wwan/cdc_ether: add device IDs for Dell 5804 (Novatel E371) WWAN card
        be2net: disable TX in be_close()
        be2net: fix EQ from getting full while cleaning RX CQ
        be2net: fix payload_len value for GET_MAC_LIST cmd req
        be2net: provision VF resources before enabling SR-IOV
      ea44083a
    • Linus Torvalds's avatar
      Merge tag 'pci-v3.10-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci · e15e6119
      Linus Torvalds authored
      Pull PCI updates from Bjorn Helgaas:
       "MSI:
            PCI: Set ->mask_pos correctly
        Hotplug:
            PCI: Delay final fixups until resources are assigned
        Moorestown:
            x86/pci/mrst: Use configuration mechanism 1 for 00:00.0, 00:02.0, 00:03.0"
      
      * tag 'pci-v3.10-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
        PCI: Delay final fixups until resources are assigned
        x86/pci/mrst: Use configuration mechanism 1 for 00:00.0, 00:02.0, 00:03.0
        PCI: Set ->mask_pos correctly
      e15e6119
    • Geert Uytterhoeven's avatar
      xtensa simdisk: Fix proc_create_data() conversion fallout · 0757f615
      Geert Uytterhoeven authored
      arch/xtensa/platforms/iss/simdisk.c: In function 'proc_read_simdisk':
      arch/xtensa/platforms/iss/simdisk.c:220:12: warning: initialization discards 'const' qualifier from pointer target type [enabled by default]
      arch/xtensa/platforms/iss/simdisk.c: In function 'proc_write_simdisk':
      arch/xtensa/platforms/iss/simdisk.c:241:38: error: 'buffer' undeclared (first use in this function)
      arch/xtensa/platforms/iss/simdisk.c:241:38: note: each undeclared identifier is reported only once for each function it appears in
      
      Introduced by commit a69755b1 ("xtensa
      simdisk: switch to proc_create_data()")
      Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
      0757f615
    • Linus Torvalds's avatar
      Merge tag 'for-linus-20130509' of git://git.infradead.org/linux-mtd · a637b0d4
      Linus Torvalds authored
      Pull MTD update from David Woodhouse:
      
       - Lots of cleanups from Artem, including deletion of some obsolete
         drivers
      
       - Support partitions larger than 4GiB in device tree
      
       - Support for new SPI chips
      
      * tag 'for-linus-20130509' of git://git.infradead.org/linux-mtd: (83 commits)
        mtd: omap2: Use module_platform_driver()
        mtd: bf5xx_nand: Use module_platform_driver()
        mtd: denali_dt: Remove redundant use of of_match_ptr
        mtd: denali_dt: Change return value to fix smatch warning
        mtd: denali_dt: Use module_platform_driver()
        mtd: denali_dt: Fix incorrect error check
        mtd: nand: subpage write support for hardware based ECC schemes
        mtd: omap2: use msecs_to_jiffies()
        mtd: nand_ids: use size macros
        mtd: nand_ids: improve LEGACY_ID_NAND macro a bit
        mtd: add 4 Toshiba nand chips for the full-id case
        mtd: add the support to parse out the full-id nand type
        mtd: add new fields to nand_flash_dev{}
        mtd: sh_flctl: Use of_match_ptr() macro
        mtd: gpio: Use of_match_ptr() macro
        mtd: gpio: Use devm_kzalloc()
        mtd: davinci_nand: Use of_match_ptr()
        mtd: dataflash: Use of_match_ptr() macro
        mtd: remove h720x flash support
        mtd: onenand: remove OneNAND simulator
        ...
      a637b0d4
    • Linus Torvalds's avatar
      Merge tag 'firewire-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394 · f78089e8
      Linus Torvalds authored
      Pull firewure updates from Stefan Richter:
        - fix controller removal when controller is in suspended state
        - fix video reception on VIA VT6306 with gstreamer, MythTV, and maybe dv4l
        - fix a startup issue with Agere/LSI FW643-e2
        - error logging improvements and other small updates
      
      * tag 'firewire-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394:
        firewire: ohci: dump_stack() for PHY regs read/write failures
        firewire: ohci: Improve bus reset error messages
        firewire: ohci: Alias dev_* log functions
        firewire: ohci: Fix 'failed to read phy reg' on FW643 rev8
        firewire: ohci: fix VIA VT6306 video reception
        firewire: ohci: Check LPS before register access on pci removal
        firewire: ohci: Fix double free_irq()
        firewire: remove unnecessary alloc/OOM messages
        firewire: sbp2: replace BUG_ON by WARN_ON
        firewire: core: remove an always false test
        firewire: Remove two unneeded checks for macros
      f78089e8
    • Linus Torvalds's avatar
      Merge tag 'edac_fixes_for_3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp · 7462543a
      Linus Torvalds authored
      Pull two small EDAC fixes from Borislav Petkov.
      
      * tag 'edac_fixes_for_3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
        EDAC: Don't give write permission to read-only files
        EDAC, mc_sysfs.c: Fix string array pointer types
      7462543a
    • Linus Torvalds's avatar
      Merge git://www.linux-watchdog.org/linux-watchdog · bde9d73d
      Linus Torvalds authored
      Pull watchdog update from Wim Van Sebroeck:
       "Fix a kdump issue in hpwdt and a possible NULL dereference"
      
      * git://www.linux-watchdog.org/linux-watchdog:
        watchdog: Fix race condition in registration code
        watchdog: Convert to devm_ioremap_resource()
      bde9d73d
    • Linus Torvalds's avatar
      Merge tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux · 5647ac0a
      Linus Torvalds authored
      Pull removal of GENERIC_GPIO from Grant Likely:
       "GENERIC_GPIO now synonymous with GPIOLIB.  There are no longer any
        valid cases for enableing GENERIC_GPIO without GPIOLIB, even though it
        is possible to do so which has been causing confusion and breakage.
        This branch does the work to completely eliminate GENERIC_GPIO."
      
      * tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux:
        gpio: update gpio Chinese documentation
        Remove GENERIC_GPIO config option
        Convert selectors of GENERIC_GPIO to GPIOLIB
        blackfin: force use of gpiolib
        m68k: coldfire: use gpiolib
        mips: pnx833x: remove requirement for GENERIC_GPIO
        openrisc: default GENERIC_GPIO to false
        avr32: default GENERIC_GPIO to false
        xtensa: remove explicit selection of GENERIC_GPIO
        sh: replace CONFIG_GENERIC_GPIO by CONFIG_GPIOLIB
        powerpc: remove redundant GENERIC_GPIO selection
        unicore32: default GENERIC_GPIO to false
        unicore32: remove unneeded select GENERIC_GPIO
        arm: plat-orion: use GPIO driver on CONFIG_GPIOLIB
        arm: remove redundant GENERIC_GPIO selection
        mips: alchemy: require gpiolib
        mips: txx9: change GENERIC_GPIO to GPIOLIB
        mips: loongson: use GPIO driver on CONFIG_GPIOLIB
        mips: remove redundant GENERIC_GPIO select
      5647ac0a
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma · 1763e735
      Linus Torvalds authored
      Pull slave-dmaengine updates from Vinod Koul:
       "This time we have dmatest improvements from Andy along with dw_dmac
        fixes.  He has also done support for acpi for dmanegine.
      
        Also we have bunch of fixes going in DT support for dmanegine for
        various folks.  Then Haswell and other ioat changes from Dave and
        SUDMAC support from Shimoda."
      
      * 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma: (53 commits)
        dma: tegra: implement suspend/resume callbacks
        dma:of: Use a mutex to protect the of_dma_list
        dma: of: Fix of_node reference leak
        dmaengine: sirf: move driver init from module_init to subsys_initcall
        sudmac: add support for SUDMAC
        dma: sh: add Kconfig
        at_hdmac: move to generic DMA binding
        ioatdma: ioat3_alloc_sed can be static
        ioatdma: Adding write back descriptor error status support for ioatdma 3.3
        ioatdma: S1200 platforms ioatdma channel 2 and 3 falsely advertise RAID cap
        ioatdma: Adding support for 16 src PQ ops and super extended descriptors
        ioatdma: Removing hw bug workaround for CB3.x .2 and earlier
        dw_dmac: add ACPI support
        dmaengine: call acpi_dma_request_slave_channel as well
        dma: acpi-dma: introduce ACPI DMA helpers
        dma: of: Remove unnecessary list_empty check
        DMA: OF: Check properties value before running be32_to_cpup() on it
        DMA: of: Constant names
        ioatdma: skip silicon bug workaround for pq_align for cb3.3
        ioatdma: Removing PQ val disable for cb3.3
        ...
      1763e735