22 Jun, 2014

2 commits

  • Pull UniCore32 bug fixes from Guan Xuetao:
    "This includes bugfixes to make unicore32 successfully build under
    defconfig, and some changes for allmodconfig (though not finished)"

    * tag 'for-linus' of git://github.com/gxt/linux:
    unicore32: Remove ARCH_HAS_CPUFREQ config option
    UniCore32: Change git tree location information in MAINTAINERS
    arch: unicore32: ksyms: export '__cpuc_coherent_kern_range' to avoid compiling failure
    arch: unicore32: ksyms: export 'pm_power_off' to avoid compiling failure.
    arch: unicore32: ksyms: export additional find_first_*() to avoid compiling failure
    arch:unicore32:mm: add devmem_is_allowed() to support STRICT_DEVMEM
    unicore32: include: asm: add missing ')' for PAGE_* macros in pgtable.h
    arch/unicore32/kernel/setup.c: add generic 'screen_info' to avoid compiling failure
    drivers: scsi: mvsas: fix compiling issue by adding 'MVS_' for "enum pci_interrupt_cause"
    arch: unicore32: kernel: ksyms: remove 'bswapsi2' and 'muldi3' to avoid compiling failure
    arch/unicore32/kernel/ksyms.c: remove 2 export symbols to avoid compiling failure
    drivers/rtc/rtc-puv3.c: remove "&dev->" for typo issue MIME-Version: 1.0
    drivers/rtc/rtc-puv3.c: use dev_dbg() instead of dev_debug() for typo issue
    arch/unicore32/include/asm/io.h: add readl_relaxed() generic definition
    arch/unicore32/include/asm/ptrace.h: add generic definition for profile_pc()
    arch/unicore32/mm/alignment.c: include "asm/pgtable.h" to avoid compiling error
    arch/unicore32/kernel/clock.c: add readl() and writel() for 'PM_' macros
    arch/unicore32/kernel/module.c: use __vmalloc_node_range() instead of __vmalloc_area()
    arch/unicore32/kernel/ksyms.c: remove several undefined exported symbols

    Linus Torvalds
     
  • Pull char / misc driver fixes from Greg KH:
    "Here are 3 patches, one a revert of the UIO patch you objected to in
    3.16-rc1 and that no one wanted to defend, a w1 driver bugfix, and a
    MAINTAINERS update for the vmware balloon driver.

    All of these, except for the MAINTAINERS update which just got added,
    have been in linux-next just fine"

    * tag 'char-misc-3.16-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
    MAINTAINERS: add entry for VMware Balloon driver
    w1: mxc_w1: Fix incorrect "presence" status
    Revert "uio: fix vma io range check in mmap"

    Linus Torvalds
     

21 Jun, 2014

1 commit


20 Jun, 2014

1 commit


18 Jun, 2014

1 commit


14 Jun, 2014

1 commit


13 Jun, 2014

2 commits

  • Pull networking updates from David Miller:

    1) Seccomp BPF filters can now be JIT'd, from Alexei Starovoitov.

    2) Multiqueue support in xen-netback and xen-netfront, from Andrew J
    Benniston.

    3) Allow tweaking of aggregation settings in cdc_ncm driver, from Bjørn
    Mork.

    4) BPF now has a "random" opcode, from Chema Gonzalez.

    5) Add more BPF documentation and improve test framework, from Daniel
    Borkmann.

    6) Support TCP fastopen over ipv6, from Daniel Lee.

    7) Add software TSO helper functions and use them to support software
    TSO in mvneta and mv643xx_eth drivers. From Ezequiel Garcia.

    8) Support software TSO in fec driver too, from Nimrod Andy.

    9) Add Broadcom SYSTEMPORT driver, from Florian Fainelli.

    10) Handle broadcasts more gracefully over macvlan when there are large
    numbers of interfaces configured, from Herbert Xu.

    11) Allow more control over fwmark used for non-socket based responses,
    from Lorenzo Colitti.

    12) Do TCP congestion window limiting based upon measurements, from Neal
    Cardwell.

    13) Support busy polling in SCTP, from Neal Horman.

    14) Allow RSS key to be configured via ethtool, from Venkata Duvvuru.

    15) Bridge promisc mode handling improvements from Vlad Yasevich.

    16) Don't use inetpeer entries to implement ID generation any more, it
    performs poorly, from Eric Dumazet.

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1522 commits)
    rtnetlink: fix userspace API breakage for iproute2 < v3.9.0
    tcp: fixing TLP's FIN recovery
    net: fec: Add software TSO support
    net: fec: Add Scatter/gather support
    net: fec: Increase buffer descriptor entry number
    net: fec: Factorize feature setting
    net: fec: Enable IP header hardware checksum
    net: fec: Factorize the .xmit transmit function
    bridge: fix compile error when compiling without IPv6 support
    bridge: fix smatch warning / potential null pointer dereference
    via-rhine: fix full-duplex with autoneg disable
    bnx2x: Enlarge the dorq threshold for VFs
    bnx2x: Check for UNDI in uncommon branch
    bnx2x: Fix 1G-baseT link
    bnx2x: Fix link for KR with swapped polarity lane
    sctp: Fix sk_ack_backlog wrap-around problem
    net/core: Add VF link state control policy
    net/fsl: xgmac_mdio is dependent on OF_MDIO
    net/fsl: Make xgmac_mdio read error message useful
    net_sched: drr: warn when qdisc is not work conserving
    ...

    Linus Torvalds
     
  • Pull drm updates from Dave Airlie:
    "This is the main drm merge window pull request, changes all over the
    place, mostly normal levels of churn.

    Highlights:

    Core drm:
    More cleanups, fix race on connector/encoder naming, docs updates,
    object locking rework in prep for atomic modeset

    i915:
    mipi DSI support, valleyview power fixes, cursor size fixes,
    execlist refactoring, vblank improvements, userptr support, OOM
    handling improvements

    radeon:
    GPUVM tuning and large page size support, gart fixes, deep color
    HDMI support, HDMI audio cleanups

    nouveau:
    - displayport rework should fix lots of issues
    - initial gk20a support
    - gk110b support
    - gk208 fixes

    exynos:
    probe order fixes, HDMI changes, IPP consolidation

    msm:
    debugfs updates, misc fixes

    ast:
    ast2400 support, sync with UMS driver

    tegra:
    cleanups, hdmi + hw cursor for Tegra 124.

    panel:
    fixes existing panels add some new ones.

    ipuv3:
    moved from staging to drivers/gpu"

    * 'drm-next' of git://people.freedesktop.org/~airlied/linux: (761 commits)
    drm/nouveau/disp/dp: fix tmds passthrough on dp connector
    drm/nouveau/dp: probe dpcd to determine connectedness
    drm/nv50-: trigger update after all connectors disabled
    drm/nv50-: prepare for attaching a SOR to multiple heads
    drm/gf119-/disp: fix debug output on update failure
    drm/nouveau/disp/dp: make use of postcursor when its available
    drm/g94-/disp/dp: take max pullup value across all lanes
    drm/nouveau/bios/dp: parse lane postcursor data
    drm/nouveau/dp: fix support for dpms
    drm/nouveau: register a drm_dp_aux channel for each dp connector
    drm/g94-/disp: add method to power-off dp lanes
    drm/nouveau/disp/dp: maintain link in response to hpd signal
    drm/g94-/disp: bash and wait for something after changing lane power regs
    drm/nouveau/disp/dp: split link config/power into two steps
    drm/nv50/disp: train PIOR-attached DP from second supervisor
    drm/nouveau/disp/dp: make use of existing output data for link training
    drm/gf119/disp: start removing direct vbios parsing from supervisor
    drm/nv50/disp: start removing direct vbios parsing from supervisor
    drm/nouveau/disp/dp: maintain receiver caps in response to hpd signal
    drm/nouveau/disp/dp: create subclass for dp outputs
    ...

    Linus Torvalds
     

