1. 24 Apr, 2015 9 commits
    • Linus Torvalds's avatar
      Merge tag 'blackfin-for-linus' of... · 668b54a1
      Linus Torvalds authored
      Merge tag 'blackfin-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/realmz6/blackfin-linux
      
      Pull blackfin updates from Steven Miao.
      
      * tag 'blackfin-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/realmz6/blackfin-linux:
        eth: bf609 eth clock: add pclk clock for stmmac driver probe
        blackfin: Wire up missing syscalls
        arch: blackfin: kernel: kgdb: Remove unused function
        dma: fix build error after update to v3.19
        blackfin: io: define __raw_readx/writex with bfin_readx/writex
        bf609: add resources for lcd nl8048
        pm: sometimes wake up from suspend to RAM would fail
        debug-mmrs: Eliminate all traces of the USB_PHY_TEST MMR
        bf609: remove softswitch i2c configuration from adv7842 and adv7511 platform data
        bf609: add platform data for soft switch devices on the video extenders
        bf609: enable soft switch gpio driver by default
        bf609: add gpio soft switch platform data for mcp23017 i2c devices
        bf609: use new SND_BF6XX_PCM to choose audio pcm driver
        bug[220] kgdb: change the smp cross core function entry
        arch: blackfin: kernel: setup.c: Cleaning up missing null-terminate in conjunction with strncpy
        blackfin: defconfigs: cleanup unused CONFIG_MTD_CHAR, add MTD_SPI_NOR for BF537-STAMP
      668b54a1
    • Linus Torvalds's avatar
      Merge tag 'metag-for-v4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag · fab1e550
      Linus Torvalds authored
      Pull Metag architecture updates from James Hogan:
       "Just the one change for v4.1-rc1.  A minor cleanup of copy_thread()"
      
      * tag 'metag-for-v4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag:
        metag: copy_thread(): rename 'arg' argument to 'kthread_arg'
      fab1e550
    • Linus Torvalds's avatar
      Merge tag 'arc-4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc · c76397e9
      Linus Torvalds authored
      Pull ARC updates from Vineet Gupta:
      
       - perf fixes/improvements
      
       - misc cleanups
      
      * tag 'arc-4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc:
        ARC: perf: don't add code for impossible case
        ARC: perf: Rename DT binding to not confuse with power mgmt
        ARC: perf: add user space attribution in callchains
        ARC: perf: Add kernel callchain support
        ARC: perf: support cache hit/miss ratio
        ARC: perf: Add some comments/debug stuff
        ARC: perf: make @arc_pmu static global
        ARC: mem init spring cleaning - No functional changes
        ARC: Fix RTT boot printing
        ARC: fold __builtin_constant_p() into test_bit()
        ARC: rename unhandled exception handler
        ARC: cosmetic: Remove unused ECR bitfield masks
        ARC: Fix WRITE_BCR
        ARC: [nsimosci] Update defconfig
        arc: copy_thread(): rename 'arg' argument to 'kthread_arg'
      c76397e9
    • Linus Torvalds's avatar
      Merge branch 'for-4.1' of git://linux-nfs.org/~bfields/linux · 860448cf
      Linus Torvalds authored
      Pull nfsd updates from Bruce Fields:
       "A quiet cycle this time; this is basically entirely bugfixes.
      
        The few that aren't cc'd to stable are cleanup or seemed unlikely to
        affect anyone much"
      
      * 'for-4.1' of git://linux-nfs.org/~bfields/linux:
        uapi: Remove kernel internal declaration
        nfsd: fix nsfd startup race triggering BUG_ON
        nfsd: eliminate NFSD_DEBUG
        nfsd4: fix READ permission checking
        nfsd4: disallow SEEK with special stateids
        nfsd4: disallow ALLOCATE with special stateids
        nfsd: add NFSEXP_PNFS to the exflags array
        nfsd: Remove duplicate macro define for max sec label length
        nfsd: allow setting acls with unenforceable DENYs
        nfsd: NFSD_FAULT_INJECTION depends on DEBUG_FS
        nfsd: remove unused status arg to nfsd4_cleanup_open_state
        nfsd: remove bogus setting of status in nfsd4_process_open2
        NFSD: Use correct reply size calculating function
        NFSD: Using path_equal() for checking two paths
      860448cf
    • Linus Torvalds's avatar
      Merge branch 'for-linus-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs · ba0e4ae8
      Linus Torvalds authored
      Pull btrfs updates from Chris Mason:
       "I've been running these through a longer set of load tests because my
        commits change the free space cache writeout.  It fixes commit stalls
        on large filesystems (~20T space used and up) that we have been
        triggering here.  We were seeing new writers blocked for 10 seconds or
        more during commits, which is far from good.
      
        Josef and I fixed up ENOSPC aborts when deleting huge files (3T or
        more), that are triggered because our metadata reservations were not
        properly accounting for crcs and were not replenishing during the
        truncate.
      
        Also in this series, a number of qgroup fixes from Fujitsu and Dave
        Sterba collected most of the pending cleanups from the list"
      
      * 'for-linus-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: (93 commits)
        btrfs: quota: Update quota tree after qgroup relationship change.
        btrfs: quota: Automatically update related qgroups or mark INCONSISTENT flags when assigning/deleting a qgroup relations.
        btrfs: qgroup: clear STATUS_FLAG_ON in disabling quota.
        btrfs: Update btrfs qgroup status item when rescan is done.
        btrfs: qgroup: Fix dead judgement on qgroup_rescan_leaf() return value.
        btrfs: Don't allow subvolid >= (1 << BTRFS_QGROUP_LEVEL_SHIFT) to be created
        btrfs: Check qgroup level in kernel qgroup assign.
        btrfs: qgroup: allow to remove qgroup which has parent but no child.
        btrfs: qgroup: return EINVAL if level of parent is not higher than child's.
        btrfs: qgroup: do a reservation in a higher level.
        Btrfs: qgroup, Account data space in more proper timings.
        Btrfs: qgroup: Introduce a may_use to account space_info->bytes_may_use.
        Btrfs: qgroup: free reserved in exceeding quota.
        Btrfs: qgroup: cleanup, remove an unsued parameter in btrfs_create_qgroup().
        btrfs: qgroup: fix limit args override whole limit struct
        btrfs: qgroup: update limit info in function btrfs_run_qgroups().
        btrfs: qgroup: consolidate the parameter of fucntion update_qgroup_limit_item().
        btrfs: qgroup: update qgroup in memory at the same time when we update it in btree.
        btrfs: qgroup: inherit limit info from srcgroup in creating snapshot.
        btrfs: Support busy loop of write and delete
        ...
      ba0e4ae8
    • Linus Torvalds's avatar
      Merge tag 'xfs-for-linus-4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/dgc/linux-xfs · 1aef882f
      Linus Torvalds authored
      Pull xfs update from Dave Chinner:
       "This update contains:
      
         - RENAME_WHITEOUT support
      
         - conversion of per-cpu superblock accounting to use generic counters
      
         - new inode mmap lock so that we can lock page faults out of
           truncate, hole punch and other direct extent manipulation functions
           to avoid racing mmap writes from causing data corruption
      
         - rework of direct IO submission and completion to solve data
           corruption issue when running concurrent extending DIO writes.
           Also solves problem of running IO completion transactions in
           interrupt context during size extending AIO writes.
      
         - FALLOC_FL_INSERT_RANGE support for inserting holes into a file via
           direct extent manipulation to avoid needing to copy data within the
           file
      
         - attribute block header field overflow fix for 64k block size
           filesystems
      
         - Lots of changes to log messaging to be more informative and concise
           when errors occur.  Also prevent a lot of unnecessary log spamming
           due to cascading failures in error conditions.
      
         - lots of cleanups and bug fixes
      
        One thing of note is the direct IO fixes that we merged last week
        after the window opened.  Even though a little late, they fix a user
        reported data corruption and have been pretty well tested.  I figured
        there was not much point waiting another 2 weeks for -rc1 to be
        released just so I could send them to you..."
      
      * tag 'xfs-for-linus-4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/dgc/linux-xfs: (49 commits)
        xfs: using generic_file_direct_write() is unnecessary
        xfs: direct IO EOF zeroing needs to drain AIO
        xfs: DIO write completion size updates race
        xfs: DIO writes within EOF don't need an ioend
        xfs: handle DIO overwrite EOF update completion correctly
        xfs: DIO needs an ioend for writes
        xfs: move DIO mapping size calculation
        xfs: factor DIO write mapping from get_blocks
        xfs: unlock i_mutex in xfs_break_layouts
        xfs: kill unnecessary firstused overflow check on attr3 leaf removal
        xfs: use larger in-core attr firstused field and detect overflow
        xfs: pass attr geometry to attr leaf header conversion functions
        xfs: disallow ro->rw remount on norecovery mount
        xfs: xfs_shift_file_space can be static
        xfs: Add support FALLOC_FL_INSERT_RANGE for fallocate
        fs: Add support FALLOC_FL_INSERT_RANGE for fallocate
        xfs: Fix incorrect positive ENOMEM return
        xfs: xfs_mru_cache_insert() should use GFP_NOFS
        xfs: %pF is only for function pointers
        xfs: fix shadow warning in xfs_da3_root_split()
        ...
      1aef882f
    • Linus Torvalds's avatar
      x86: fix special __probe_kernel_write() tail zeroing case · d869844b
      Linus Torvalds authored
      Commit cae2a173 ("x86: clean up/fix 'copy_in_user()' tail zeroing")
      fixed the failure case tail zeroing of one special case of the x86-64
      generic user-copy routine, namely when used for the user-to-user case
      ("copy_in_user()").
      
      But in the process it broke an even more unusual case: using the user
      copy routine for kernel-to-kernel copying.
      
      Now, normally kernel-kernel copies are obviously done using memcpy(),
      but we have a couple of special cases when we use the user-copy
      functions.  One is when we pass a kernel buffer to a regular user-buffer
      routine, using set_fs(KERNEL_DS).  That's a "normal" case, and continued
      to work fine, because it never takes any faults (with the possible
      exception of a silent and successful vmalloc fault).
      
      But Jan Beulich pointed out another, very unusual, special case: when we
      use the user-copy routines not because it's a path that expects a user
      pointer, but for a couple of ftrace/kgdb cases that want to do a kernel
      copy, but do so using "unsafe" buffers, and use the user-copy routine to
      gracefully handle faults.  IOW, for probe_kernel_write().
      
      And that broke for the case of a faulting kernel destination, because we
      saw the kernel destination and wanted to try to clear the tail of the
      buffer.  Which doesn't work, since that's what faults.
      
      This only triggers for things like kgdb and ftrace users (eg trying
      setting a breakpoint on read-only memory), but it's definitely a bug.
      The fix is to not compare against the kernel address start (TASK_SIZE),
      but instead use the same limits "access_ok()" uses.
      Reported-and-tested-by: default avatarJan Beulich <jbeulich@suse.com>
      Cc: stable@vger.kernel.org # 4.0
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      d869844b
    • Steven Miao's avatar
    • Chen Gang's avatar
      blackfin: Wire up missing syscalls · 4f650a59
      Chen Gang authored
      The related syscalls are below which may cause samples/kdbus building
      break in next-20150401 tree, the related information and error:
      
          CALL    scripts/checksyscalls.sh
        <stdin>:1223:2: warning: #warning syscall kcmp not implemented [-Wcpp]
        <stdin>:1226:2: warning: #warning syscall finit_module not implemented [-Wcpp]
        <stdin>:1229:2: warning: #warning syscall sched_setattr not implemented [-Wcpp]
        <stdin>:1232:2: warning: #warning syscall sched_getattr not implemented [-Wcpp]
        <stdin>:1235:2: warning: #warning syscall renameat2 not implemented [-Wcpp]
        <stdin>:1238:2: warning: #warning syscall seccomp not implemented [-Wcpp]
        <stdin>:1241:2: warning: #warning syscall getrandom not implemented [-Wcpp]
        <stdin>:1244:2: warning: #warning syscall memfd_create not implemented [-Wcpp]
        <stdin>:1247:2: warning: #warning syscall bpf not implemented [-Wcpp]
        <stdin>:1250:2: warning: #warning syscall execveat not implemented [-Wcpp]
        [...]
          HOSTCC  samples/kdbus/kdbus-workers
        samples/kdbus/kdbus-workers.c: In function ‘prime_new’:
        samples/kdbus/kdbus-workers.c:930:18: error: ‘__NR_memfd_create’ undeclared (first use in this function)
          p->fd = syscall(__NR_memfd_create, "prime-area", MFD_CLOEXEC);
                          ^
        samples/kdbus/kdbus-workers.c:930:18: note: each undeclared identifier is reported only once for each function it appears in
      Signed-off-by: default avatarChen Gang <gang.chen.5i5j@gmail.com>
      4f650a59
  2. 23 Apr, 2015 14 commits
  3. 22 Apr, 2015 17 commits
    • Linus Torvalds's avatar
      Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/audit · 27cf3a16
      Linus Torvalds authored
      Pull audit fixes from Paul Moore:
       "Seven audit patches for v4.1, all bug fixes.
      
        The largest, and perhaps most significant commit helps resolve some
        memory pressure issues related to the inode cache and audit, there are
        also a few small commits which help resolve some timing issues with
        the audit log queue, and the rest fall into the always popular "code
        clean-up" category.
      
        In general, nothing really substantial, just a nice set of maintenance
        patches"
      
      * 'upstream' of git://git.infradead.org/users/pcmoore/audit:
        audit: Remove condition which always evaluates to false
        audit: reduce mmap_sem hold for mm->exe_file
        audit: consolidate handling of mm->exe_file
        audit: code clean up
        audit: don't reset working wait time accidentally with auditd
        audit: don't lose set wait time on first successful call to audit_log_start()
        audit: move the tree pruning to a dedicated thread
      27cf3a16
    • Linus Torvalds's avatar
      Merge tag 'for-linus-20150422' of git://git.infradead.org/linux-mtd · a62d016c
      Linus Torvalds authored
      Pull MTD updates from Brian Norris:
       "Common MTD:
      
         - Add Kconfig option for keeping both the 'master' and 'partition'
           MTDs registered as devices.  This would really make a better
           default if we could do it over, as it allows a lot more flexibility
           in (1) determining the flash topology of the system from user-space
           and (2) adding temporary partitions at runtime (ioctl(BLKPG)).
      
           Unfortunately, this would possibly cause user-space breakage, as it
           will cause renumbering of the /dev/mtdX devices.  We'll see if we
           can change this in the future, as there have already been a few
           people looking for this feature, and I know others have just been
           working around our current limitations instead of fixing them this
           way.
      
         - Along with the previous change, add some additional information to
           sysfs, so user-space can read the offset of each partition within
           its master device
      
        SPI NOR:
      
         - add new device tree compatible binding to represent the
           mostly-compatible class of SPI NOR flash which can be detected by
           their extended JEDEC ID bytes, cutting down the duplication of our
           ID tables
      
         - misc.  new IDs
      
        Various other miscellaneous fixes and changes"
      
      * tag 'for-linus-20150422' of git://git.infradead.org/linux-mtd: (53 commits)
        mtd: spi-nor: Add support for Macronix mx25u6435f serial flash
        mtd: spi-nor: Add support for Winbond w25q64dw serial flash
        mtd: spi-nor: add support for the Winbond W25X05 flash
        mtd: spi-nor: support en25s64 device
        mtd: m25p80: bind to "nor-jedec" ID, for auto-detection
        Documentation: devicetree: m25p80: add "nor-jedec" binding
        mtd: Make MTD tests cancelable
        mtd: mtd_oobtest: Fix bitflip_limit usage in test case 3
        mtd: docg3: remove invalid __exit annotations
        mtd: fsl_ifc_nand: use msecs_to_jiffies for time conversion
        mtd: atmel_nand: don't map the ROM table if no pmecc table offset in DT
        mtd: atmel_nand: add a definition for the oob reserved bytes
        mtd: part: Remove partition overlap checks
        mtd: part: Add sysfs variable for offset of partition
        mtd: part: Create the master device node when partitioned
        mtd: ts5500_flash: Fix typo in MODULE_DESCRIPTION in ts5500_flash.c
        mtd: denali: Disable sub-page writes in Denali NAND driver
        mtd: pxa3xx_nand: cleanup wait_for_completion handling
        mtd: nand: gpmi: Check for scan_bbt() error
        mtd: nand: gpmi: fixup return type of wait_for_completion_timeout
        ...
      a62d016c
    • Linus Torvalds's avatar
      Merge tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband · 7c034dfd
      Linus Torvalds authored
      Pull InfiniBand/RDMA updates from Roland Dreier:
      
       - IPoIB fixes from Doug Ledford and Erez Shitrit
      
       - iSER updates from Sagi Grimberg
      
       - mlx4 GUID handling changes from Yishai Hadas
      
       - other misc fixes
      
      * tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: (51 commits)
        mlx5: wrong page mask if CONFIG_ARCH_DMA_ADDR_T_64BIT enabled for 32Bit architectures
        IB/iser: Rewrite bounce buffer code path
        IB/iser: Bump version to 1.6
        IB/iser: Remove code duplication for a single DMA entry
        IB/iser: Pass struct iser_mem_reg to iser_fast_reg_mr and iser_reg_sig_mr
        IB/iser: Modify struct iser_mem_reg members
        IB/iser: Make fastreg pool cache friendly
        IB/iser: Move PI context alloc/free to routines
        IB/iser: Move fastreg descriptor pool get/put to helper functions
        IB/iser: Merge build page-vec into register page-vec
        IB/iser: Get rid of struct iser_rdma_regd
        IB/iser: Remove redundant assignments in iser_reg_page_vec
        IB/iser: Move memory reg/dereg routines to iser_memory.c
        IB/iser: Don't pass ib_device to fall_to_bounce_buff routine
        IB/iser: Remove a redundant struct iser_data_buf
        IB/iser: Remove redundant cmd_data_len calculation
        IB/iser: Fix wrong calculation of protection buffer length
        IB/iser: Handle fastreg/local_inv completion errors
        IB/iser: Fix unload during ep_poll wrong dereference
        ib_srpt: convert printk's to pr_* functions
        ...
      7c034dfd
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client · 1204c464
      Linus Torvalds authored
      Pull Ceph updates from Sage Weil:
       "This time around we have a collection of CephFS fixes from Zheng
        around MDS failure handling and snapshots, support for a new CRUSH
        straw2 algorithm (to sync up with userspace) and several RBD cleanups
        and fixes from Ilya, an error path leak fix from Taesoo, and then an
        assorted collection of cleanups from others"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client: (28 commits)
        rbd: rbd_wq comment is obsolete
        libceph: announce support for straw2 buckets
        crush: straw2 bucket type with an efficient 64-bit crush_ln()
        crush: ensuring at most num-rep osds are selected
        crush: drop unnecessary include from mapper.c
        ceph: fix uninline data function
        ceph: rename snapshot support
        ceph: fix null pointer dereference in send_mds_reconnect()
        ceph: hold on to exclusive caps on complete directories
        libceph: simplify our debugfs attr macro
        ceph: show non-default options only
        libceph: expose client options through debugfs
        libceph, ceph: split ceph_show_options()
        rbd: mark block queue as non-rotational
        libceph: don't overwrite specific con error msgs
        ceph: cleanup unsafe requests when reconnecting is denied
        ceph: don't zero i_wrbuffer_ref when reconnecting is denied
        ceph: don't mark dirty caps when there is no auth cap
        ceph: keep i_snap_realm while there are writers
        libceph: osdmap.h: Add missing format newlines
        ...
      1204c464
    • Linus Torvalds's avatar
      Merge tag 'trace-v4.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace · 4f211235
      Linus Torvalds authored
      Pull tracing fixes from Steven Rostedt:
       "This adds three fixes for the tracing code.
      
        The first is a bug when ftrace_dump_on_oops is triggered in atomic
        context and function graph tracer is the tracer that is being
        reported.
      
        The second fix is bad parsing of the trace_events from the kernel
        command line, where it would ignore specific events if the system name
        is used with defining the event(it enables all events within the
        system).
      
        The last one is a fix to the TRACE_DEFINE_ENUM(), where a check was
        missing to see if the ptr was incremented to the end of the string,
        but the loop increments it again and can miss the nul delimiter to
        stop processing"
      
      * tag 'trace-v4.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
        tracing: Fix possible out of bounds memory access when parsing enums
        tracing: Fix incorrect enabling of trace events by boot cmdline
        tracing: Handle ftrace_dump() atomic context in graph_trace_open()
      4f211235
    • Linus Torvalds's avatar
      Merge tag 'pci-v4.1-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci · 9b60afee
      Linus Torvalds authored
      Pull PCI fixes from Bjorn Helgaas:
       "These fix an ia64 regression caused by tighter resource checking we
        merged during the merge window and remove an invalid email address
        from MAINTAINERS.
      
        Resource management:
          - ia64: Treat all Address Space Descriptors as windows (Bjorn Helgaas)
      
        Miscellaneous:
          - MAINTAINERS: Remove Mohit Kumar (email bounces) (Bjorn Helgaas)"
      
      * tag 'pci-v4.1-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
        ia64/PCI: Treat all host bridge Address Space Descriptors (even consumers) as windows
        MAINTAINERS: Remove Mohit Kumar (email bounces)
      9b60afee
    • Linus Torvalds's avatar
      Merge git://www.linux-watchdog.org/linux-watchdog · 7dcca3e9
      Linus Torvalds authored
      Pull watchdog updates from Wim Van Sebroeck:
       "This contains following changes:
      
         - Octeon: convert to watchdog-API and apply some fixes
         - Cadence wdt: remove dependency on ARCH
         - add DT bindings for qcom + msm
         - bcm281xx: Remove use of seq_printf return value
         - stmp3xxx_rtc_wdt + pnx4008_wdt: fix broken email addresses"
      
      * git://www.linux-watchdog.org/linux-watchdog:
        watchdog: stmp3xxx_rtc_wdt: fix broken email address
        watchdog: pnx4008_wdt: fix broken email address
        watchdog: octeon: use fixed length string for register names
        watchdog: octeon: fix some trivial coding style issues
        watchdog: octeon: convert to WATCHDOG_CORE API
        watchdog: cadence: Remove Kconfig dependency on ARCH
        ARM: msm: add watchdog entries to DT timer binding doc
        ARM: qcom: add description of KPSS WDT for IPQ8064
        watchdog: qcom: use timer devicetree binding
        watchdog: bcm281xx: Remove use of seq_printf return value
      7dcca3e9
    • Linus Torvalds's avatar
      Merge tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux · b9bb6fb7
      Linus Torvalds authored
      Pull virtio updates from Rusty Russell:
       "Some virtio internal cleanups, a new virtio device "virtio input", and
        a change to allow the legacy virtio balloon.
      
        Most excitingly, some lguest work! No seriously, I got some cleanup
        patches"
      
      * tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux:
        virtio: drop virtio_device_is_legacy_only
        virtio_pci: support non-legacy balloon devices
        virtio_mmio: support non-legacy balloon devices
        virtio_ccw: support non-legacy balloon devices
        virtio: balloon might not be a legacy device
        virtio_balloon: transitional interface
        virtio_ring: Update weak barriers to use dma_wmb/rmb
        virtio_pci_modern: switch to type-safe io accessors
        virtio_pci_modern: type-safe io accessors
        lguest: handle traps on the "interrupt suppressed" iret instruction.
        virtio: drop a useless config read
        virtio_config: reorder functions
        Add virtio-input driver.
        lguest: suppress interrupts for single insn, not range.
        lguest: simplify lguest_iret
        lguest: rename i386_head.S in the comments
        lguest: explicitly set miscdevice's private_data NULL
        lguest: fix pending interrupt test.
      b9bb6fb7
    • Brian Norris's avatar
      Merge MTD fixes from 4.0 into -next · 3e550d23
      Brian Norris authored
      3e550d23
    • Linus Torvalds's avatar
      Merge tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux · 15ce2658
      Linus Torvalds authored
      Pull module updates from Rusty Russell:
       "Quentin opened a can of worms by adding extable entry checking to
        modpost, but most architectures seem fixed now.  Thanks to all
        involved.
      
        Last minute rebase because I noticed a "[PATCH]" had snuck into a
        commit message somehow"
      
      * tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux:
        modpost: don't emit section mismatch warnings for compiler optimizations
        modpost: expand pattern matching to support substring matches
        modpost: do not try to match the SHT_NUL section.
        modpost: fix extable entry size calculation.
        modpost: fix inverted logic in is_extable_fault_address().
        modpost: handle -ffunction-sections
        modpost: Whitelist .text.fixup and .exception.text
        params: handle quotes properly for values not of form foo="bar".
        modpost: document the use of struct section_check.
        modpost: handle relocations mismatch in __ex_table.
        scripts: add check_extable.sh script.
        modpost: mismatch_handler: retrieve tosym information only when needed.
        modpost: factorize symbol pretty print in get_pretty_name().
        modpost: add handler function pointer to sectioncheck.
        modpost: add .sched.text and .kprobes.text to the TEXT_SECTIONS list.
        modpost: add strict white-listing when referencing sections.
        module: do not print allocation-fail warning on bogus user buffer size
        kernel/module.c: fix typos in message about unused symbols
      15ce2658
    • Linus Torvalds's avatar
      Revert "mm: avoid tail page refcounting on non-THP compound pages" · f3ca10dd
      Linus Torvalds authored
      This reverts commit 8d63d99a.
      
      It causes in VM mapping refcount errors:
      
        page:ffffea0010a15040 count:0 mapcount:1 mapping:          (null) index:0x0
        flags: 0x8000000000008014(referenced|dirty|tail)
        page dumped because: VM_BUG_ON_PAGE(page_mapcount(page) != 0)
        ------------[ cut here ]------------
        kernel BUG at mm/swap.c:134!
      
      as reported by Borislav Petkov
      Reported-and-tested-by: default avatarBorislav Petkov <bp@alien8.de>
      Cc: Kirill A. Shutemov <kirill@shutemov.name>
      Cc: Hugh Dickins <hughd@google.com>
      Cc: Andrea Arcangeli <aarcange@redhat.com>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Cc: linux-mm@kvack.org
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      f3ca10dd
    • Linus Torvalds's avatar
      Merge tag 'mmc-4.1-rc1' of git://git.linaro.org/people/ulf.hansson/mmc · 5e6c94a9
      Linus Torvalds authored
      Pull MMC fixes from Ulf Hansson:
       "Here is two mmc core fixes for v.4.1 rc1:
      
         - fix error code propagation in mmc_pwrseq_simple_alloc()
      
         - revert 'mmc: core: Convert mmc_driver to device_driver'"
      
      * tag 'mmc-4.1-rc1' of git://git.linaro.org/people/ulf.hansson/mmc:
        Revert "mmc: core: Convert mmc_driver to device_driver"
        mmc: pwrseq: Fix error code propagation in mmc_pwrseq_simple_alloc()
      5e6c94a9
    • Vinod Koul's avatar
      dmaengine: hsu: don't prompt for hsu_core part · 3cfe2137
      Vinod Koul authored
      HSU_DMA is selected by the HSU_DMA_PCI driver, this should be user selected
      so remove the user prompt for this
      Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      3cfe2137
    • Linus Torvalds's avatar
      Merge tag 'armsoc-late' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 8b3c8ba3
      Linus Torvalds authored
      Pull ARM SoC late changes from Olof Johansson:
       "We were expecting to sit on this branch through most of the merge
        window since the contents was merged into our tree late, but we ended
        up sitting on all of our contents so it can go in with the rest.
      
        The contents here is:
      
         - a large branch of cleanups of the CM/PRM blocks on OMAP.
      
         - a couple of patches plumbing up CM/PRM on OMAP5 and DRA7.
      
         - a branch with DT updates for Freescale i.MX.  including some
           shuffling from .dts to .dtsi (include) files that causes a little
           churn"
      
      * tag 'armsoc-late' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (78 commits)
        ARM: OMAP2+: Fix booting with configs that don't have MFD_SYSCON
        ARM: OMAP4+: control: add support for initializing control module via DT
        ARM: dts: dra7: add minimal l4 bus layout with control module support
        ARM: dts: omap5: add minimal l4 bus layout with control module support
        ARM: OMAP4+: control: remove support for legacy pad read/write
        ARM: OMAP4: display: convert display to use syscon for dsi muxing
        ARM: dts: omap4: add minimal l4 bus layout with control module support
        ARM: dts: am4372: add minimal l4 bus layout with control module support
        ARM: dts: am43xx-epos-evm: fix pinmux node layout
        ARM: dts: am33xx: add minimal l4 bus layout with control module support
        ARM: dts: omap3: add minimal l4 bus layout with control module support
        ARM: dts: omap24xx: add minimal l4 bus layout with control module support
        ARM: OMAP2+: control: add syscon support for register accesses
        ARM: OMAP2+: id: cache omap_type value
        ARM: OMAP2+: control: remove API for getting control module base address
        ARM: OMAP2+: clock: add low-level support for regmap
        ARM: OMAP4+: PRM: get rid of cpu_is_omap44xx calls from interrupt init
        ARM: OMAP4+: PRM: setup prm_features from the PRM init time flags
        ARM: OMAP2+: CM: move SoC specific init calls within a generic API
        ARM: OMAP4+: PRM: determine prm_device_inst based on DT compatibility
        ...
      8b3c8ba3
    • Linus Torvalds's avatar
      Merge tag 'armsoc-arm64' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · d34dc4f9
      Linus Torvalds authored
      Pull ARM SoC 64-bit changes from Olof Johansson:
       "Mostly DT updates for arm64, but also a couple of Kconfig additions.
      
        Main contents:
      
         - Qualcomm MSM8916/APQ8016
      
         - Spreadtrum SC9836
      
         - Xilinx ZynqMP
      
         - pincontrol entries for MediaTek MT8173"
      
      * tag 'armsoc-arm64' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
        arm64: dts: add interrupt-affinity property to pmu node for juno
        arm64: dts: Add Qualcomm APQ8016 SBC evaluation board dts
        arm64: dts: Add Qualcomm MSM8916 SoC and evaluation board dts
        arm64: dts: sprd: adding coresight entries to Spreadtrum SC9836
        arm64: Add support for Spreadtrum's Sharkl64 Platform in Kconfig and defconfig
        arm64: dts: Add support for Spreadtrum SC9836 SoC in dts and Makefile
        ARM64: Add new Xilinx ZynqMP SoC
        arm64: qcom: Add support for Qualcomm MSM8916 SoC
        arm64: dts: mt8173: Add pinctrl/GPIO/EINT node for mt8173.
        arm64: mediatek: Select PINCTRL for Mediatek platform
      d34dc4f9
    • Linus Torvalds's avatar
      Merge tag 'armsoc-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 2144de82
      Linus Torvalds authored
      Pull ARM SoC defconfig updates from Olof Johansson:
       "We keep collecting defconfig updates in a separate branch mostly to
        encourage people to handle them separately and avoid conflicts between
        different topics.
      
        Most of these are enablement of new drivers that have come in, or
        minor config refreshes due to reorderings in Kconfig files, etc.  I.e.
        mostly minor churn of various kinds.
      
        We might start folding this branch into something else for upstream
        merge since it's so small, but keep it independent in our own tree for
        the above reasons"
      
      * tag 'armsoc-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (38 commits)
        ARM: multi_v7_defconfig: enable alpine platform
        ARM: multi_v7_defconfig: Add gpio-restart driver
        ARM: multi_v7_defconfig: Build the Marvell WiFi-Ex driver as a module
        ARM: multi_v7_defconfig: Enable support for ELAN i2c trackpads
        ARM: multi_v7_defconfig: Enable Tegra ACTMON support
        ARM: configs: remove all CONFIG_RCAR_AUDMAC_PP from ARM defconfigs
        ARM: configs: enable Marvell Armada 39x in multi_v7_defconfig
        ARM: exynos_defconfig: Enable HDMI support
        ARM: exynos_defconfig: Enable options to mount a rootfs via NFS
        ARM: qcom: Increase MMC_BLOCK_MINORS in defconfig
        ARM: mvebu: Enable perf support in mvebu_v7_defconfig
        ARM: exynos_defconfig: Enable ChromeOS EC chardev driver
        ARM: exynos_defconfig: Enable CPU idle
        ARM: exynos_defconfig: Enable Marvell WiFi-Ex support
        arm: qcom: Update defconfig
        arm: qcom: Enable lpass clock driver in defconfig
        ARM: omap2plus_defconfig: Enable n900 modem as loadable modules
        ARM: omap2plus_defconfig: Update bluetooth options
        ARM: omap2plus_defconfig: Enable leds-pwm
        ARM: omap1_defconfig: drop obsolete Kconfig symbols
        ...
      2144de82
    • Linus Torvalds's avatar
      Merge tag 'armsoc-multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · e5ac320d
      Linus Torvalds authored
      Pull ARM SoC multiplatform code changes from Olof Johansson:
       "The changes here belong to two main platforms:
      
         - Atmel At91 is flipping the bit and going multiplatform.  This
           includes some cleanups and removal of code, and the final flip of
           config dependencies
      
         - Shmobile has several platforms that are going multiplatform, but
           this branch also contains a bunch of cleanups that they weren't
           able to keep separate in a good way.  THere's also a removal of one
           of their SoCs and the corresponding boards (sh7372 and mackerel)"
      
      * tag 'armsoc-multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (67 commits)
        ARM: at91/pm: move AT91_MEMCTRL_* to pm.h
        ARM: at91/pm: move the standby functions to pm.c
        ARM: at91: fix pm_suspend.S compilation when ARMv6 is selected
        ARM: at91: add a Kconfig dependency on multi-platform
        ARM: at91: drop AT91_TIMER_HZ
        ARM: at91: remove hardware.h
        ARM: at91: remove SoC headers
        ARM: at91: remove useless mach/cpu.h
        ARM: at91: remove unused headers
        ARM: at91: switch at91_dt_defconfig to multiplatform
        ARM: at91: switch to multiplatform
        ARM: shmobile: r8a7778: enable multiplatform target
        ARM: shmobile: bockw: add sound to DT
        ARM: shmobile: r8a7778: add sound to DT
        ARM: shmobile: bockw: add devices hooked up to i2c0 to DT
        DT: i2c: add trivial binding for OKI ML86V7667 video decoder
        ARM: shmobile: r8a7778: common clock framework CPG driver
        ARM: shmobile: bockw dts: set extal clock frequency
        ARM: shmobile: bockw dts: Move Ethernet node to BSC
        ARM: shmobile: r8a73a4: Remove legacy code
        ...
      e5ac320d