03 Feb, 2014

16 commits

  • Linus Torvalds
     
  • Pull parisc updates from Helge Deller:
    "The three major changes in this patchset is a implementation for
    flexible userspace memory maps, cache-flushing fixes (again), and a
    long-discussed ABI change to make EWOULDBLOCK the same value as
    EAGAIN.

    parisc has been the only platform where we had EWOULDBLOCK != EAGAIN
    to keep HP-UX compatibility. Since we will probably never implement
    full HP-UX support, we prefer to drop this compatibility to make it
    easier for us with Linux userspace programs which mostly never checked
    for both values. We don't expect major fall-outs because of this
    change, and if we face some, we will simply rebuild the necessary
    applications in the debian archives"

    * 'parisc-3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
    parisc: add flexible mmap memory layout support
    parisc: Make EWOULDBLOCK be equal to EAGAIN on parisc
    parisc: convert uapi/asm/stat.h to use native types only
    parisc: wire up sched_setattr and sched_getattr
    parisc: fix cache-flushing
    parisc/sti_console: prefer Linux fonts over built-in ROM fonts

    Linus Torvalds
     
  • HPFS needs to load 4 consecutive 512-byte sectors when accessing the
    directory nodes or bitmaps. We can't switch to 2048-byte block size
    because files are allocated in the units of 512-byte sectors.

    Previously, the driver would allocate a 2048-byte area using kmalloc,
    copy the data from four buffers to this area and eventually copy them
    back if they were modified.

    In the current implementation of the buffer cache, buffers are allocated
    in the pagecache. That means that 4 consecutive 512-byte buffers are
    stored in consecutive areas in the kernel address space. So, we don't
    need to allocate extra memory and copy the content of the buffers there.

    This patch optimizes the code to avoid copying the buffers. It checks
    if the four buffers are stored in contiguous memory - if they are not,
    it falls back to allocating a 2048-byte area and copying data there.

    Signed-off-by: Mikulas Patocka
    Signed-off-by: Linus Torvalds

    Mikulas Patocka
     
  • Previously, hpfs scanned all bitmaps each time the user asked for free
    space using statfs. This patch changes it so that hpfs scans the
    bitmaps only once, remembes the free space and on next invocation of
    statfs it returns the value instantly.

    New versions of wine are hammering on the statfs syscall very heavily,
    making some games unplayable when they're stored on hpfs, with load
    times in minutes.

    This should be backported to the stable kernels because it fixes
    user-visible problem (excessive level load times in wine).

    Signed-off-by: Mikulas Patocka
    Cc: stable@vger.kernel.org
    Signed-off-by: Linus Torvalds

    Mikulas Patocka
     
  • Add support for the flexible mmap memory layout (as described in
    http://lwn.net/Articles/91829). This is especially very interesting on
    parisc since we currently only support 32bit userspace (even with a
    64bit Linux kernel).

    Signed-off-by: Helge Deller

    Helge Deller
     
  • On Linux, only parisc uses a different value for EWOULDBLOCK which
    causes a lot of troubles for applications not checking for both values.
    Since the hpux compat is long dead, make EWOULDBLOCK behave the same as
    all other architectures.

    Signed-off-by: Guy Martin
    Signed-off-by: Helge Deller

    Guy Martin
     
  • The stat.h header file is exported to userspace. Some userspace
    applications failed to compile due to missing/unknown types, so we
    better convert it to use native types only (like it's done on other
    architectures too).

    Signed-off-by: Helge Deller

    Helge Deller
     
  • Signed-off-by: Helge Deller

    Helge Deller
     
  • This commit:
    f8dae00684d678afa13041ef170cecfd1297ed40: parisc: Ensure full cache coherency for kmap/kunmap
    caused negative caching side-effects, e.g. hanging processes with expect and
    too many inequivalent alias messages from flush_dcache_page() on Debian 5 systems.

    This patch now partly reverts it and has been in production use on our debian buildd
    makeservers since a week without any major problems.

    Signed-off-by: Helge Deller
    Signed-off-by: John David Anglin
    Cc: stable@vger.kernel.org # v3.9+
    Signed-off-by: Helge Deller

    Helge Deller
     
  • The built-in ROM fonts lack many necessary ASCII characters, which is
    why it makes sens to prefer the Linux fonts instead if they are
    available. This makes consoles on STI graphics cards which are not
    supported by the stifb driver (e.g. Visualize FXe) looks much nicer.

    Signed-off-by: Helge Deller
    Cc: stable@vger.kernel.org # v3.13

    Helge Deller
     
  • Pull hwmon kconfig fixes from Jean Delvare.

    * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
    hwmon: Fix SENSORS_TMP102 dependencies to eliminate build errors
    hwmon: Fix SENSORS_LM75 dependencies to eliminate build errors

    Linus Torvalds
     
  • Pull SLAB changes from Pekka Enberg:
    "Random bug fixes that have accumulated in my inbox over the past few
    months"

    * 'slab/next' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/linux:
    mm: Fix warning on make htmldocs caused by slab.c
    mm: slub: work around unneeded lockdep warning
    mm: sl[uo]b: fix misleading comments
    slub: Fix possible format string bug.
    slub: use lockdep_assert_held
    slub: Fix calculation of cpu slabs
    slab.h: remove duplicate kmalloc declaration and fix kernel-doc warnings

    Linus Torvalds
     
  • Pull turbostat updates from Len Brown.

    * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux:
    tools/power turbostat: introduce -s to dump counters
    tools/power turbostat: remove unused command line option
    turbostat: Add option to report joules consumed per sample
    turbostat: run on HSX
    turbostat: Add a .gitignore to ignore the compiled turbostat binary
    turbostat: Clean up error handling; disambiguate error messages; use err and errx
    turbostat: Factor out common function to open file and exit on failure
    turbostat: Add a helper to parse a single int out of a file
    turbostat: Check return value of fscanf
    turbostat: Use GCC's CPUID functions to support PIC
    turbostat: Don't attempt to printf an off_t with %zx
    turbostat: Don't put unprocessed uapi headers in the include path

    Linus Torvalds
     
  • Pull ARM SoC fixes from Olof Johansson:
    "Here's a set of patches for (hopefully) -rc1. Some of them are fixes,
    but a good number of them also do things such as enable new drivers in
    the defconfigs for platforms that have such devices, increases
    coverage of the multiplatform defconfig and some DTS changes that
    plumbs up some of the devices that now have bindings and driver
    support.

    The commit dates are recent; we've mostly collected these fixes in the
    last few days but I also had to rebuild the branch yesterday to sort
    out some internal conflicts which reset the timestamps. The changes
    should have been tested by each platform maintainer already (and few
    of them have cross-platform impact) so I'm personally not too
    concerned by it at this time"

    * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (23 commits)
    ARM: multi_v7_defconfig: remove redundant entries and re-enable TI_EDMA
    ARM: multi_v7_defconfig: add mvebu drivers
    clocksource: kona: Add basic use of external clock
    drivers: bus: fix CCI driver kcalloc call parameters swap
    ARM: dts: bcm28155-ap: Fix Card Detection GPIO
    ARM: multi_v7_defconfig: Select CONFIG_AT803X_PHY
    ARM: keystone: config: fix build warning when CONFIG_DMADEVICES is not set
    MAINTAINERS: ARM: SiRF: use regex patterns to involve all SiRF drivers
    ARM: dts: zynq: Add SDHCI nodes
    ARM: hisi: don't select SMP
    ARM: tegra: rebuild tegra_defconfig to add DEBUG_FS
    ARM: multi_v7: copy most options from tegra_defconfig
    ARM: iop32x: fix power off handling for the EM7210 board
    ARM: integrator: restore static map on the CP
    ARM: msm_defconfig: Enable MSM clock drivers
    ARM: dts: msm: Add clock controller nodes and hook into uart
    ARM: OMAP4+: move errata initialization to omap4_pm_init_early
    ARM: OMAP4460: cpuidle: Extend PM_OMAP4_ROM_SMP_BOOT_ERRATUM_GICD on cpuidle
    ARM: mvebu: fix compilation warning on Armada 370 (i.e. non-SMP)
    ARM: shmobile: r8a7790.dtsi: ficx i2c[0-3] clock reference
    ...

    Linus Torvalds
     
  • Similar to what was done for the lm75 driver.

    Add depends on THERMAL since that is what provides the
    register/unregister functions above, but only if THERMAL_OF was
    selected as this is an optional feature of the driver.

    Signed-off-by: Jean Delvare
    Cc: Randy Dunlap
    Acked-by: Eduardo Valentin
    Reviewed-by: Guenter Roeck

    Jean Delvare
     
  • Based on an earlier attempt by Randy Dunlap.

    Fix SENSORS_LM75 dependencies to eliminate build errors:

    drivers/built-in.o: In function `lm75_remove':
    lm75.c:(.text+0x12bd8c): undefined reference to `thermal_zone_of_sensor_unregister'
    drivers/built-in.o: In function `lm75_probe':
    lm75.c:(.text+0x12c123): undefined reference to `thermal_zone_of_sensor_register'

    Add depends on THERMAL since that is what provides the
    register/unregister functions above, but only if THERMAL_OF was
    selected as this is an optional feature of the driver.

    Signed-off-by: Jean Delvare
    Cc: Randy Dunlap
    Acked-by: Eduardo Valentin
    Reviewed-by: Guenter Roeck

    Jean Delvare
     

02 Feb, 2014

9 commits

  • The new option allows just run turbostat and get dump of counter values. It's
    useful when we have something more than one program to test.

    Signed-off-by: Andy Shevchenko
    Signed-off-by: Len Brown

    Andy Shevchenko
     
  • The -s is not used, let's remove it, and update quick help accordingly.

    Signed-off-by: Andy Shevchenko
    Signed-off-by: Len Brown

    Andy Shevchenko
     
  • Pull misc kbuild changes from Michal Marek:
    "The non-critical part of kbuild is small this time:
    - Three fixes for make deb-pkg
    - A new coccinelle check

    One of the deb-pkg fixes is a leftover from the last merge window,
    hence the merge commit"

    * 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
    deb-pkg: Fix building for MIPS big-endian or ARM OABI
    deb-pkg: Fix cross-building linux-headers package
    scripts: Coccinelle script for pm_runtime_* return checks with IS_ERR_VALUE
    deb-pkg: Inhibit initramfs builders if CONFIG_BLK_DEV_INITRD is not set

    Linus Torvalds
     
  • Both proc files are writeable and used for configuring cells. But
    there is missing correct mode flag for writeable files. Without
    this patch both proc files are read only.

    [ It turns out they aren't really read-only, since root can write to
    them even if the write bit isn't set due to CAP_DAC_OVERRIDE ]

    Signed-off-by: Pali Rohár
    Signed-off-by: David Howells
    Signed-off-by: Linus Torvalds

    Pali Rohár
     
  • With commit d8d14bd09cdd ("fs/compat: fix lookup_dcookie() parameter
    handling") I changed the type of the len parameter of the
    lookup_dcookie() syscall.

    However I missed that there was still a stale declaration in
    arch/tile/.. which now causes a compile error on tile:

    In file included from fs/dcookies.c:28:0:
    include/linux/compat.h:425:17: error: conflicting types for 'compat_sys_lookup_dcookie'
    fs/dcookies.c:207:1: error: conflicting types for 'compat_sys_lookup_dcookie'

    Simply remove the declaration in the tile architecture, which is only a
    leftover from before the different compat lookup_dcookie() versions have
    been merged. The correct declaration is now in include/linux/compat.h

    The build error was reported by Fenguang's build bot.

    Signed-off-by: Heiko Carstens
    Acked-by: Chris Metcalf
    Signed-off-by: Linus Torvalds

    Heiko Carstens
     
  • Pull cifs fixes from Steve French:
    "A set of cifs fixes (mostly for symlinks, and SMB2 xattrs) and
    cleanups"

    * 'for-linus' of git://git.samba.org/sfrench/cifs-2.6:
    cifs: Fix check for regular file in couldbe_mf_symlink()
    [CIFS] Fix SMB2 mounts so they don't try to set or get xattrs via cifs
    CIFS: Cleanup cifs open codepath
    CIFS: Remove extra indentation in cifs_sfu_type
    CIFS: Cleanup cifs_mknod
    CIFS: Cleanup CIFSSMBOpen
    cifs: Add support for follow_link on dfs shares under posix extensions
    cifs: move unix extension call to cifs_query_symlink()
    cifs: Re-order M-F Symlink code
    cifs: Add create MFSymlinks to protocol ops struct
    cifs: use protocol specific call for query_mf_symlink()
    cifs: Rename MF symlink function names
    cifs: Rename and cleanup open_query_close_cifs_symlink()
    cifs: Fix memory leak in cifs_hardlink()

    Linus Torvalds
     
  • Pull vfs fixes from Al Viro:
    "Several obvious fixes"

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
    Fix mountpoint reference leakage in linkat
    hfsplus: use xattr handlers for removexattr
    Typo in compat_sys_lseek() declaration
    fs/super.c: sync ro remount after blocking writers
    vfs: unexport the getname() symbol

    Linus Torvalds
     
  • Pull rtl8812ae staging wireless driver from Greg KH:
    "Here's a single staging driver for a wireless chipset that has shown
    up in the SteamBox hardware. It is merged separately from the "main"
    staging pull request to sync up with the wireless api changes that
    came in from the networking tree.

    It's self-contained and works for me and others. Larry will be
    replacing it with a "real" driver for 3.15, but for now this one is
    needed"

    * tag 'staging-3.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
    staging: r8821ae: Enable build by reverting BROKEN marking
    staging: r8821ae: Fix build problems
    Staging: rtl8812ae: disable due to build errors
    Staging: rtl8821ae: add TODO file
    Staging: rtl8821ae: removed unused functions and variables
    Staging: rtl8821ae: rc.c: fix up function prototypes
    Staging: rtl8812ae: Add Realtek 8821 PCI WIFI driver

    Linus Torvalds
     
  • Revert commit ef83b0781a73 "PCI: Remove from bus_list and release
    resources in pci_release_dev()" that made some nasty race conditions
    become possible. For example, if a Thunderbolt link is unplugged
    and then replugged immediately, the pci_release_dev() resulting from
    the hot-remove code path may be racing with the hot-add code path
    which after that commit causes various kinds of breakage to happen
    (up to and including a hard crash of the whole system).

    Moreover, the problem that commit ef83b0781a73 attempted to address
    cannot happen any more after commit 8a4c5c329de7 "PCI: Check parent
    kobject in pci_destroy_dev()", because pci_destroy_dev() will now
    return immediately if it has already been executed for the given
    device.

    Note, however, that the invocation of msi_remove_pci_irq_vectors()
    removed by commit ef83b0781a73 from pci_free_resources() along with
    the other changes made by it is not added back because of subsequent
    code changes depending on that modification.

    Fixes: ef83b0781a73 (PCI: Remove from bus_list and release resources in pci_release_dev())
    Reported-by: Mika Westerberg
    Signed-off-by: Rafael J. Wysocki
    Signed-off-by: Linus Torvalds

    Rafael J. Wysocki
     

01 Feb, 2014

15 commits

  • TI_EDMA fell out of automatically selected options in the multi_v7
    defconfig due to a select being removed from the davinci Kconfig entry. So
    we need to re-enable explicitly to not regress some platforms.

    The rest is just the result of running 'make multi_v7_defconfig + make
    savedefconfig' to remove entries that are no longer needed due to changed
    dependencies/selects or defaults.

    Signed-off-by: Olof Johansson

    Olof Johansson
     
  • Recent boot farm testing has highlighted some issues with mvebu and
    multiplatform kernels. Increase the test coverage so we can discover
    these issues earlier.

    Signed-off-by: Jason Cooper
    Signed-off-by: Olof Johansson

    Olof Johansson
     
  • When an clock is specified in the device tree, enable it and use it to
    determine the external clock frequency.

    Signed-off-by: Tim Kryger
    Reviewed-by: Markus Mayer
    Reviewed-by: Matt Porter
    Reviewed-by: Christian Daudt
    Acked-by: Daniel Lezcano
    Signed-off-by: Christian Daudt
    Signed-off-by: Olof Johansson

    Tim Kryger
     
  • Pull NFS client bugfixes from Trond Myklebust:
    "Highlights:

    - Fix several races in nfs_revalidate_mapping
    - NFSv4.1 slot leakage in the pNFS files driver
    - Stable fix for a slot leak in nfs40_sequence_done
    - Don't reject NFSv4 servers that support ACLs with only ALLOW aces"

    * tag 'nfs-for-3.14-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
    nfs: initialize the ACL support bits to zero.
    NFSv4.1: Cleanup
    NFSv4.1: Clean up nfs41_sequence_done
    NFSv4: Fix a slot leak in nfs40_sequence_done
    NFSv4.1 free slot before resending I/O to MDS
    nfs: add memory barriers around NFS_INO_INVALID_DATA and NFS_INO_INVALIDATING
    NFS: Fix races in nfs_revalidate_mapping
    sunrpc: turn warn_gssd() log message into a dprintk()
    NFS: fix the handling of NFS_INO_INVALID_DATA flag in nfs_revalidate_mapping
    nfs: handle servers that support only ALLOW ACE type.

    Linus Torvalds
     
  • Pull sound fixes from Takashi Iwai:
    "The big chunks here are the updates for oxygen driver for Xonar DG
    devices, which were slipped from the previous pull request. They are
    device-specific and thus not too dangerous.

    Other than that, all patches are small bug fixes, mainly for Samsung
    build fixes, a few HD-audio enhancements, and other misc ASoC fixes.
    (And this time ASoC merge is less than Octopus, lucky seven :)"

    * tag 'sound-fix-3.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (42 commits)
    ALSA: hda/hdmi - allow PIN_OUT to be dynamically enabled
    ALSA: hda - add headset mic detect quirks for another Dell laptop
    ALSA: oxygen: Xonar DG(X): cleanup and minor changes
    ALSA: oxygen: Xonar DG(X): modify high-pass filter control
    ALSA: oxygen: Xonar DG(X): modify input select functions
    ALSA: oxygen: Xonar DG(X): modify capture volume functions
    ALSA: oxygen: Xonar DG(X): use headphone volume control
    ALSA: oxygen: Xonar DG(X): modify playback output select
    ALSA: oxygen: Xonar DG(X): capture from I2S channel 1, not 2
    ALSA: oxygen: Xonar DG(X): move the mixer code into another file
    ALSA: oxygen: modify CS4245 register dumping function
    ALSA: oxygen: modify adjust_dg_dac_routing function
    ALSA: oxygen: Xonar DG(X): modify DAC/ADC parameters function
    ALSA: oxygen: Xonar DG(X): modify initialization functions
    ALSA: oxygen: Xonar DG(X): add new CS4245 SPI functions
    ALSA: oxygen: additional definitions for the Xonar DG/DGX card
    ALSA: oxygen: change description of the xonar_dg.c file
    ALSA: oxygen: export oxygen_update_dac_routing symbol
    ALSA: oxygen: add mute mask for the OXYGEN_PLAY_ROUTING register
    ALSA: oxygen: modify the SPI writing function
    ...

    Linus Torvalds
     
  • Pull SCSI target updates from Nicholas Bellinger:
    "The highlights this round include:

    - add support for SCSI Referrals (Hannes)
    - add support for T10 DIF into target core (nab + mkp)
    - add support for T10 DIF emulation in FILEIO + RAMDISK backends (Sagi + nab)
    - add support for T10 DIF -> bio_integrity passthrough in IBLOCK backend (nab)
    - prep changes to iser-target for >= v3.15 T10 DIF support (Sagi)
    - add support for qla2xxx N_Port ID Virtualization - NPIV (Saurav + Quinn)
    - allow percpu_ida_alloc() to receive task state bitmask (Kent)
    - fix >= v3.12 iscsi-target session reset hung task regression (nab)
    - fix >= v3.13 percpu_ref se_lun->lun_ref_active race (nab)
    - fix a long-standing network portal creation race (Andy)"

    * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending: (51 commits)
    target: Fix percpu_ref_put race in transport_lun_remove_cmd
    target/iscsi: Fix network portal creation race
    target: Report bad sector in sense data for DIF errors
    iscsi-target: Convert gfp_t parameter to task state bitmask
    iscsi-target: Fix connection reset hang with percpu_ida_alloc
    percpu_ida: Make percpu_ida_alloc + callers accept task state bitmask
    iscsi-target: Pre-allocate more tags to avoid ack starvation
    qla2xxx: Configure NPIV fc_vport via tcm_qla2xxx_npiv_make_lport
    qla2xxx: Enhancements to enable NPIV support for QLOGIC ISPs with TCM/LIO.
    qla2xxx: Fix scsi_host leak on qlt_lport_register callback failure
    IB/isert: pass scatterlist instead of cmd to fast_reg_mr routine
    IB/isert: Move fastreg descriptor creation to a function
    IB/isert: Avoid frwr notation, user fastreg
    IB/isert: seperate connection protection domains and dma MRs
    tcm_loop: Enable DIF/DIX modes in SCSI host LLD
    target/rd: Add DIF protection into rd_execute_rw
    target/rd: Add support for protection SGL setup + release
    target/rd: Refactor rd_build_device_space + rd_release_device_space
    target/file: Add DIF protection support to fd_execute_rw
    target/file: Add DIF protection init/format support
    ...

    Linus Torvalds
     
  • This patch fixes a bug/typo in the CCI driver kcalloc usage
    that inadvertently swapped the parameters order in the
    kcalloc call and went unnoticed.

    Reported-by: Xia Feng
    Signed-off-by: Lorenzo Pieralisi
    Signed-off-by: Olof Johansson

    Lorenzo Pieralisi
     
  • The board schematic states that the "SD_CARD_DET_N gets pulled to GND
    when card is inserted" so the polarity has been updated to active low.

    Polarity is now specified with a GPIO define instead of a magic number.

    Signed-off-by: Tim Kryger
    Reviewed-by: Matt Porter
    Signed-off-by: Olof Johansson

    Tim Kryger
     
  • …rnel/git/horms/renesas into fixes

    Second Round of Renesas ARM Based SoC DT Fixes for v3.14

    Correct i2c clock references for r8a7790 (R-Car H2) SoC

    The error was introduced in 72197ca7a1cb1cea5 ("ARM: shmobile: r8a7790:
    Reference clocks") which is queued up for v3.14.

    * tag 'renesas-dt-fixes2-for-v3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
    ARM: shmobile: r8a7790.dtsi: ficx i2c[0-3] clock reference

    Signed-off-by: Olof Johansson <olof@lixom.net>

    Olof Johansson
     
  • Select CONFIG_AT803X_PHY so that we can boot hummingboard via NFS.

    Signed-off-by: Fabio Estevam
    Signed-off-by: Olof Johansson

    Fabio Estevam
     
  • Drop automatic selection of TI_EDMA from Keystone Kconfig file,
    as it produces build warning in case if CONFIG_DMADEVICES is not set:

    warning: (ARCH_KEYSTONE) selects TI_EDMA which has unmet direct dependencies (DMADEVICES && (ARCH_DAVINCI || ARCH_OMAP || ARCH_KEYSTONE))

    Instead enable TI EDMA support from defconfig.

    Reported-by: Russell King
    Signed-off-by: Grygorii Strashko
    Signed-off-by: Santosh Shilimkar
    Signed-off-by: Olof Johansson

    Grygorii Strashko
     
  • instead of listing drivers one by one, use regex patterns to involve all
    SiRF drivers directly.
    this also adds sirf UART and watchdog drivers automatically from:
    drivers/tty/serial/sirfsoc_uart.*
    drivers/watchdog/sirfsoc_wdt.c

    Cc: Uwe Kleine-König
    Cc: Wim Van Sebroeck
    Cc: Greg Kroah-Hartman
    Signed-off-by: Barry Song
    Signed-off-by: Olof Johansson

    Barry Song
     
  • mvebu fixes for v3.13 (incremental #2)

    - allow building and booting DT and non-DT plat-orion SoCs
    - catch proper return value for kirkwood_pm_init()
    - properly check return of of_iomap to solve boot hangs (mirabox, others)
    - remove a compile warning on Armada 370 with non-SMP.

    * tag 'mvebu-fixes-3.13-2' of git://git.infradead.org/linux-mvebu:
    ARM: mvebu: fix compilation warning on Armada 370 (i.e. non-SMP)
    ARM: mvebu: Fix kernel hang in mvebu_soc_id_init() when of_iomap failed
    ARM: kirkwood: kirkwood_pm_init() should return void
    ARM: orion: provide C-style interrupt handler for MULTI_IRQ_HANDLER

    Signed-off-by: Olof Johansson

    Olof Johansson
     
  • Add nodes for the Arasan SDHCI controller to Zynq dts files.

    Signed-off-by: Soren Brinkmann
    Signed-off-by: Michal Simek
    Signed-off-by: Olof Johansson

    Soren Brinkmann
     
  • SMP is a user configurable option, not a hardware feature and should not
    be selected.

    Signed-off-by: Rob Herring
    Signed-off-by: Olof Johansson

    Rob Herring