12 Jun, 2014

1 commit


11 Jun, 2014

1 commit

  • Pull MMC update from Chris Ball:
    "MMC highlights for 3.16:

    Core:
    - support HS400 mode of eMMC 5.0, via DT bindings mmc-hs400-1_{2,8}v
    - if card init at 3.3v doesn't work, try 1.8v and 1.2v too

    Drivers:
    - moxart: New driver for MOXA ART SoCs
    - rtsx_usb_sdmmc: New driver for Realtek USB card readers
    - sdhci: Large rework around IRQ/regulator handling, remove card_tasklet
    - sdhci-pci-o2micro: Add SeaBird SeaEagle SD3 support
    - sunxi: New driver for Allwinner sunxi SoCs
    - usdhi6rol0: New driver for Renesas SD/SDIO controller"

    * tag 'mmc-updates-for-3.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc: (95 commits)
    mmc: sdhci-s3c: use mmc_of_parse and remove the card_tasklet
    mmc: add a driver for the Renesas usdhi6rol0 SD/SDIO host controller
    mmc: sdhci-of-esdhc: Fixup compile error
    mmc: tegra: fix reporting of base clock frequency
    mmc: tegra: disable UHS modes
    mmc: sdhci-dove: use mmc_of_parse() and remove card_tasklet CD handler
    MAINTAINERS: mmc: Add path to git tree
    mmc: dove: fix missing MACH_DOVE dependency
    mmc: sdhci: SD tuning is broken for some controllers
    mmc: sdhci-esdhc-imx: fix mmc ddr mode regression issue
    mmc: sdhci-pci-o2micro: Add SeaBird SeaEagle SD3 support
    mmc: omap_hsmmc: split omap-dma header file
    mmc: omap_hsmmc: fix cmd23 multiblock read/write
    mmc: omap_hsmmc: use devm_ioremap_resource
    mmc: omap_hsmmc: use devm_request_threaded_irq
    mmc: omap_hsmmc: use devm_request_irq
    mmc: omap_hsmmc: use devm_clk_get
    mmc: sunxi: Add driver for SD/MMC hosts found on Allwinner sunxi SoCs
    mmc: wmt-sdmmc: Use GFP_KERNEL instead of hard-coded value
    mmc: omap: Use DIV_ROUND_UP instead of open coded
    ...

    Linus Torvalds
     

10 Jun, 2014

