1. 09 8月, 2016 3 次提交
    • E
      kbuild: no gcc-plugins during cc-option tests · d26e9414
      Emese Revfy 提交于
      The gcc-plugins arguments should not be included when performing
      cc-option tests.
      
      Steps to reproduce:
      1) make mrproper
      2) make defconfig
      3) enable GCC_PLUGINS, GCC_PLUGIN_CYC_COMPLEXITY
      4) enable FUNCTION_TRACER (it will select other options as well)
      5) make && make modules
      
      Build errors:
      MODPOST 18 modules
      ERROR: "__fentry__" [net/netfilter/xt_nat.ko] undefined!
      ERROR: "__fentry__" [net/netfilter/xt_mark.ko] undefined!
      ERROR: "__fentry__" [net/netfilter/xt_addrtype.ko] undefined!
      ERROR: "__fentry__" [net/netfilter/xt_LOG.ko] undefined!
      ERROR: "__fentry__" [net/netfilter/nf_nat_sip.ko] undefined!
      ERROR: "__fentry__" [net/netfilter/nf_nat_irc.ko] undefined!
      ERROR: "__fentry__" [net/netfilter/nf_nat_ftp.ko] undefined!
      ERROR: "__fentry__" [net/netfilter/nf_nat.ko] undefined!
      Reported-by: NLaura Abbott <labbott@redhat.com>
      Signed-off-by: NEmese Revfy <re.emese@gmail.com>
      [kees: renamed variable, clarified commit message]
      Signed-off-by: NKees Cook <keescook@chromium.org>
      d26e9414
    • A
      printk: Remove unnecessary #ifdef CONFIG_PRINTK · 574673c2
      Andreas Ziegler 提交于
      In commit 874f9c7d ("printk: create pr_<level> functions"), new
      pr_level defines were added to printk.c.
      
      These new defines are guarded by an #ifdef CONFIG_PRINTK - however,
      there is already a surrounding #ifdef CONFIG_PRINTK starting a lot
      earlier in line 249 which means the newly introduced #ifdef is
      unnecessary.
      
      Let's remove it to avoid confusion.
      Signed-off-by: NAndreas Ziegler <andreas.ziegler@fau.de>
      Cc: Joe Perches <joe@perches.com>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      574673c2
    • V
      x86/hweight: Don't clobber %rdi · 65ea11ec
      Ville Syrjälä 提交于
      The caller expects %rdi to remain intact, push+pop it make that happen.
      
      Fixes the following kind of explosions on my core2duo machine when
      trying to reboot or shut down:
      
        general protection fault: 0000 [#1] PREEMPT SMP
        Modules linked in: i915 i2c_algo_bit drm_kms_helper cfbfillrect syscopyarea cfbimgblt sysfillrect sysimgblt fb_sys_fops cfbcopyarea drm netconsole configfs binfmt_misc iTCO_wdt psmouse pcspkr snd_hda_codec_idt e100 coretemp hwmon snd_hda_codec_generic i2c_i801 mii i2c_smbus lpc_ich mfd_core snd_hda_intel uhci_hcd snd_hda_codec snd_hwdep snd_hda_core ehci_pci 8250 ehci_hcd snd_pcm 8250_base usbcore evdev serial_core usb_common parport_pc parport snd_timer snd soundcore
        CPU: 0 PID: 3070 Comm: reboot Not tainted 4.8.0-rc1-perf-dirty #69
        Hardware name:                  /D946GZIS, BIOS TS94610J.86A.0087.2007.1107.1049 11/07/2007
        task: ffff88012a0b4080 task.stack: ffff880123850000
        RIP: 0010:[<ffffffff81003c92>]  [<ffffffff81003c92>] x86_perf_event_update+0x52/0xc0
        RSP: 0018:ffff880123853b60  EFLAGS: 00010087
        RAX: 0000000000000001 RBX: ffff88012fc0a3c0 RCX: 000000000000001e
        RDX: 0000000000000000 RSI: 0000000040000000 RDI: ffff88012b014800
        RBP: ffff880123853b88 R08: ffffffffffffffff R09: 0000000000000000
        R10: ffffea0004a012c0 R11: ffffea0004acedc0 R12: ffffffff80000001
        R13: ffff88012b0149c0 R14: ffff88012b014800 R15: 0000000000000018
        FS:  00007f8b155cd700(0000) GS:ffff88012fc00000(0000) knlGS:0000000000000000
        CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
        CR2: 00007f8b155f5000 CR3: 000000012a2d7000 CR4: 00000000000006f0
        Stack:
         ffff88012fc0a3c0 ffff88012b014800 0000000000000004 0000000000000001
         ffff88012fc1b750 ffff880123853bb0 ffffffff81003d59 ffff88012b014800
         ffff88012fc0a3c0 ffff88012b014800 ffff880123853bd8 ffffffff81003e13
        Call Trace:
         [<ffffffff81003d59>] x86_pmu_stop+0x59/0xd0
         [<ffffffff81003e13>] x86_pmu_del+0x43/0x140
         [<ffffffff8111705d>] event_sched_out.isra.105+0xbd/0x260
         [<ffffffff8111738d>] __perf_remove_from_context+0x2d/0xb0
         [<ffffffff8111745d>] __perf_event_exit_context+0x4d/0x70
         [<ffffffff810c8826>] generic_exec_single+0xb6/0x140
         [<ffffffff81117410>] ? __perf_remove_from_context+0xb0/0xb0
         [<ffffffff81117410>] ? __perf_remove_from_context+0xb0/0xb0
         [<ffffffff810c898f>] smp_call_function_single+0xdf/0x140
         [<ffffffff81113d27>] perf_event_exit_cpu_context+0x87/0xc0
         [<ffffffff81113d73>] perf_reboot+0x13/0x40
         [<ffffffff8107578a>] notifier_call_chain+0x4a/0x70
         [<ffffffff81075ad7>] __blocking_notifier_call_chain+0x47/0x60
         [<ffffffff81075b06>] blocking_notifier_call_chain+0x16/0x20
         [<ffffffff81076a1d>] kernel_restart_prepare+0x1d/0x40
         [<ffffffff81076ae2>] kernel_restart+0x12/0x60
         [<ffffffff81076d56>] SYSC_reboot+0xf6/0x1b0
         [<ffffffff811a823c>] ? mntput_no_expire+0x2c/0x1b0
         [<ffffffff811a83e4>] ? mntput+0x24/0x40
         [<ffffffff811894fc>] ? __fput+0x16c/0x1e0
         [<ffffffff811895ae>] ? ____fput+0xe/0x10
         [<ffffffff81072fc3>] ? task_work_run+0x83/0xa0
         [<ffffffff81001623>] ? exit_to_usermode_loop+0x53/0xc0
         [<ffffffff8100105a>] ? trace_hardirqs_on_thunk+0x1a/0x1c
         [<ffffffff81076e6e>] SyS_reboot+0xe/0x10
         [<ffffffff814c4ba5>] entry_SYSCALL_64_fastpath+0x18/0xa3
        Code: 7c 4c 8d af c0 01 00 00 49 89 fe eb 10 48 09 c2 4c 89 e0 49 0f b1 55 00 4c 39 e0 74 35 4d 8b a6 c0 01 00 00 41 8b 8e 60 01 00 00 <0f> 33 8b 35 6e 02 8c 00 48 c1 e2 20 85 f6 7e d2 48 89 d3 89 cf
        RIP  [<ffffffff81003c92>] x86_perf_event_update+0x52/0xc0
         RSP <ffff880123853b60>
        ---[ end trace 7ec95181faf211be ]---
        note: reboot[3070] exited with preempt_count 2
      
      Cc: Borislav Petkov <bp@suse.de>
      Cc: H. Peter Anvin <hpa@zytor.com>
      Cc: Andy Lutomirski <luto@amacapital.net>
      Cc: Brian Gerst <brgerst@gmail.com>
      Cc: Denys Vlasenko <dvlasenk@redhat.com>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Thomas Gleixner <tglx@linutronix.de>
      Cc: Ingo Molnar <mingo@kernel.org>
      Fixes: f5967101 ("x86/hweight: Get rid of the special calling convention")
      Signed-off-by: NVille Syrjälä <ville.syrjala@linux.intel.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      65ea11ec
  2. 08 8月, 2016 7 次提交
  3. 07 8月, 2016 4 次提交
    • L
      Merge tag 'doc-4.8-fixes' of git://git.lwn.net/linux · 52ddb7e9
      Linus Torvalds 提交于
      Pull documentation fixes from Jonathan Corbet:
       "Three fixes for the docs build, including removing an annoying warning
        on 'make help' if sphinx isn't present"
      
      * tag 'doc-4.8-fixes' of git://git.lwn.net/linux:
        DocBook: use DOCBOOKS="" to ignore DocBooks instead of IGNORE_DOCBOOKS=1
        Documenation: update cgroup's document path
        Documentation/sphinx: do not warn about missing tools in 'make help'
      52ddb7e9
    • L
      Merge tag 'binfmt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/binfmt_misc · e9d488c3
      Linus Torvalds 提交于
      Pull binfmt_misc update from James Bottomley:
       "This update is to allow architecture emulation containers to function
        such that the emulation binary can be housed outside the container
        itself.  The container and fs parts both have acks from relevant
        experts.
      
        To use the new feature you have to add an F option to your binfmt_misc
        configuration"
      
      From the docs:
       "The usual behaviour of binfmt_misc is to spawn the binary lazily when
        the misc format file is invoked.  However, this doesn't work very well
        in the face of mount namespaces and changeroots, so the F mode opens
        the binary as soon as the emulation is installed and uses the opened
        image to spawn the emulator, meaning it is always available once
        installed, regardless of how the environment changes"
      
      * tag 'binfmt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/binfmt_misc:
        binfmt_misc: add F option description to documentation
        binfmt_misc: add persistent opened binary handler for containers
        fs: add filp_clone_open API
      e9d488c3
    • E
      fs: return EPERM on immutable inode · 337684a1
      Eryu Guan 提交于
      In most cases, EPERM is returned on immutable inode, and there're only a
      few places returning EACCES. I noticed this when running LTP on
      overlayfs, setxattr03 failed due to unexpected EACCES on immutable
      inode.
      
      So converting all EACCES to EPERM on immutable inode.
      Acked-by: NDave Chinner <dchinner@redhat.com>
      Signed-off-by: NEryu Guan <guaneryu@gmail.com>
      Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      337684a1
    • L
      Merge branch 'for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs · fe64f328
      Linus Torvalds 提交于
      Pull more vfs updates from Al Viro:
       "Assorted cleanups and fixes.
      
        In the "trivial API change" department - ->d_compare() losing 'parent'
        argument"
      
      * 'for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
        cachefiles: Fix race between inactivating and culling a cache object
        9p: use clone_fid()
        9p: fix braino introduced in "9p: new helper - v9fs_parent_fid()"
        vfs: make dentry_needs_remove_privs() internal
        vfs: remove file_needs_remove_privs()
        vfs: fix deadlock in file_remove_privs() on overlayfs
        get rid of 'parent' argument of ->d_compare()
        cifs, msdos, vfat, hfs+: don't bother with parent in ->d_compare()
        affs ->d_compare(): don't bother with ->d_inode
        fold _d_rehash() and __d_rehash() together
        fold dentry_rcuwalk_invalidate() into its only remaining caller
      fe64f328
  4. 06 8月, 2016 23 次提交
    • L
      Merge tag 'xfs-rmap-for-linus-4.8-rc1' of... · 0cbbc422
      Linus Torvalds 提交于
      Merge tag 'xfs-rmap-for-linus-4.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/dgc/linux-xfs
      
      Pull more xfs updates from Dave Chinner:
       "This is the second part of the XFS updates for this merge cycle, and
        contains the new reverse block mapping feature for XFS.
      
        Reverse mapping allows us to track the owner of a specific block on
        disk precisely.  It is implemented as a set of btrees (one per
        allocation group) that track the owners of allocated extents.
        Effectively it is a "used space tree" that is updated when we allocate
        or free extents.  i.e. it is coherent with the free space btrees we
        already maintain and never overlaps with them.
      
        This reverse mapping infrastructure is the building block of several
        upcoming features - reflink, copy-on-write data, dedupe, online
        metadata and data scrubbing, highly accurate bad sector/data loss
        reporting to users, and significantly improved reconstruction of
        damaged and corrupted filesystems.  There's a lot of new stuff coming
        along in the next couple of cycles,a nd it all builds in the rmap
        infrastructure.
      
        As such, it's a huge chunk of new code with new on-disk format
        features and internal infrastructure.  It warns at mount time as an
        experimental feature and that it may eat data (as we do with all new
        on-disk features until they stabilise).  We have not released
        userspace suport for it yet - userspace support currently requires
        download from Darrick's xfsprogs repo and build from source, so the
        access to this feature is really developer/tester only at this point.
        Initial userspace support will be released at the same time kernel
        with this code in it is released.
      
        The new rmap enabled code regresses 3 xfstests - all are ENOSPC
        related corner cases, one of which Darrick posted a fix for a few
        hours ago.  The other two are fixed by infrastructure that is part of
        the upcoming reflink patchset.  This new ENOSPC infrastructure
        requires a on-disk format tweak required to keep mount times in
        check - we need to keep an on-disk count of allocated rmapbt blocks so
        we don't have to scan the entire btrees at mount time to count them.
      
        This is currently being tested and will be part of the fixes sent in
        the next week or two so users will not be exposed to this change"
      
      * tag 'xfs-rmap-for-linus-4.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/dgc/linux-xfs: (52 commits)
        xfs: move (and rename) the deferred bmap-free tracepoints
        xfs: collapse single use static functions
        xfs: remove unnecessary parentheses from log redo item recovery functions
        xfs: remove the extents array from the rmap update done log item
        xfs: in btree_lshift, only allocate temporary cursor when needed
        xfs: remove unnecesary lshift/rshift key initialization
        xfs: remove the get*keys and update_keys btree ops pointers
        xfs: enable the rmap btree functionality
        xfs: don't update rmapbt when fixing agfl
        xfs: disable XFS_IOC_SWAPEXT when rmap btree is enabled
        xfs: add rmap btree block detection to log recovery
        xfs: add rmap btree geometry feature flag
        xfs: propagate bmap updates to rmapbt
        xfs: enable the xfs_defer mechanism to process rmaps to update
        xfs: log rmap intent items
        xfs: create rmap update intent log items
        xfs: add rmap btree insert and delete helpers
        xfs: convert unwritten status of reverse mappings
        xfs: remove an extent from the rmap btree
        xfs: add an extent to the rmap btree
        ...
      0cbbc422
    • L
      Merge branch 'work.const-qstr' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs · 835c92d4
      Linus Torvalds 提交于
      Pull qstr constification updates from Al Viro:
       "Fairly self-contained bunch - surprising lot of places passes struct
        qstr * as an argument when const struct qstr * would suffice; it
        complicates analysis for no good reason.
      
        I'd prefer to feed that separately from the assorted fixes (those are
        in #for-linus and with somewhat trickier topology)"
      
      * 'work.const-qstr' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
        qstr: constify instances in adfs
        qstr: constify instances in lustre
        qstr: constify instances in f2fs
        qstr: constify instances in ext2
        qstr: constify instances in vfat
        qstr: constify instances in procfs
        qstr: constify instances in fuse
        qstr constify instances in fs/dcache.c
        qstr: constify instances in nfs
        qstr: constify instances in ocfs2
        qstr: constify instances in autofs4
        qstr: constify instances in hfs
        qstr: constify instances in hfsplus
        qstr: constify instances in logfs
        qstr: constify dentry_init_security
      835c92d4
    • L
      Merge tag 'media/v4.8-6' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media · ce804bf5
      Linus Torvalds 提交于
      Pull mailcap fixlets from Mauro Carvalho Chehab:
       "A small fixup for my and Shuah's entries in .mailcap.
      
        Basically, those entries were with a syntax that makes
        get_maintainer.pl to do the wrong thing"
      
      * tag 'media/v4.8-6' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
        .mailmap: Correct entries for Mauro Carvalho Chehab and Shuah Khan
      ce804bf5
    • L
      Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost · 0803e040
      Linus Torvalds 提交于
      Pull virtio/vhost updates from Michael Tsirkin:
      
       - new vsock device support in host and guest
      
       - platform IOMMU support in host and guest, including compatibility
         quirks for legacy systems.
      
       - misc fixes and cleanups.
      
      * tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
        VSOCK: Use kvfree()
        vhost: split out vringh Kconfig
        vhost: detect 32 bit integer wrap around
        vhost: new device IOTLB API
        vhost: drop vringh dependency
        vhost: convert pre sorted vhost memory array to interval tree
        vhost: introduce vhost memory accessors
        VSOCK: Add Makefile and Kconfig
        VSOCK: Introduce vhost_vsock.ko
        VSOCK: Introduce virtio_transport.ko
        VSOCK: Introduce virtio_vsock_common.ko
        VSOCK: defer sock removal to transports
        VSOCK: transport-specific vsock_transport functions
        vhost: drop vringh dependency
        vop: pull in vhost Kconfig
        virtio: new feature to detect IOMMU device quirk
        balloon: check the number of available pages in leak balloon
        vhost: lockless enqueuing
        vhost: simplify work flushing
      0803e040
    • L
      Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm · 80fac0f5
      Linus Torvalds 提交于
      Pull more KVM updates from Paolo Bonzini:
       - ARM bugfix and MSI injection support
       - x86 nested virt tweak and OOPS fix
       - Simplify pvclock code (vdso bits acked by Andy Lutomirski).
      
      * tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
        nvmx: mark ept single context invalidation as supported
        nvmx: remove comment about missing nested vpid support
        KVM: lapic: fix access preemption timer stuff even if kernel_irqchip=off
        KVM: documentation: fix KVM_CAP_X2APIC_API information
        x86: vdso: use __pvclock_read_cycles
        pvclock: introduce seqcount-like API
        arm64: KVM: Set cpsr before spsr on fault injection
        KVM: arm: vgic-irqfd: Workaround changing kvm_set_routing_entry prototype
        KVM: arm/arm64: Enable MSI routing
        KVM: arm/arm64: Enable irqchip routing
        KVM: Move kvm_setup_default/empty_irq_routing declaration in arch specific header
        KVM: irqchip: Convey devid to kvm_set_msi
        KVM: Add devid in kvm_kernel_irq_routing_entry
        KVM: api: Pass the devid in the msi routing entry
      80fac0f5
    • L
      Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus · 4305f424
      Linus Torvalds 提交于
      Pull MIPS updates from Ralf Baechle:
       "This is the main pull request for MIPS for 4.8.  Also includes is a
        minor SSB cleanup as SSB code traditionally is merged through the MIPS
        tree:
      
        ATH25:
          - MIPS: Add default configuration for ath25
      
        Boot:
          - For zboot, copy appended dtb to the end of the kernel
          - store the appended dtb address in a variable
      
        BPF:
          - Fix off by one error in offset allocation
      
        Cobalt code:
          - Fix typos
      
        Core code:
          - debugfs_create_file returns NULL on error, so don't use IS_ERR for
            testing for errors.
          - Fix double locking issue in RM7000 S-cache code.  This would only
            affect RM7000 ARC systems on reboot.
          - Fix page table corruption on THP permission changes.
          - Use compat_sys_keyctl for 32 bit userspace on 64 bit kernels.
            David says, there are no compatibility issues raised by this fix.
          - Move some signal code around.
          - Rewrite r4k count/compare clockevent device registration such that
            min_delta_ticks/max_delta_ticks files are guaranteed to be
            initialized.
          - Only register r4k count/compare as clockevent device if we can
            assume the clock to be constant.
          - Fix MSA asm warnings in control reg accessors
          - uasm and tlbex fixes and tweaking.
          - Print segment physical address when EU=1.
          - Define AT_VECTOR_SIZE_ARCH for ARCH_DLINFO.
          - CP: Allow booting by VP other than VP 0
          - Cache handling fixes and optimizations for r4k class caches
          - Add hotplug support for R6 processors
          - Cleanup hotplug bits in kconfig
          - traps: return correct si code for accessing nonmapped addresses
          - Remove cpu_has_safe_index_cacheops
      
        Lantiq:
          - Register IRQ handler for virtual IRQ number
          - Fix EIU interrupt loading code
          - Use the real EXIN count
          - Fix build error.
      
        Loongson 3:
          - Increase HPET_MIN_PROG_DELTA and decrease HPET_MIN_CYCLES
      
        Octeon:
          - Delete built-in DTB pruning code for D-Link DSR-1000N.
          - Clean up GPIO definitions in dlink_dsr-1000n.dts.
          - Add more LEDs to the DSR-100n DTS
          - Fix off by one in octeon_irq_gpio_map()
          - Typo fixes
          - Enable SATA by default in cavium_octeon_defconfig
          - Support readq/writeq()
          - Remove forced mappings of USB interrupts.
          - Ensure DMA descriptors are always in the low 4GB
          - Improve USB reset code for OCTEON II.
      
        Pistachio:
          - Add maintainers entry for pistachio SoC Support
          - Remove plat_setup_iocoherency
      
        Ralink:
          - Fix pwm UART in spis group pinmux.
      
        SSB:
          - Change bare unsigned to unsigned int to suit coding style
      
        Tools:
          - Fix reloc tool compiler warnings.
      
        Other:
          - Delete use of ARCH_WANT_OPTIONAL_GPIOLIB"
      
      * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (61 commits)
        MIPS: mm: Fix definition of R6 cache instruction
        MIPS: tools: Fix relocs tool compiler warnings
        MIPS: Cobalt: Fix typo
        MIPS: Octeon: Fix typo
        MIPS: Lantiq: Fix build failure
        MIPS: Use CPHYSADDR to implement mips32 __pa
        MIPS: Octeon: Dlink_dsr-1000n.dts: add more leds.
        MIPS: Octeon: Clean up GPIO definitions in dlink_dsr-1000n.dts.
        MIPS: Octeon: Delete built-in DTB pruning code for D-Link DSR-1000N.
        MIPS: store the appended dtb address in a variable
        MIPS: ZBOOT: copy appended dtb to the end of the kernel
        MIPS: ralink: fix spis group pinmux
        MIPS: Factor o32 specific code into signal_o32.c
        MIPS: non-exec stack & heap when non-exec PT_GNU_STACK is present
        MIPS: Use per-mm page to execute branch delay slot instructions
        MIPS: Modify error handling
        MIPS: c-r4k: Use SMP calls for CM indexed cache ops
        MIPS: c-r4k: Avoid small flush_icache_range SMP calls
        MIPS: c-r4k: Local flush_icache_range cache op override
        MIPS: c-r4k: Split r4k_flush_kernel_vmap_range()
        ...
      4305f424
    • L
      Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · db826278
      Linus Torvalds 提交于
      Pull perf updates from Ingo Molnar:
       "Mostly tooling fixes and some late tooling updates, plus two perf
        related printk message fixes"
      
      * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        perf tests bpf: Use SyS_epoll_wait alias
        perf tests: objdump output can contain multi byte chunks
        perf record: Add --sample-cpu option
        perf hists: Introduce output_resort_cb method
        perf tools: Move config/Makefile into Makefile.config
        perf tests: Add test for bitmap_scnprintf function
        tools lib: Add bitmap_and function
        tools lib: Add bitmap_scnprintf function
        tools lib: Add bitmap_alloc function
        tools lib traceevent: Ignore generated library files
        perf tools: Fix build failure on perl script context
        perf/core: Change log level for duration warning to KERN_INFO
        perf annotate: Plug filename string leak
        perf annotate: Introduce strerror for handling symbol__disassemble() errors
        perf annotate: Rename symbol__annotate() to symbol__disassemble()
        perf/x86: Modify error message in virtualized environment
        perf target: str_error_r() always returns the buffer it receives
        perf annotate: Use pipe + fork instead of popen
        perf evsel: Introduce constructor for cycles event
      db826278
    • L
      Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · c98f5827
      Linus Torvalds 提交于
      Pull x86 fixes from Ingo Molnar:
       "Two fixes and a cleanup-fix, to the syscall entry code and to ptrace"
      
      * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/syscalls/64: Add compat_sys_keyctl for 32-bit userspace
        x86/ptrace: Stop setting TS_COMPAT in ptrace code
        x86/vdso: Error out if the vDSO isn't a valid DSO
      c98f5827
    • L
      Merge tag 'sh-for-4.8' of git://git.libc.org/linux-sh · 1630e843
      Linus Torvalds 提交于
      Pull arch/sh updates from Rich Felker:
       "These changes improve device tree support (including builtin DTB), add
        support for the J-Core J2 processor, an open source synthesizable
        reimplementation of the SH-2 ISA, resolve a longstanding sigcontext
        ABI mismatch issue, and fix various bugs including nommu-specific
        issues and minor regressions introduced in 4.6.
      
        The J-Core arch support is included here but to be usable it needs
        drivers that are waiting on approval/inclusion from their subsystem
        maintainers"
      
      * tag 'sh-for-4.8' of git://git.libc.org/linux-sh: (23 commits)
        sh: add device tree source for J2 FPGA on Mimas v2 board
        sh: add defconfig for J-Core J2
        sh: use common clock framework with device tree boards
        sh: system call wire up
        sh: Delete unnecessary checks before the function call "mempool_destroy"
        sh: do not perform IPI-based cache flush except on boards that need it
        sh: add SMP support for J2
        sh: SMP support for SH2 entry.S
        sh: add working futex atomic ops on userspace addresses for smp
        sh: add J2 atomics using the cas.l instruction
        sh: add AT_HWCAP flag for J-Core cas.l instruction
        sh: add support for J-Core J2 processor
        sh: fix build regression with CONFIG_OF && !CONFIG_OF_FLATTREE
        sh: allow clocksource drivers to register sched_clock backends
        sh: make heartbeat driver explicitly non-modular
        sh: make board-secureedge5410 explicitly non-modular
        sh: make mm/asids-debugfs explicitly non-modular
        sh: make time.c explicitly non-modular
        sh: fix futex/robust_list on nommu models
        sh: disable aliased page logic on NOMMU models
        ...
      1630e843
    • L
      Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux · 194d6ad3
      Linus Torvalds 提交于
      Pull arm64 fixes from Will Deacon:
      
       - fix HugeTLB leak due to CoW and PTE_RDONLY mismatch
      
       - avoid accessing unmapped FDT fields when checking validity
      
       - correctly account for vDSO AUX entry in ARCH_DLINFO
      
       - fix kallsyms with absolute expressions in linker script
      
       - kill unnecessary symbol-based relocs in vmlinux
      
      * tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
        arm64: Fix copy-on-write referencing in HugeTLB
        arm64: mm: avoid fdt_check_header() before the FDT is fully mapped
        arm64: Define AT_VECTOR_SIZE_ARCH for ARCH_DLINFO
        arm64: relocatable: suppress R_AARCH64_ABS64 relocations in vmlinux
        arm64: vmlinux.lds: make __rela_offset and __dynsym_offset ABSOLUTE
      194d6ad3
    • L
      Merge tag 'pwm/for-4.8-rc1' of... · a157b3aa
      Linus Torvalds 提交于
      Merge tag 'pwm/for-4.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm
      
      Pull pwm updates from Thierry Reding:
       "This set of changes improve some aspects of the atomic API as well as
        make use of this new API in the regulator framework to allow properly
        dealing with critical regulators controlled by a PWM.
      
        Aside from that there's a bunch of updates and cleanups for existing
        drivers, as well as the addition of new drivers for the Broadcom
        iProc, STMPE and ChromeOS EC controllers"
      
      * tag 'pwm/for-4.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm: (44 commits)
        regulator: pwm: Document pwm-dutycycle-unit and pwm-dutycycle-range
        regulator: pwm: Support extra continuous mode cases
        pwm: Add ChromeOS EC PWM driver
        dt-bindings: pwm: Add binding for ChromeOS EC PWM
        mfd: cros_ec: Add EC_PWM function definitions
        mfd: cros_ec: Add cros_ec_cmd_xfer_status() helper
        pwm: atmel: Use of_device_get_match_data()
        pwm: atmel: Fix checkpatch warnings
        pwm: atmel: Fix disabling of PWM channels
        dt-bindings: pwm: Add R-Car H3 device tree bindings
        pwm: rcar: Use ARCH_RENESAS
        pwm: tegra: Add support for Tegra186
        dt-bindings: pwm: tegra: Add compatible string for Tegra186
        pwm: tegra: Avoid overflow when calculating duty cycle
        pwm: tegra: Allow 100 % duty cycle
        pwm: tegra: Add support for reset control
        pwm: tegra: Rename mmio_base to regs
        pwm: tegra: Remove useless padding
        pwm: tegra: Drop NUM_PWM macro
        pwm: lpc32xx: Set PWM_PIN_LEVEL bit to default value
        ...
      a157b3aa
    • L
      Merge tag 'ntb-4.8' of git://github.com/jonmason/ntb · 32199ec3
      Linus Torvalds 提交于
      Pull NTB updates from Jon Mason:
       "NTB bug fixes for the ntb_tool and ntb_perf, and improvements to the
        ntb_perf and ntb_pingpong for increased debugability.
      
        Also, modification to the ntb_transport layer to increase/decrease
        the number of transport entries depending on the ring size"
      
      * tag 'ntb-4.8' of git://github.com/jonmason/ntb:
        NTB: ntb_hw_intel: use local variable pdev
        NTB: ntb_hw_intel: show BAR size in debugfs info
        ntb_test: Add a selftest script for the NTB subsystem
        ntb_perf: clear link_is_up flag when the link goes down.
        ntb_pingpong: Add a debugfs file to get the ping count
        ntb_tool: Add link status and files to debugfs
        ntb_tool: Postpone memory window initialization for the user
        ntb_perf: Wait for link before running test
        ntb_perf: Return results by reading the run file
        ntb_perf: Improve thread handling to increase robustness
        ntb_perf: Schedule based on time not on performance
        ntb_transport: Check the number of spads the hardware supports
        ntb_tool: Add memory window debug support
        ntb_perf: Allow limiting the size of the memory windows
        NTB: allocate number transport entries depending on size of ring size
        ntb_tool: BUG: Ensure the buffer size is large enough to return all spads
        ntb_tool: Fix infinite loop bug when writing spad/peer_spad file
      32199ec3
    • L
      Merge tag 'pstore-v4.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux · a02040d8
      Linus Torvalds 提交于
      Pull pstore fixes from Kees Cook:
       "Fixes for pstore ramoops driver to catch bad kfree() and to use better
        DT bindings"
      
      * tag 'pstore-v4.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
        ramoops: use persistent_ram_free() instead of kfree() for freeing prz
        ramoops: use DT reserved-memory bindings
      a02040d8
    • L
      Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi · 0603006b
      Linus Torvalds 提交于
      Pull SCSI fixes from James Bottomley:
       "This is seven basic fixes (plus one MAINTAINER update) which came in
        close to the merge window"
      
      * tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
        ipr: Fix error return code in ipr_probe_ioa()
        fcoe: add missing destroy_workqueue() on error in fcoe_init()
        lpfc: Fix possible NULL pointer dereference
        fcoe: Use default VLAN for FIP VLAN discovery
        ipr: Wait to do async scan until scsi host is initialized
        MAINTAINERS: Update cxlflash maintainers
        cxlflash: Verify problem state area is mapped before notifying shutdown
        lpfc: fix oops in lpfc_sli4_scmd_to_wqidx_distr() from lpfc_send_taskmgmt()
      0603006b
    • L
      Merge tag 'dm-4.8-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm · d268675c
      Linus Torvalds 提交于
      Pull device mapper fixes from Mike Snitzer:
      
       - a stable dm-flakey fix to error read IO during the 'down_interval'
      
       - a DM core suspend fix to establish the SUSPENDED flag before dropping
         the SUSPENDING flag
      
       - a blk-mq request-based DM (dm-mq) dm_stop_queue() fix to properly
         stop the blk-mq hw_queues (and cancel pending requeue work); also
         set/clear QUEUE_FLAG_STOPPED when stopping/starting the dm-mq
         request_queue.
      
       - a DM multipath fix to harden locking of in-core state flags in the
         face of concurrent access while handling path failures under heavy
         IO.
      
       - a few small DM raid fixes to edge cases caught with further testing.
      
      * tag 'dm-4.8-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm:
        dm raid: fix use of wrong status char during resynchronization
        dm raid: constructor fails on non-zero incompat_features
        dm raid: fix processing of max_recovery_rate constructor flag
        dm: set DMF_SUSPENDED* _before_ clearing DMF_NOFLUSH_SUSPENDING
        dm rq: fix the starting and stopping of blk-mq queues
        dm mpath: add locking to multipath_resume and must_push_back
        dm flakey: error READ bios during the down_interval
      d268675c
    • L
      Merge branch 'for-linus' of git://git.kernel.dk/linux-block · fff648da
      Linus Torvalds 提交于
      Pull block fixes from Jens Axboe:
       "Here's the second round of block updates for this merge window.
      
        It's a mix of fixes for changes that went in previously in this round,
        and fixes in general.  This pull request contains:
      
         - Fixes for loop from Christoph
      
         - A bdi vs gendisk lifetime fix from Dan, worth two cookies.
      
         - A blk-mq timeout fix, when on frozen queues.  From Gabriel.
      
         - Writeback fix from Jan, ensuring that __writeback_single_inode()
           does the right thing.
      
         - Fix for bio->bi_rw usage in f2fs from me.
      
         - Error path deadlock fix in blk-mq sysfs registration from me.
      
         - Floppy O_ACCMODE fix from Jiri.
      
         - Fix to the new bio op methods from Mike.
      
           One more followup will be coming here, ensuring that we don't
           propagate the block types outside of block.  That, and a rename of
           bio->bi_rw is coming right after -rc1 is cut.
      
         - Various little fixes"
      
      * 'for-linus' of git://git.kernel.dk/linux-block:
        mm/block: convert rw_page users to bio op use
        loop: make do_req_filebacked more robust
        loop: don't try to use AIO for discards
        blk-mq: fix deadlock in blk_mq_register_disk() error path
        Include: blkdev: Removed duplicate 'struct request;' declaration.
        Fixup direct bi_rw modifiers
        block: fix bdi vs gendisk lifetime mismatch
        blk-mq: Allow timeouts to run while queue is freezing
        nbd: fix race in ioctl
        block: fix use-after-free in seq file
        f2fs: drop bio->bi_rw manual assignment
        block: add missing group association in bio-cloning functions
        blkcg: kill unused field nr_undestroyed_grps
        writeback: Write dirty times for WB_SYNC_ALL writeback
        floppy: fix open(O_ACCMODE) for ioctl-only open
      fff648da
    • L
      Merge tag 'pnp-extra-4.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 62e6e9ba
      Linus Torvalds 提交于
      Pull PNP fix from Rafael Wysocki:
       "This fixes build errors due to a missing header file inclusion in
        drivers/pnp/pnpbios/core.c (Randy Dunlap)"
      
      * tag 'pnp-extra-4.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        PNP: pnpbios: add header file to fix build errors
      62e6e9ba
    • L
      Merge tag 'acpi-extra-4.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 0524b422
      Linus Torvalds 提交于
      Pull more ACPI updates from Rafael Wysocki:
       "Two more fixes in ACPI drivers, one in the ACPI EC driver
        (stable-candidate) and one in the ACPI button driver.
      
        Specifics:
      
         - An ACPI EC driver fix from the 4.3 cycle may cause the ACPICA's
           method reentrancy limit to be exceeded for a _Qxx method due to a
           large number of concurrent EC operations, so prevent that from
           happening by moving the EC handling into a separate workqueue with
           a limit on the number of concurrently executed work items (Lv
           Zheng)
      
         - Fix the cleanup code in the ACPI button driver that forgets to
           clear two variables on exit which causes an error to occur on the
           next attmpt to load the driver (Benjamin Tissoires)"
      
      * tag 'acpi-extra-4.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        ACPI / EC: Work around method reentrancy limit in ACPICA for _Qxx
        ACPI / button: remove pointer to old lid_sysfs on unbind
      0524b422
    • L
      Merge tag 'pm-extra-4.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 11d8ec40
      Linus Torvalds 提交于
      Pull more power management updates from Rafael Wysocki:
       "A few more fixes and cleanups in the x86-64 low-level hibernation
        code, PM core, cpufreq (Kconfig and intel_pstate), and the operating
        points framework.
      
        Specifics:
      
         - Prevent the low-level assembly hibernate code on x86-64 from
           referring to __PAGE_OFFSET directly as a symbol which doesn't work
           when the kernel identity mapping base is randomized, in which case
           __PAGE_OFFSET is a variable (Rafael Wysocki).
      
         - Avoid selecting CPU_FREQ_STAT by default as the statistics are not
           required for proper cpufreq operation (Borislav Petkov).
      
         - Add Skylake-X and Broadwell-X IDs to the intel_pstate's list of
           processors where out-of-band (OBB) control of P-states is possible
           and if that is in use, intel_pstate should not attempt to manage
           P-states (Srinivas Pandruvada).
      
         - Drop some unnecessary checks from the wakeup IRQ handling code in
           the PM core (Markus Elfring).
      
         - Reduce the number operating performance point (OPP) lookups in one
           of the OPP framework's helper functions (Jisheng Zhang)"
      
      * tag 'pm-extra-4.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        x86/power/64: Do not refer to __PAGE_OFFSET from assembly code
        cpufreq: Do not default-yes CPU_FREQ_STAT
        cpufreq: intel_pstate: Add more out-of-band IDs
        PM / OPP: optimize dev_pm_opp_set_rate() performance a bit
        PM-wakeup: Delete unnecessary checks before three function calls
      11d8ec40
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · 39fada55
      Linus Torvalds 提交于
      Pull more input updates from Dmitry Torokhov:
       "Two new drivers for touchscreen controllers:
      
         - Silead touchscreen controllers
         - SiS 9200 family touchscreen controllers
      
        and a few driver fixes"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
        Input: silead - remove some dead code
        Input: sis-i2c - select CONFIG_CRC_ITU_T
        Input: add driver for SiS 9200 family I2C touchscreen controllers
        Input: ili210x - fix permissions on "calibrate" attribute
        Input: elan_i2c - properly wake up touchpad on ASUS laptops
        Input: add driver for Silead touchscreens
        Input: elantech - fix debug dump of the current packet
        Input: rotary_encoder - support binary encoding of states
        Input: xpad - power off wireless 360 controllers on suspend
        Input: i8042 - break load dependency between atkbd/psmouse and i8042
        Input: synaptics-rmi4 - do not check for NULL when calling of_node_put()
        Input: cros_ec_keyb - cleanup use of dev
      39fada55
    • L
      Merge tag 'usb-4.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb · f72035fa
      Linus Torvalds 提交于
      Pull more USB updates from Greg KH:
       "Here are a few more straggler patches for USB for 4.8-rc1.
      
        Most of these are for the usb-serial driver tree.  All of those have
        been in linux-next for a long time, but missed my previous pull
        request to you.
      
        The remaining change is to fix up a staging tree build error, due to
        some USB gadget driver changes that went in.  I put it in this tree as
        it was for a USB driver and people are reporting the build error on
        your tree.
      
        All of these have been in linux-next for this week, and longer for the
        usb-serial changes"
      
      * tag 'usb-4.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
        staging: emxx_udc: allow modular build
        USB: serial: use variable for status
        USB: serial: option: add support for Telit LE910 PID 0x1206
        USB: serial: cp210x: use kmemdup
        USB: serial: ti_usb_3410_5052: use functions rather than macros
        USB: serial: ti_usb_3410_5052: remove ti_usb_3410_5052.h
        USB: serial: ti_usb_3410_5052: use __packed
        USB: serial: ti_usb_3410_5052: remove useless comments
      f72035fa
    • H
      ramoops: use persistent_ram_free() instead of kfree() for freeing prz · e976e564
      Hiraku Toyooka 提交于
      persistent_ram_zone(=prz) structures are allocated by persistent_ram_new(),
      which includes vmap() or ioremap(). But they are currently freed by
      kfree(). This uses persistent_ram_free() for correct this asymmetry usage.
      Signed-off-by: NHiraku Toyooka <hiraku.toyooka.gu@hitachi.com>
      Signed-off-by: NNobuhiro Iwamatsu <nobuhiro.iwamatsu.kw@hitachi.com>
      Cc: Mark Salyzyn <salyzyn@android.com>
      Cc: Seiji Aguchi <seiji.aguchi.tr@hitachi.com>
      Signed-off-by: NKees Cook <keescook@chromium.org>
      e976e564
    • K
      ramoops: use DT reserved-memory bindings · 529182e2
      Kees Cook 提交于
      Instead of a ramoops-specific node, use a child node of /reserved-memory.
      This requires that of_platform_device_create() be explicitly called
      for the node, though, since "/reserved-memory" does not have its own
      "compatible" property.
      Suggested-by: NRob Herring <robh@kernel.org>
      Signed-off-by: NKees Cook <keescook@chromium.org>
      Acked-by: NRob Herring <robh@kernel.org>
      529182e2
  5. 05 8月, 2016 3 次提交
    • A
      NTB: ntb_hw_intel: use local variable pdev · 95f1464f
      Allen Hubbe 提交于
      Clean up duplicated expression by replacing it with the equivalent local
      variable pdev.
      Signed-off-by: NAllen Hubbe <Allen.Hubbe@emc.com>
      Acked-by: NDave Jiang <dave.jiang@intel.com>
      Signed-off-by: NJon Mason <jdmason@kudzu.us>
      95f1464f
    • A
      NTB: ntb_hw_intel: show BAR size in debugfs info · 40895273
      Allen Hubbe 提交于
      It will be useful to know the hardware configured BAR size to diagnose
      issues with NTB memory windows.
      Signed-off-by: NAllen Hubbe <Allen.Hubbe@emc.com>
      Acked-by: NDave Jiang <dave.jiang@intel.com>
      Signed-off-by: NJon Mason <jdmason@kudzu.us>
      40895273
    • L
      ntb_test: Add a selftest script for the NTB subsystem · a9c59ef7
      Logan Gunthorpe 提交于
      This script automates testing doorbells, scratchpads and memory windows
      for an NTB device. It can be run locally, with the NTB looped
      back to the same host or use SSH to remotely control the second host.
      
      In the single host case, the script just needs to be passed two
      arguments: a PCI ID for each side of the link. In the two host case
      the -r option must be used to specify the remote hostname (which must
      be SSH accessible and should probably have ssh-keys exchanged).
      
      A sample run looks like this:
      
      $ sudo ./ntb_test.sh 0000:03:00.1 0000:83:00.1 -p 29
      Starting ntb_tool tests...
      Running link tests on: 0000:03:00.1 / 0000:83:00.1
        Passed
      Running link tests on: 0000:83:00.1 / 0000:03:00.1
        Passed
      Running db tests on: 0000:03:00.1 / 0000:83:00.1
        Passed
      Running db tests on: 0000:83:00.1 / 0000:03:00.1
        Passed
      Running spad tests on: 0000:03:00.1 / 0000:83:00.1
        Passed
      Running spad tests on: 0000:83:00.1 / 0000:03:00.1
        Passed
      Running mw0 tests on: 0000:03:00.1 / 0000:83:00.1
        Passed
      Running mw0 tests on: 0000:83:00.1 / 0000:03:00.1
        Passed
      Running mw1 tests on: 0000:03:00.1 / 0000:83:00.1
        Passed
      Running mw1 tests on: 0000:83:00.1 / 0000:03:00.1
        Passed
      
      Starting ntb_pingpong tests...
      Running ping pong tests on: 0000:03:00.1 / 0000:83:00.1
        Passed
      
      Starting ntb_perf tests...
      Running local perf test without DMA
        0: copied 536870912 bytes in 164453 usecs, 3264 MBytes/s
        Passed
      Running remote perf test without DMA
        0: copied 536870912 bytes in 164453 usecs, 3264 MBytes/s
        Passed
      Signed-off-by: NLogan Gunthorpe <logang@deltatee.com>
      Acked-by: NShuah Khan <shuahkh@osg.samsung.com>
      Acked-by: NAllen Hubbe <Allen.Hubbe@emc.com>
      Signed-off-by: NJon Mason <jdmason@kudzu.us>
      a9c59ef7