5 commits

  • Pull f2fs updates from Jaegeuk Kim:
    "In this round, there is no special interesting feature, but we've
    investigated a couple of tuning points with respect to the I/O flow.
    Several major bug fixes and a bunch of clean-ups also have been made.

    This patch-set includes the following major enhancement patches:
    - enhance wait_on_page_writeback
    - support SEEK_DATA and SEEK_HOLE
    - enhance readahead flows
    - enhance IO flushes
    - support fiemap
    - add some tracepoints

    The other bug fixes are as follows:
    - fix to support a large volume > 2TB correctly
    - recovery bug fix wrt fallocated space
    - fix recursive lock on xattr operations
    - fix some cases on the remount flow

    And, there are a bunch of cleanups"

    * tag 'for-f2fs-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs: (52 commits)
    f2fs: support f2fs_fiemap
    f2fs: avoid not to call remove_dirty_inode
    f2fs: recover fallocated space
    f2fs: fix to recover data written by dio
    f2fs: large volume support
    f2fs: avoid crash when trace f2fs_submit_page_mbio event in ra_sum_pages
    f2fs: avoid overflow when large directory feathure is enabled
    f2fs: fix recursive lock by f2fs_setxattr
    MAINTAINERS: add a co-maintainer from samsung for F2FS
    MAINTAINERS: change the email address for f2fs
    f2fs: use inode_init_owner() to simplify codes
    f2fs: avoid to use slab memory in f2fs_issue_flush for efficiency
    f2fs: add a tracepoint for f2fs_read_data_page
    f2fs: add a tracepoint for f2fs_write_{meta,node,data}_pages
    f2fs: add a tracepoint for f2fs_write_{meta,node,data}_page
    f2fs: add a tracepoint for f2fs_write_end
    f2fs: add a tracepoint for f2fs_write_begin
    f2fs: fix checkpatch warning
    f2fs: deactivate inode page if the inode is evicted
    f2fs: decrease the lock granularity during write_begin
    ...

    Linus Torvalds
     
  • Pull SCSI updates from James Bottomley:
    "This patch consists of the usual driver updates (qla2xxx, qla4xxx,
    lpfc, be2iscsi, fnic, ufs, NCR5380) The NCR5380 is the addition to
    maintained status of a long neglected driver for older hardware. In
    addition there are a lot of minor fixes and cleanups and some more
    updates to make scsi mq ready"

    * tag 'scsi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (130 commits)
    include/scsi/osd_protocol.h: remove unnecessary __constant
    mvsas: Recognise device/subsystem 9485/9485 as 88SE9485
    Revert "be2iscsi: Fix processing cqe for cxn whose endpoint is freed"
    mptfusion: fix msgContext in mptctl_hp_hostinfo
    acornscsi: remove linked command support
    scsi/NCR5380: dprintk macro
    fusion: Remove use of DEF_SCSI_QCMD
    fusion: Add free msg frames to the head, not tail of list
    mpt2sas: Add free smids to the head, not tail of list
    mpt2sas: Remove use of DEF_SCSI_QCMD
    mpt2sas: Remove uses of serial_number
    mpt3sas: Remove use of DEF_SCSI_QCMD
    mpt3sas: Remove uses of serial_number
    qla2xxx: Use kmemdup instead of kmalloc + memcpy
    qla4xxx: Use kmemdup instead of kmalloc + memcpy
    qla2xxx: fix incorrect debug printk
    be2iscsi: Bump the driver version
    be2iscsi: Fix processing cqe for cxn whose endpoint is freed
    be2iscsi: Fix destroy MCC-CQ before MCC-EQ is destroyed
    be2iscsi: Fix memory corruption in MBX path
    ...

    Linus Torvalds
     
  • Pull MIPS updates from Ralf Baechle:
    - three fixes for 3.15 that didn't make it in time
    - limited Octeon 3 support.
    - paravirtualization support
    - improvment to platform support for Netlogix SOCs.
    - add support for powering down the Malta eval board in software
    - add many instructions to the in-kernel microassembler.
    - add support for the BPF JIT.
    - minor cleanups of the BCM47xx code.
    - large cleanup of math emu code resulting in significant code size
    reduction, better readability of the code and more accurate
    emulation.
    - improvments to the MIPS CPS code.
    - support C3 power status for the R4k count/compare clock device.
    - improvments to the GIO support for older SGI workstations.
    - increase number of supported CPUs to 256; this can be reached on
    certain embedded multithreaded ccNUMA configurations.
    - various small cleanups, updates and fixes

    * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (173 commits)
    MIPS: IP22/IP28: Improve GIO support
    MIPS: Octeon: Add twsi interrupt initialization for OCTEON 3XXX, 5XXX, 63XX
    DEC: Document the R4k MB ASIC mini interrupt controller
    DEC: Add self as the maintainer
    MIPS: Add microMIPS MSA support.
    MIPS: Replace calls to obsolete strict_strto call with kstrto* equivalents.
    MIPS: Replace obsolete strict_strto call with kstrto
    MIPS: BFP: Simplify code slightly.
    MIPS: Call find_vma with the mmap_sem held
    MIPS: Fix 'write_msa_##' inline macro.
    MIPS: Fix MSA toolchain support detection.
    mips: Update the email address of Geert Uytterhoeven
    MIPS: Add minimal defconfig for mips_paravirt
    MIPS: Enable build for new system 'paravirt'
    MIPS: paravirt: Add pci controller for virtio
    MIPS: Add code for new system 'paravirt'
    MIPS: Add functions for hypervisor call
    MIPS: OCTEON: Add OCTEON3 to __get_cpu_type
    MIPS: Add function get_ebase_cpunum
    MIPS: Add minimal support for OCTEON3 to c-r4k.c
    ...

    Linus Torvalds
     
  • Pull tracing updates from Steven Rostedt:
    "Lots of tweaks, small fixes, optimizations, and some helper functions
    to help out the rest of the kernel to ease their use of trace events.

    The big change for this release is the allowing of other tracers, such
    as the latency tracers, to be used in the trace instances and allow
    for function or function graph tracing to be in the top level
    simultaneously"

    * tag 'trace-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace: (44 commits)
    tracing: Fix memory leak on instance deletion
    tracing: Fix leak of ring buffer data when new instances creation fails
    tracing/kprobes: Avoid self tests if tracing is disabled on boot up
    tracing: Return error if ftrace_trace_arrays list is empty
    tracing: Only calculate stats of tracepoint benchmarks for 2^32 times
    tracing: Convert stddev into u64 in tracepoint benchmark
    tracing: Introduce saved_cmdlines_size file
    tracing: Add __get_dynamic_array_len() macro for trace events
    tracing: Remove unused variable in trace_benchmark
    tracing: Eliminate double free on failure of allocation on boot up
    ftrace/x86: Call text_ip_addr() instead of the duplicated code
    tracing: Print max callstack on stacktrace bug
    tracing: Move locking of trace_cmdline_lock into start/stop seq calls
    tracing: Try again for saved cmdline if failed due to locking
    tracing: Have saved_cmdlines use the seq_read infrastructure
    tracing: Add tracepoint benchmark tracepoint
    tracing: Print nasty banner when trace_printk() is in use
    tracing: Add funcgraph_tail option to print function name after closing braces
    tracing: Eliminate duplicate TRACE_GRAPH_PRINT_xx defines
    tracing: Add __bitmask() macro to trace events to cpumasks and other bitmasks
    ...

    Linus Torvalds
     
  • Pull cgroup updates from Tejun Heo:
    "A lot of activities on cgroup side. Heavy restructuring including
    locking simplification took place to improve the code base and enable
    implementation of the unified hierarchy, which currently exists behind
    a __DEVEL__ mount option. The core support is mostly complete but
    individual controllers need further work. To explain the design and
    rationales of the the unified hierarchy

    Documentation/cgroups/unified-hierarchy.txt

    is added.

    Another notable change is css (cgroup_subsys_state - what each
    controller uses to identify and interact with a cgroup) iteration
    update. This is part of continuing updates on css object lifetime and
    visibility. cgroup started with reference count draining on removal
    way back and is now reaching a point where csses behave and are
    iterated like normal refcnted objects albeit with some complexities to
    allow distinguishing the state where they're being deleted. The css
    iteration update isn't taken advantage of yet but is planned to be
    used to simplify memcg significantly"

    * 'for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup: (77 commits)
    cgroup: disallow disabled controllers on the default hierarchy
    cgroup: don't destroy the default root
    cgroup: disallow debug controller on the default hierarchy
    cgroup: clean up MAINTAINERS entries
    cgroup: implement css_tryget()
    device_cgroup: use css_has_online_children() instead of has_children()
    cgroup: convert cgroup_has_live_children() into css_has_online_children()
    cgroup: use CSS_ONLINE instead of CGRP_DEAD
    cgroup: iterate cgroup_subsys_states directly
    cgroup: introduce CSS_RELEASED and reduce css iteration fallback window
    cgroup: move cgroup->serial_nr into cgroup_subsys_state
    cgroup: link all cgroup_subsys_states in their sibling lists
    cgroup: move cgroup->sibling and ->children into cgroup_subsys_state
    cgroup: remove cgroup->parent
    device_cgroup: remove direct access to cgroup->children
    memcg: update memcg_has_children() to use css_next_child()
    memcg: remove tasks/children test from mem_cgroup_force_empty()
    cgroup: remove css_parent()
    cgroup: skip refcnting on normal root csses and cgrp_dfl_root self css
    cgroup: use cgroup->self.refcnt for cgroup refcnting
    ...

    Linus Torvalds
     

09 Jun, 2014

1 commit

  • Now that 3.15 is released, this merges the 'next' branch into 'master',
    bringing us to the normal situation where my 'master' branch is the
    merge window.

    * accumulated work in next: (6809 commits)
    ufs: sb mutex merge + mutex_destroy
    powerpc: update comments for generic idle conversion
    cris: update comments for generic idle conversion
    idle: remove cpu_idle() forward declarations
    nbd: zero from and len fields in NBD_CMD_DISCONNECT.
    mm: convert some level-less printks to pr_*
    MAINTAINERS: adi-buildroot-devel is moderated
    MAINTAINERS: add linux-api for review of API/ABI changes
    mm/kmemleak-test.c: use pr_fmt for logging
    fs/dlm/debug_fs.c: replace seq_printf by seq_puts
    fs/dlm/lockspace.c: convert simple_str to kstr
    fs/dlm/config.c: convert simple_str to kstr
    mm: mark remap_file_pages() syscall as deprecated
    mm: memcontrol: remove unnecessary memcg argument from soft limit functions
    mm: memcontrol: clean up memcg zoneinfo lookup
    mm/memblock.c: call kmemleak directly from memblock_(alloc|free)
    mm/mempool.c: update the kmemleak stack trace for mempool allocations
    lib/radix-tree.c: update the kmemleak stack trace for radix tree allocations
    mm: introduce kmemleak_update_trace()
    mm/kmemleak.c: use %u to print ->checksum
    ...

    Linus Torvalds
     

08 Jun, 2014

1 commit

  • Pull clock framework updates from Mike Turquette:
    "The clock framework changes for 3.16 are pretty typical: mostly clock
    driver additions and fixes. There are additions to the clock core
    code for some of the basic types (e.g. the common divider type has
    some fixes and featured added to it).

    One minor annoyance is a last-minute dependency that wasn't handled
    quite right. Commit ba0fae3b06a6 ("clk: berlin: add core clock driver
    for BG2/BG2CD") in this pull request depends on
    include/dt-bindings/clock/berlin2.h, which is already in your tree via
    the arm-soc pull request. Building for the berlin platform will break
    when the clk tree is built on it's own, but merged into your master
    branch everything should be fine"

    * tag 'clk-for-linus-3.16' of git://git.linaro.org/people/mike.turquette/linux: (75 commits)
    mmc: sunxi: Add driver for SD/MMC hosts found on Allwinner sunxi SoCs
    clk: export __clk_round_rate for providers
    clk: versatile: free icst on error return
    clk: qcom: Return error pointers for unimplemented clocks
    clk: qcom: Support msm8974pro global clock control hardware
    clk: qcom: Properly support display clocks on msm8974
    clk: qcom: Support display RCG clocks
    clk: qcom: Return highest rate when round_rate() exceeds plan
    clk: qcom: Fix mmcc-8974's PLL configurations
    clk: qcom: Fix clk_rcg2_is_enabled() check
    clk: berlin: add core clock driver for BG2Q
    clk: berlin: add core clock driver for BG2/BG2CD
    clk: berlin: add driver for BG2x complex divider cells
    clk: berlin: add driver for BG2x simple PLLs
    clk: berlin: add driver for BG2x audio/video PLL
    clk: st: Terminate of match table
    clk/exynos4: Fix compilation warning
    ARM: shmobile: r8a7779: Add clock index macros for DT sources
    clk: divider: Fix overflow in clk_divider_bestdiv
    clk: u300: Terminate of match table
    ...

    Linus Torvalds
     

07 Jun, 2014

2 commits


06 Jun, 2014

1 commit


05 Jun, 2014

8 commits

  • Merge drm-fixes into drm-next.

    Both i915 and radeon need this done for later patches.

    Conflicts:
    drivers/gpu/drm/drm_crtc_helper.c
    drivers/gpu/drm/i915/i915_drv.h
    drivers/gpu/drm/i915/i915_gem.c
    drivers/gpu/drm/i915/i915_gem_execbuffer.c
    drivers/gpu/drm/i915/i915_gem_gtt.c

    Dave Airlie
     
  • Merge misc updates from Andrew Morton:

    - a few fixes for 3.16. Cc'ed to stable so they'll get there somehow.

    - various misc fixes and cleanups

    - most of the ocfs2 queue. Review is slow...

    - most of MM. The MM queue is pretty huge this time, but not much in
    the way of feature work.

    - some tweaks under kernel/

    - printk maintenance work

    - updates to lib/

    - checkpatch updates

    - tweaks to init/

    * emailed patches from Andrew Morton : (276 commits)
    fs/autofs4/dev-ioctl.c: add __init to autofs_dev_ioctl_init
    fs/ncpfs/getopt.c: replace simple_strtoul by kstrtoul
    init/main.c: remove an ifdef
    kthreads: kill CLONE_KERNEL, change kernel_thread(kernel_init) to avoid CLONE_SIGHAND
    init/main.c: add initcall_blacklist kernel parameter
    init/main.c: don't use pr_debug()
    fs/binfmt_flat.c: make old_reloc() static
    fs/binfmt_elf.c: fix bool assignements
    fs/efs: convert printk(KERN_DEBUG to pr_debug
    fs/efs: add pr_fmt / use __func__
    fs/efs: convert printk to pr_foo()
    scripts/checkpatch.pl: device_initcall is not the only __initcall substitute
    checkpatch: check stable email address
    checkpatch: warn on unnecessary void function return statements
    checkpatch: prefer kstrto to sscanf(buf, "%", &bar);
    checkpatch: add warning for kmalloc/kzalloc with multiply
    checkpatch: warn on #defines ending in semicolon
    checkpatch: make --strict a default for files in drivers/net and net/
    checkpatch: always warn on missing blank line after variable declaration block
    checkpatch: fix wildcard DT compatible string checking
    ...

    Linus Torvalds
     
  • Horiguchi-san has done most of the work on hwpoison in the last years
    and he also does most of the reviewing. So I'm passing on the hwpoison
    maintainership to him.

    Signed-off-by: Andi Kleen
    Cc: Naoya Horiguchi
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Andi Kleen
     
  • Might as well be the get_maintainer maintainer...

    Signed-off-by: Joe Perches
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Joe Perches
     
  • …hehab/linux-media into next

    Pull media updates from Mauro Carvalho Chehab:
    "This contains:
    - a new frontend/tuner driver set for si2168 and sa2157
    - Videobuf 2 core now supports DVB too
    - A new gspca sub-driver (dtcs033)
    - saa7134 is now converted to use videobuf2
    - add support for 4K timings
    - several other driver fixes and improvements

    PS. This pull request is shorter than usual, partly because I have
    some other patches on topic branches that I'll be sending you later
    this week"

    * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (286 commits)
    [media] au0828-dvb: restore its permission to 644
    [media] xc5000: delay tuner sleep to 5 seconds
    [media] xc5000: Don't use whitespace before tabs
    [media] xc5000: fix CamelCase
    [media] xc5000: Don't wrap msleep()
    [media] xc5000: get rid of positive error codes
    [media] au0828: reset streaming when a new frequency is set
    [media] au0828: Improve debug messages for urb_completion
    [media] au0828: Cancel stream-restart operation if frontend is disconnected
    [media] dib0700: fix RC support on Hauppauge Nova-TD
    [media] USB: as102_usb_drv.c: Remove useless return variables
    [media] v4l: Fix documentation of V4L2_PIX_FMT_H264_MVC and VP8 pixel formats
    [media] m5mols: Replace missing header
    [media] staging: lirc: Fix sparse warnings
    [media] fix mceusb endpoint type identification/handling
    [media] az6027: Added the PID for a new revision of the Elgato EyeTV Sat DVB-S Tuner
    [media] DocBook media: fix typo
    [media] adv7604: Add missing include to linux/types.h
    [media] v4l: Validate fields in the core code for subdev EDID ioctls
    [media] v4l: Add support for DV timings ioctls on subdev nodes
    ...

    Linus Torvalds
     
  • Ralf Baechle
     
  • Signed-off-by: Maciej W. Rozycki
    Cc: linux-mips@linux-mips.org
    Patchwork: http://patchwork.linux-mips.org/patch/6707/
    Signed-off-by: Ralf Baechle

    Maciej W. Rozycki
     
  • Pull sound updates from Takashi Iwai:
    "At this time, majority of changes come from ASoC world while we got a
    few new drivers in other places for FireWire and USB. There have been
    lots of ASoC core cleanups / refactoring, but very little visible to
    external users.

    ASoC:
    - Support for specifying aux CODECs in DT
    - Removal of the deprecated mux and enum macros
    - More moves towards full componentisation
    - Removal of some unused I/O code
    - Lots of cleanups, fixes and enhancements to the davinci, Freescale,
    Haswell and Realtek drivers
    - Several drivers exposed directly in Kconfig for use with
    simple-card
    - GPIO descriptor support for jacks
    - More updates and fixes to the Freescale SSI, Intel and rsnd drivers
    - New drivers for Cirrus CS42L56, Realtek RT5639, RT5642 and RT5651
    and ST STA350, Analog Devices ADAU1361, ADAU1381, ADAU1761 and
    ADAU1781, and Realtek RT5677

    HD-audio:
    - Clean up Dell headset quirks
    - Noise fixes for Dell and Sony laptops
    - Thinkpad T440 dock fix
    - Realtek codec updates (ALC293,ALC233,ALC3235)
    - Tegra HD-audio HDMI support

    FireWire-audio:
    - FireWire audio stack enhancement (AMDTP, MIDI), support for
    incoming isochronous stream and duplex streams with timestamp
    synchronization
    - BeBoB-based devices support
    - Fireworks-based device support

    USB-audio:
    - Behringer BCD2000 USB device support

    Misc:
    - Clean up of a few old drivers, atmel, fm801, etc"

    * tag 'sound-3.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (480 commits)
    ASoC: Fix wrong argument for card remove callbacks
    ASoC: free jack GPIOs before the sound card is freed
    ALSA: firewire-lib: Remove a comment about restriction of asynchronous operation
    ASoC: cache: Fix error code when not using ASoC level cache
    ALSA: hda/realtek - Fix COEF widget NID for ALC260 replacer fixup
    ALSA: hda/realtek - Correction of fixup codes for PB V7900 laptop
    ALSA: firewire-lib: Use IEC 61883-6 compliant labels for Raw Audio data
    ASoC: add RT5677 CODEC driver
    ASoC: intel: The Baytrail/MAX98090 driver depends on I2C
    ASoC: rt5640: Add the function "get_clk_info" to RL6231 shared support
    ASoC: rt5640: Add the function of the PLL clock calculation to RL6231 shared support
    ASoC: rt5640: Add RL6231 class device shared support for RT5640, RT5645 and RT5651
    ASoC: cache: Fix possible ZERO_SIZE_PTR pointer dereferencing error.
    ASoC: Add helper functions to cast from DAPM context to CODEC/platform
    ALSA: bebob: sizeof() vs ARRAY_SIZE() typo
    ASoC: wm9713: correct mono out PGA sources
    ALSA: synth: emux: soundfont.c: Cleaning up memory leak
    ASoC: fsl: Remove dependencies of boards for SND_SOC_EUKREA_TLV320
    ASoC: fsl-ssi: Use regmap
    ASoC: fsl-ssi: reorder and document fsl_ssi_private
    ...

    Linus Torvalds
     

04 Jun, 2014

5 commits

  • …fael/linux-pm into next

    Pull ACPI and power management updates from Rafael Wysocki:
    "ACPICA is the leader this time (63 commits), followed by cpufreq (28
    commits), devfreq (15 commits), system suspend/hibernation (12
    commits), ACPI video and ACPI device enumeration (10 commits each).

    We have no major new features this time, but there are a few
    significant changes of how things work. The most visible one will
    probably be that we are now going to create platform devices rather
    than PNP devices by default for ACPI device objects with _HID. That
    was long overdue and will be really necessary to be able to use the
    same drivers for the same hardware blocks on ACPI and DT-based systems
    going forward. We're not expecting fallout from this one (as usual),
    but it's something to watch nevertheless.

    The second change having a chance to be visible is that ACPI video
    will now default to using native backlight rather than the ACPI
    backlight interface which should generally help systems with broken
    Win8 BIOSes. We're hoping that all problems with the native backlight
    handling that we had previously have been addressed and we are in a
    good enough shape to flip the default, but this change should be easy
    enough to revert if need be.

    In addition to that, the system suspend core has a new mechanism to
    allow runtime-suspended devices to stay suspended throughout system
    suspend/resume transitions if some extra conditions are met
    (generally, they are related to coordination within device hierarchy).
    However, enabling this feature requires cooperation from the bus type
    layer and for now it has only been implemented for the ACPI PM domain
    (used by ACPI-enumerated platform devices mostly today).

    Also, the acpidump utility that was previously shipped as a separate
    tool will now be provided by the upstream ACPICA along with the rest
    of ACPICA code, which will allow it to be more up to date and better
    supported, and we have one new cpuidle driver (ARM clps711x).

    The rest is improvements related to certain specific use cases,
    cleanups and fixes all over the place.

    Specifics:

    - ACPICA update to upstream version 20140424. That includes a number
    of fixes and improvements related to things like GPE handling,
    table loading, headers, memory mapping and unmapping, DSDT/SSDT
    overriding, and the Unload() operator. The acpidump utility from
    upstream ACPICA is included too. From Bob Moore, Lv Zheng, David
    Box, David Binderman, and Colin Ian King.

    - Fixes and cleanups related to ACPI video and backlight interfaces
    from Hans de Goede. That includes blacklist entries for some new
    machines and using native backlight by default.

    - ACPI device enumeration changes to create platform devices rather
    than PNP devices for ACPI device objects with _HID by default. PNP
    devices will still be created for the ACPI device object with
    device IDs corresponding to real PNP devices, so that change should
    not break things left and right, and we're expecting to see more
    and more ACPI-enumerated platform devices in the future. From
    Zhang Rui and Rafael J Wysocki.

    - Updates for the ACPI LPSS (Low-Power Subsystem) driver allowing it
    to handle system suspend/resume on Asus T100 correctly. From
    Heikki Krogerus and Rafael J Wysocki.

    - PM core update introducing a mechanism to allow runtime-suspended
    devices to stay suspended over system suspend/resume transitions if
    certain additional conditions related to coordination within device
    hierarchy are met. Related PM documentation update and ACPI PM
    domain support for the new feature. From Rafael J Wysocki.

    - Fixes and improvements related to the "freeze" sleep state. They
    affect several places including cpuidle, PM core, ACPI core, and
    the ACPI battery driver. From Rafael J Wysocki and Zhang Rui.

    - Miscellaneous fixes and updates of the ACPI core from Aaron Lu,
    Bjørn Mork, Hanjun Guo, Lan Tianyu, and Rafael J Wysocki.

    - Fixes and cleanups for the ACPI processor and ACPI PAD (Processor
    Aggregator Device) drivers from Baoquan He, Manuel Schölling, Tony
    Camuso, and Toshi Kani.

    - System suspend/resume optimization in the ACPI battery driver from
    Lan Tianyu.

    - OPP (Operating Performance Points) subsystem updates from Chander
    Kashyap, Mark Brown, and Nishanth Menon.

    - cpufreq core fixes, updates and cleanups from Srivatsa S Bhat,
    Stratos Karafotis, and Viresh Kumar.

    - Updates, fixes and cleanups for the Tegra, powernow-k8, imx6q,
    s5pv210, nforce2, and powernv cpufreq drivers from Brian Norris,
    Jingoo Han, Paul Bolle, Philipp Zabel, Stratos Karafotis, and
    Viresh Kumar.

    - intel_pstate driver fixes and cleanups from Dirk Brandewie, Doug
    Smythies, and Stratos Karafotis.

    - Enabling the big.LITTLE cpufreq driver on arm64 from Mark Brown.

    - Fix for the cpuidle menu governor from Chander Kashyap.

    - New ARM clps711x cpuidle driver from Alexander Shiyan.

    - Hibernate core fixes and cleanups from Chen Gang, Dan Carpenter,
    Fabian Frederick, Pali Rohár, and Sebastian Capella.

    - Intel RAPL (Running Average Power Limit) driver updates from Jacob
    Pan.

    - PNP subsystem updates from Bjorn Helgaas and Fabian Frederick.

    - devfreq core updates from Chanwoo Choi and Paul Bolle.

    - devfreq updates for exynos4 and exynos5 from Chanwoo Choi and
    Bartlomiej Zolnierkiewicz.

    - turbostat tool fix from Jean Delvare.

    - cpupower tool updates from Prarit Bhargava, Ramkumar Ramachandra
    and Thomas Renninger.

    - New ACPI ec_access.c tool for poking at the EC in a safe way from
    Thomas Renninger"

    * tag 'pm+acpi-3.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (187 commits)
    ACPICA: Namespace: Remove _PRP method support.
    intel_pstate: Improve initial busy calculation
    intel_pstate: add sample time scaling
    intel_pstate: Correct rounding in busy calculation
    intel_pstate: Remove C0 tracking
    PM / hibernate: fixed typo in comment
    ACPI: Fix x86 regression related to early mapping size limitation
    ACPICA: Tables: Add mechanism to control early table checksum verification.
    ACPI / scan: use platform bus type by default for _HID enumeration
    ACPI / scan: always register ACPI LPSS scan handler
    ACPI / scan: always register memory hotplug scan handler
    ACPI / scan: always register container scan handler
    ACPI / scan: Change the meaning of missing .attach() in scan handlers
    ACPI / scan: introduce platform_id device PNP type flag
    ACPI / scan: drop unsupported serial IDs from PNP ACPI scan handler ID list
    ACPI / scan: drop IDs that do not comply with the ACPI PNP ID rule
    ACPI / PNP: use device ID list for PNPACPI device enumeration
    ACPI / scan: .match() callback for ACPI scan handlers
    ACPI / battery: wakeup the system only when necessary
    power_supply: allow power supply devices registered w/o wakeup source
    ...

    Linus Torvalds
     
  • Conflicts:
    include/net/inetpeer.h
    net/ipv6/output_core.c

    Changes in net were fixing bugs in code removed in net-next.

    Signed-off-by: David S. Miller

    David S. Miller
     
  • * pm-cpufreq: (28 commits)
    cpufreq: handle calls to ->target_index() in separate routine
    cpufreq: s5pv210: drop check for CONFIG_PM_VERBOSE
    cpufreq: intel_pstate: Remove unused member name of cpudata
    cpufreq: Break out early when frequency equals target_freq
    cpufreq: Tegra: drop wrapper around tegra_update_cpu_speed()
    cpufreq: imx6q: Remove unused include
    cpufreq: imx6q: Drop devm_clk/regulator_get usage
    cpufreq: powernow-k8: Suppress checkpatch warnings
    cpufreq: powernv: make local function static
    cpufreq: Enable big.LITTLE cpufreq driver on arm64
    cpufreq: nforce2: remove DEFINE_PCI_DEVICE_TABLE macro
    intel_pstate: Add CPU IDs for Broadwell processors
    cpufreq: Fix build error on some platforms that use cpufreq_for_each_*
    PM / OPP: Move cpufreq specific OPP functions out of generic OPP library
    PM / OPP: Remove cpufreq wrapper dependency on internal data organization
    cpufreq: Catch double invocations of cpufreq_freq_transition_begin/end
    intel_pstate: Remove sample parameter in intel_pstate_calc_busy
    cpufreq: Kconfig: Fix spelling errors
    cpufreq: Make linux-pm@vger.kernel.org official mailing list
    cpufreq: exynos: Use dev_err/info function instead of pr_err/info
    ...

    Rafael J. Wysocki
     
  • * pnp:
    MAINTAINERS: Remove Bjorn Helgaas as PNP maintainer
    PNP / resources: remove positive test on unsigned values

    * powercap:
    powercap / RAPL: add new CPU IDs
    powercap / RAPL: further relax energy counter checks

    * pm-runtime:
    PM / runtime: Update documentation to reflect the current code flow

    * pm-opp:
    PM / OPP: discard duplicate OPPs
    PM / OPP: Make OPP invisible to users in Kconfig
    PM / OPP: fix incorrect OPP count handling in of_init_opp_table

    Rafael J. Wysocki
     
  • …eck/linux-staging into next

    Pull hwmon updates from Guenter Roeck:
    "New driver for NCT6683D

    New chip support to existing drivers:
    - add support for STTS2004 and AT30TSE004 to jc42 driver
    - add support for EMC1402/EMC1412/EMC1422 to emc1403 driver

    Other notable changes:
    - document hwmon kernel API
    - convert jc42, lm70, lm75, lm77, lm83, lm92, max1619, tmp421, and
    tmp102 drivers to use new hwmon API functions
    - replace function macros in lm80, lm92, and jc42 drivers with real
    code
    - convert emc1403 driver to use regmap, add support for additional
    attributes, and add device IDs for EMC1412, EMC1413, and EMC1414
    - various additional cleanup and minor bug fixes in several drivers"

    * tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: (60 commits)
    hwmon: (nct6775) Fix probe unwind paths to properly unregister platform devices
    hwmon: (nct6683) Fix probe unwind paths to properly unregister platform devices
    hwmon: (ultra45_env) Introduce managed version of kzalloc
    hwmon: Driver for NCT6683D
    hwmon: (lm80) Rearrange code to avoid forward declarations
    hwmon: (lm80) Convert fan display function macros into functions
    hwmon: (lm80) Convert voltage display function macros into functions
    hwmon: (lm80) Convert temperature display function macros into functions
    hwmon: (lm80) Normalize all temperature values to 16 bit
    hwmon: (lm80) Simplify TEMP_FROM_REG
    hwmon: (lm83) Convert to use devm_hwmon_device_register_with_groups
    hwmon: (lm83) Rearange code to avoid forward declarations
    hwmon: (lm83) Drop FSF address
    hwmon: (max1619) Convert to use devm_hwmon_device_register_with_groups
    hwmon: (max1619) Drop function macros
    hwmon: (max1619) Rearrange code to avoid forward declarations
    hwmon: (max1619) Drop FSF address
    hwmon: (max1619) Fix critical alarm display
    hwmon: (jc42) Add support for STTS2004 and AT30TSE004
    hwmon: (jc42) Convert function macros into functions
    ...

    Linus Torvalds
     

03 Jun, 2014

7 commits

  • …egkh/staging into next

    Pull staging driver updates from Greg KH:
    "Here is the big staging driver pull request for 3.16-rc1.

    Lots of stuff here, tons of cleanup patches, a few new drivers, and
    some removed as well, but I think we are still adding a few thousand
    more lines than we remove, due to the new drivers being bigger than
    the ones deleted.

    One notible bit of work did stand out, Jes Sorensen has gone on a
    tear, fixing up a wireless driver to be "more sane" than it originally
    was from the vendor, with over 500 patches merged here. Good stuff,
    and a number of users laptops are better off for it.

    All of this has been in linux-next for a while"

    * tag 'staging-3.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (1703 commits)
    staging: skein: fix sparse warning for static declarations
    staging/mt29f_spinand: coding style fixes
    staging: silicom: fix sparse warning for static variable
    staging: lustre: Fix coding style
    staging: android: binder.c: Use more appropriate functions for euid retrieval
    staging: lustre: fix integer as NULL pointer warnings
    Revert "staging: dgap: remove unneeded kfree() in dgap_tty_register_ports()"
    Staging: rtl8192u: r8192U_wx.c Fixed a misplaced brace
    staging: ion: shrink highmem pages on kswapd
    staging: ion: use compound pages on high order pages for system heap
    staging: ion: remove struct ion_page_pool_item
    staging: ion: simplify ion_page_pool_total()
    staging: ion: tidy up a bit
    staging: rtl8723au: Remove redundant casting in usb_ops_linux.c
    staging: rtl8723au: Remove redundant casting in rtl8723a_hal_init.c
    staging: rtl8723au: Remove redundant casting in rtw_xmit.c
    staging: rtl8723au: Remove redundant casting in rtw_wlan_util.c
    staging: rtl8723au: Remove redundant casting in rtw_sta_mgt.c
    staging: rtl8723au: Remove redundant casting in rtw_recv.c
    staging: rtl8723au: Remove redundant casting in rtw_mlme.c
    ...

    Linus Torvalds
     
  • …gregkh/char-misc into next

    Pull char/misc driver patches from Greg KH:
    "Here is the big char / misc driver update for 3.16-rc1.

    Lots of different driver updates for a variety of different drivers
    and minor driver subsystems.

    All have been in linux-next with no reported issues"

    * tag 'char-misc-3.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (79 commits)
    hv: use correct order when freeing monitor_pages
    spmi: of: fixup generic SPMI devicetree binding example
    applicom: dereferencing NULL on error path
    misc: genwqe: fix uninitialized return value in genwqe_free_sync_sgl()
    miscdevice.h: Simple syntax fix to make pointers consistent.
    MAINTAINERS: Add miscdevice.h to file list for char/misc drivers.
    mcb: Add support for shared PCI IRQs
    drivers: Remove duplicate conditionally included subdirs
    misc: atmel_pwm: only build for supported platforms
    mei: me: move probe quirk to cfg structure
    mei: add per device configuration
    mei: me: read H_CSR after asserting reset
    mei: me: drop harmful wait optimization
    mei: me: fix hw ready reset flow
    mei: fix memory leak of mei_clients array
    uio: fix vma io range check in mmap
    drivers: uio_dmem_genirq: Fix memory leak in uio_dmem_genirq_probe()
    w1: do not unlock unheld list_mutex in __w1_remove_master_device()
    w1: optional bundling of netlink kernel replies
    connector: allow multiple messages to be sent in one packet
    ...

    Linus Torvalds
     
  • Conflicts:
    arch/mips/loongson/lemote-2f/clock.c
    drivers/cpufreq/intel_pstate.c

    Rafael J. Wysocki
     
  • Pull networking fixes from David Miller:

    1) Unbreak zebra and other netlink apps, from Eric W Biederman.

    2) Some new qmi_wwan device IDs, from Aleksander Morgado.

    3) Fix info leak in DCB netlink handler of qlcnic driver, from Dan
    Carpenter.

    4) inet_getid() and ipv6_select_ident() do not generate monotonically
    increasing ID numbers, fix from Eric Dumazet.

    5) Fix memory leak in __sk_prepare_filter(), from Leon Yu.

    6) Netlink leftover bytes warning message is user triggerable, rate
    limit it. From Michal Schmidt.

    7) Fix non-linear SKB panic in ipvs, from Peter Christensen.

    8) Congestion window undo needs to be performed even if only never
    retransmitted data is SACK'd, fix from Yuching Cheng.

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (24 commits)
    net: filter: fix possible memory leak in __sk_prepare_filter()
    net: ec_bhf: Add runtime dependencies
    tcp: fix cwnd undo on DSACK in F-RTO
    netlink: Only check file credentials for implicit destinations
    ipheth: Add support for iPad 2 and iPad 3
    team: fix mtu setting
    net: fix inet_getid() and ipv6_select_ident() bugs
    net: qmi_wwan: interface #11 in Sierra Wireless MC73xx is not QMI
    net: qmi_wwan: add additional Sierra Wireless QMI devices
    bridge: Prevent insertion of FDB entry with disallowed vlan
    netlink: rate-limit leftover bytes warning and print process name
    bridge: notify user space after fdb update
    net: qmi_wwan: add Netgear AirCard 341U
    net: fix wrong mac_len calculation for vlans
    batman-adv: fix NULL pointer dereferences
    net/mlx4_core: Reset RoCE VF gids when guest driver goes down
    emac: aggregation of v1-2 PLB errors for IER register
    emac: add missing support of 10mbit in emac/rgmii
    can: only rename enabled led triggers when changing the netdev name
    ipvs: Fix panic due to non-linear skb
    ...

    Linus Torvalds
     
  • Pull part one of ARM SoC updates from Olof Johansson:
    "A quite large set of SoC updates this cycle. In no particular order:

    - Multi-cluster power management for Samsung Exynos, adding support
    for big.LITTLE CPU switching on EXYNOS5

    - SMP support for Marvell Armada 375 and 38x

    - SMP rework on Allwinner A31

    - Xilinx Zynq support for SOC_BUS, big endian

    - Marvell orion5x platform cleanup, modernizing the implementation
    and moving to DT.

    - _Finally_ moving Samsung Exynos over to support MULTIPLATFORM, so
    that their platform can be enabled in the same kernel binary as
    most of the other v7 platforms in the tree. \o/

    The work isn't quite complete, there's some driver fixes still
    needed, but the basics now work.

    New SoC support added:

    - Freescale i.MX6SX

    - LSI Axxia AXM55xx SoCs

    - Samsung EXYNOS 3250, 5260, 5410, 5420 and 5800

    - STi STIH407

    plus a large set of various smaller updates for different platforms.
    I'm probably missing some important one here"

    * tag 'soc-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (281 commits)
    ARM: exynos: don't run exynos4 l2x0 setup on other platforms
    ARM: exynos: Fix "allmodconfig" build errors in mcpm and hotplug
    ARM: EXYNOS: mcpm rename the power_down_finish
    ARM: EXYNOS: Enable mcpm for dual-cluster exynos5800 SoC
    ARM: EXYNOS: Enable multi-platform build support
    ARM: EXYNOS: Consolidate Kconfig entries
    ARM: EXYNOS: Add support for EXYNOS5410 SoC
    ARM: EXYNOS: Support secondary CPU boot of Exynos3250
    ARM: EXYNOS: Add Exynos3250 SoC ID
    ARM: EXYNOS: Add 5800 SoC support
    ARM: EXYNOS: initial board support for exynos5260 SoC
    clk: exynos5410: register clocks using common clock framework
    ARM: debug: qcom: add UART addresses to Kconfig help for APQ8084
    ARM: sunxi: allow building without reset controller
    Documentation: devicetree: arm: sort enable-method entries
    ARM: rockchip: convert smp bringup to CPU_METHOD_OF_DECLARE
    clk: exynos5250: Add missing sysmmu clocks for DISP and ISP blocks
    ARM: dts: axxia: Add reset controller
    power: reset: Add Axxia system reset driver
    ARM: axxia: Adding defconfig for AXM55xx
    ...

    Linus Torvalds
     
  • Pull PCI changes from Bjorn Helgaas:
    "Enumeration
    - Notify driver before and after device reset (Keith Busch)
    - Use reset notification in NVMe (Keith Busch)

    NUMA
    - Warn if we have to guess host bridge node information (Myron Stowe)
    - Work around AMD Fam15h BIOSes that fail to provide _PXM (Suravee
    Suthikulpanit)
    - Clean up and mark early_root_info_init() as deprecated (Suravee
    Suthikulpanit)

    Driver binding
    - Add "driver_override" for force specific binding (Alex Williamson)
    - Fail "new_id" addition for devices we already know about (Bandan
    Das)

    Resource management
    - Support BAR sizes up to 8GB (Nikhil Rao, Alan Cox)
    - Don't move IORESOURCE_PCI_FIXED resources (Bjorn Helgaas)
    - Mark SBx00 HPET BAR as IORESOURCE_PCI_FIXED (Bjorn Helgaas)
    - Fail safely if we can't handle BARs larger than 4GB (Bjorn Helgaas)
    - Reject BAR above 4GB if dma_addr_t is too small (Bjorn Helgaas)
    - Don't convert BAR address to resource if dma_addr_t is too small
    (Bjorn Helgaas)
    - Don't set BAR to zero if dma_addr_t is too small (Bjorn Helgaas)
    - Don't print anything while decoding is disabled (Bjorn Helgaas)
    - Don't add disabled subtractive decode bus resources (Bjorn Helgaas)
    - Add resource allocation comments (Bjorn Helgaas)
    - Restrict 64-bit prefetchable bridge windows to 64-bit resources
    (Yinghai Lu)
    - Assign i82875p_edac PCI resources before adding device (Yinghai Lu)

    PCI device hotplug
    - Remove unnecessary "dev->bus" test (Bjorn Helgaas)
    - Use PCI_EXP_SLTCAP_PSN define (Bjorn Helgaas)
    - Fix rphahp endianess issues (Laurent Dufour)
    - Acknowledge spurious "cmd completed" event (Rajat Jain)
    - Allow hotplug service drivers to operate in polling mode (Rajat Jain)
    - Fix cpqphp possible NULL dereference (Rickard Strandqvist)

    MSI
    - Replace pci_enable_msi_block() by pci_enable_msi_exact()
    (Alexander Gordeev)
    - Replace pci_enable_msix() by pci_enable_msix_exact() (Alexander Gordeev)
    - Simplify populate_msi_sysfs() (Jan Beulich)

    Virtualization
    - Add Intel Patsburg (X79) root port ACS quirk (Alex Williamson)
    - Mark RTL8110SC INTx masking as broken (Alex Williamson)

    Generic host bridge driver
    - Add generic PCI host controller driver (Will Deacon)

    Freescale i.MX6
    - Use new clock names (Lucas Stach)
    - Drop old IRQ mapping (Lucas Stach)
    - Remove optional (and unused) IRQs (Lucas Stach)
    - Add support for MSI (Lucas Stach)
    - Fix imx6_add_pcie_port() section mismatch warning (Sachin Kamat)

    Renesas R-Car
    - Add gen2 device tree support (Ben Dooks)
    - Use new OF interrupt mapping when possible (Lucas Stach)
    - Add PCIe driver (Phil Edworthy)
    - Add PCIe MSI support (Phil Edworthy)
    - Add PCIe device tree bindings (Phil Edworthy)

    Samsung Exynos
    - Remove unnecessary OOM messages (Jingoo Han)
    - Fix add_pcie_port() section mismatch warning (Sachin Kamat)

    Synopsys DesignWare
    - Make MSI ISR shared IRQ aware (Lucas Stach)

    Miscellaneous
    - Check for broken config space aliasing (Alex Williamson)
    - Update email address (Ben Hutchings)
    - Fix Broadcom CNB20LE unintended sign extension (Bjorn Helgaas)
    - Fix incorrect vgaarb conditional in WARN_ON() (Bjorn Helgaas)
    - Remove unnecessary __ref annotations (Bjorn Helgaas)
    - Add arch/x86/kernel/quirks.c to MAINTAINERS PCI file patterns
    (Bjorn Helgaas)
    - Fix use of uninitialized MPS value (Bjorn Helgaas)
    - Tidy x86/gart messages (Bjorn Helgaas)
    - Fix return value from pci_user_{read,write}_config_*() (Gavin Shan)
    - Turn pcibios_penalize_isa_irq() into a weak function (Hanjun Guo)
    - Remove unused serial device IDs (Jean Delvare)
    - Use designated initialization in PCI_VDEVICE (Mark Rustad)
    - Fix powerpc NULL dereference in pci_root_buses traversal (Mike Qiu)
    - Configure MPS on ARM (Murali Karicheri)
    - Remove unnecessary includes of (Paul Gortmaker)
    - Move Open Firmware devspec attribute to PCI common code (Sebastian Ott)
    - Use pdev->dev.groups for attribute creation on s390 (Sebastian Ott)
    - Remove pcibios_add_platform_entries() (Sebastian Ott)
    - Add new ID for Intel GPU "spurious interrupt" quirk (Thomas Jarosch)
    - Rename pci_is_bridge() to pci_has_subordinate() (Yijing Wang)
    - Add and use new pci_is_bridge() interface (Yijing Wang)
    - Make pci_bus_add_device() void (Yijing Wang)

    DMA API
    - Clarify physical/bus address distinction in docs (Bjorn Helgaas)
    - Fix typos in docs (Emilio López)
    - Update dma_pool_create ()and dma_pool_alloc() descriptions (Gioh Kim)
    - Change dma_declare_coherent_memory() CPU address to phys_addr_t
    (Bjorn Helgaas)
    - Pass GAPSPCI_DMA_BASE CPU & bus address to dma_declare_coherent_memory()
    (Bjorn Helgaas)"

    * tag 'pci-v3.16-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: (92 commits)
    MAINTAINERS: Add generic PCI host controller driver
    PCI: generic: Add generic PCI host controller driver
    PCI: imx6: Add support for MSI
    PCI: designware: Make MSI ISR shared IRQ aware
    PCI: imx6: Remove optional (and unused) IRQs
    PCI: imx6: Drop old IRQ mapping
    PCI: imx6: Use new clock names
    i82875p_edac: Assign PCI resources before adding device
    ARM/PCI: Call pcie_bus_configure_settings() to set MPS
    PCI: imx6: Fix imx6_add_pcie_port() section mismatch warning
    PCI: Make pci_bus_add_device() void
    PCI: exynos: Fix add_pcie_port() section mismatch warning
    PCI: Introduce new device binding path using pci_dev.driver_override
    PCI: rcar: Add gen2 device tree support
    PCI: cpqphp: Fix possible null pointer dereference
    PCI: rcar: Add R-Car PCIe device tree bindings
    PCI: rcar: Add MSI support for PCIe
    PCI: rcar: Add Renesas R-Car PCIe driver
    PCI: Fix return value from pci_user_{read,write}_config_*()
    PCI: exynos: Remove unnecessary OOM messages
    ...

    Linus Torvalds
     
  • Pull HSI (High Speed Syncronous Interface) changes from Sebastian Reichel:
    "Please pull the following changes for the HSI subsystem, which I have
    taken over from Carlos Chinea .

    The below patches have been worked on in the linux-omap mailinglist
    for 10 months and are well tested in linux-next (have been in there
    for more than two weeks) without any problems arising. Apart from
    that potential regressions are very limited, because the subsystem is
    not yet used by any platform in the mainline kernel.

    - Add some documentation for the HSI subsystem

    - Add Device Tree support for the HSI subsystem

    - Add OMAP3 SSI driver (SSI is a legacy variant of HSI)

    - Add Nokia N900 Modem driver (without speech support for now)"

    * tag 'hsi-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi:
    HSI: Introduce Nokia N900 modem driver
    HSI: Introduce driver for SSI Protocol
    Documentation: DT: omap-ssi binding documentation
    HSI: Introduce OMAP SSI driver
    HSI: Add common DT binding for HSI client devices
    HSI: export method to (un)register clients
    HSI: Add channel resource support to HSI clients
    HSI: method to unregister clients from an hsi port
    HSI: hsi-char: fix driver for multiport scenarios
    MAINTAINERS: update HSI entry
    Documentation: HSI: Add some general description for the HSI subsystem

    Linus Torvalds