1. 08 1月, 2018 1 次提交
  2. 07 1月, 2018 5 次提交
  3. 06 1月, 2018 13 次提交
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · 65c64d18
      Linus Torvalds 提交于
      Pull input fixes from Dmitry Torokhov:
       "Just a few driver fixups, nothing exciting"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
        Input: xen-kbdfront - do not advertise multi-touch pressure support
        Input: hideep - fix compile error due to missing include file
        Input: elants_i2c - do not clobber interrupt trigger on x86
        Input: joystick/analog - riscv has get_cycles()
        Input: elantech - add new icbody type 15
        Input: ims-pcu - fix typo in the error message
      65c64d18
    • L
      Merge tag 'iommu-v4.15-rc7' of git://github.com/awilliam/linux-vfio · 313243aa
      Linus Torvalds 提交于
      Pull IOMMU fixes from Alex Williamson:
       "Fixes via Will Deacon for arm-smmu-v3.
      
         - Fix duplicate Stream ID handling in arm-smmu-v3
      
         - Fix arm-smmu-v3 page table ops double free"
      
      * tag 'iommu-v4.15-rc7' of git://github.com/awilliam/linux-vfio:
        iommu/arm-smmu-v3: Cope with duplicated Stream IDs
        iommu/arm-smmu-v3: Don't free page table ops twice
      313243aa
    • L
      Merge tag 'arc-4.15-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc · f84d595a
      Linus Torvalds 提交于
      Pull ARC fixes from Vineet Gupta:
      
       - platform updates for setting up clock correctly
      
       - fixes to accomodate newer gcc (__builtin_trap, removed inline asm
         modifier)
      
       - other fixes
      
      * tag 'arc-4.15-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc:
        ARC: handle gcc generated __builtin_trap for older compiler
        ARC: handle gcc generated __builtin_trap()
        ARC: uaccess: dont use "l" gcc inline asm constraint modifier
        ARC: [plat-axs103] refactor the quad core DT quirk code
        ARC: [plat-axs103]: Set initial core pll output frequency
        ARC: [plat-hsdk]: Get rid of core pll frequency set in platform code
        ARC: [plat-hsdk]: Set initial core pll output frequency
        ARC: [plat-hsdk] Switch DisplayLink driver from fbdev to DRM
        arc: do not use __print_symbol()
        ARC: Fix detection of dual-issue enabled
      f84d595a
    • L
      Merge tag 'for-4.15-rc7-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux · 89876f27
      Linus Torvalds 提交于
      Pull btrfs fixes from David Sterba:
       "We have two more fixes for 4.15, both aimed for stable.
      
        The leak fix is obvious, the second patch fixes a bug revealed by the
        refcount API, when it behaves differently than previous atomic_t and
        reports refs going from 0 to 1 in one case"
      
      * tag 'for-4.15-rc7-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux:
        btrfs: fix refcount_t usage when deleting btrfs_delayed_nodes
        btrfs: Fix flush bio leak
      89876f27
    • L
      Merge tag 'xfs-4.15-fixes-10' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux · 12e971b6
      Linus Torvalds 提交于
      Pull XFS fixes from Darrick Wong:
       "I have just a few fixes for bugs and resource cleanup problems this
        week:
      
         - Fix resource cleanup of failed quota initialization
      
         - Fix integer overflow problems wrt s_maxbytes"
      
      * tag 'xfs-4.15-fixes-10' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux:
        xfs: fix s_maxbytes overflow problems
        xfs: quota: check result of register_shrinker()
        xfs: quota: fix missed destroy of qi_tree_lock
      12e971b6
    • L
      Merge tag 'mfd-fixes-4.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd · f842839c
      Linus Torvalds 提交于
      Pull MFD fix from Lee Jones:
       "Late bugfix to plug a leak in rtsx_pcr"
      
      * tag 'mfd-fixes-4.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd:
        mfd: rtsx: Release IRQ during shutdown
      f842839c
    • L
      Merge branch 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · abb7099d
      Linus Torvalds 提交于
      Pull  more x86 pti fixes from Thomas Gleixner:
       "Another small stash of fixes for fallout from the PTI work:
      
         - Fix the modules vs. KASAN breakage which was caused by making
           MODULES_END depend of the fixmap size. That was done when the cpu
           entry area moved into the fixmap, but now that we have a separate
           map space for that this is causing more issues than it solves.
      
         - Use the proper cache flush methods for the debugstore buffers as
           they are mapped/unmapped during runtime and not statically mapped
           at boot time like the rest of the cpu entry area.
      
         - Make the map layout of the cpu_entry_area consistent for 4 and 5
           level paging and fix the KASLR vaddr_end wreckage.
      
         - Use PER_CPU_EXPORT for per cpu variable and while at it unbreak
           nvidia gfx drivers by dropping the GPL export. The subject line of
           the commit tells it the other way around, but I noticed that too
           late.
      
         - Fix the ASM alternative macros so they can be used in the middle of
           an inline asm block.
      
         - Rename the BUG_CPU_INSECURE flag to BUG_CPU_MELTDOWN so the attack
           vector is properly identified. The Spectre mitigations will come
           with their own bug bits later"
      
      * 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/pti: Rename BUG_CPU_INSECURE to BUG_CPU_MELTDOWN
        x86/alternatives: Add missing '\n' at end of ALTERNATIVE inline asm
        x86/tlb: Drop the _GPL from the cpu_tlbstate export
        x86/events/intel/ds: Use the proper cache flush method for mapping ds buffers
        x86/kaslr: Fix the vaddr_end mess
        x86/mm: Map cpu_entry_area at the same place on 4/5 level
        x86/mm: Set MODULES_END to 0xffffffffff000000
      abb7099d
    • L
      Merge branch 'efi-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · b03acc4c
      Linus Torvalds 提交于
      Pull EFI updates from Thomas Gleixner:
      
       - A fix for a add_efi_memmap parameter regression which ensures that
         the parameter is parsed before it is used.
      
       - Reinstate the virtual capsule mapping as the cached copy turned out
         to break Quark and other things
      
       - Remove Matt Fleming as EFI co-maintainer. He stepped back a few days
         ago. Thanks Matt for all your great work!
      
      * 'efi-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        MAINTAINERS: Remove Matt Fleming as EFI co-maintainer
        efi/capsule-loader: Reinstate virtual capsule mapping
        x86/efi: Fix kernel param add_efi_memmap regression
      b03acc4c
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux · 3eac6903
      Linus Torvalds 提交于
      Pull s390 fixes from Martin Schwidefsky:
       "Four bug fixes"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
        s390/dasd: fix wrongly assigned configuration data
        s390: fix preemption race in disable_sacf_uaccess
        s390/sclp: disable FORTIFY_SOURCE for early sclp code
        s390/pci: handle insufficient resources during dma tlb flush
      3eac6903
    • L
      Merge tag 'for-linus-4.15-rc7-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip · 925cbd7e
      Linus Torvalds 提交于
      Pull xen fix from Juergen Gross:
       "One minor fix adjusting the kmalloc flags in the new pvcalls driver
        added in rc1"
      
      * tag 'for-linus-4.15-rc7-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
        xen/pvcalls: use GFP_ATOMIC under spin lock
      925cbd7e
    • L
      Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 · 64648a5f
      Linus Torvalds 提交于
      Pull crypto fixes from Herbert Xu:
       "This fixes the following issues:
      
         - racy use of ctx->rcvused in af_alg
      
         - algif_aead crash in chacha20poly1305
      
         - freeing bogus pointer in pcrypt
      
         - build error on MIPS in mpi
      
         - memory leak in inside-secure
      
         - memory overwrite in inside-secure
      
         - NULL pointer dereference in inside-secure
      
         - state corruption in inside-secure
      
         - build error without CRYPTO_GF128MUL in chelsio
      
         - use after free in n2"
      
      * 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
        crypto: inside-secure - do not use areq->result for partial results
        crypto: inside-secure - fix request allocations in invalidation path
        crypto: inside-secure - free requests even if their handling failed
        crypto: inside-secure - per request invalidation
        lib/mpi: Fix umul_ppmm() for MIPS64r6
        crypto: pcrypt - fix freeing pcrypt instances
        crypto: n2 - cure use after free
        crypto: af_alg - Fix race around ctx->rcvused by making it atomic_t
        crypto: chacha20poly1305 - validate the digest size
        crypto: chelsio - select CRYPTO_GF128MUL
      64648a5f
    • L
      Merge branch 'akpm' (patches from Andrew) · d8887f1c
      Linus Torvalds 提交于
      Merge misc fixes from Andrew Morton:
       "9 fixes"
      
      * emailed patches from Andrew Morton <akpm@linux-foundation.org>:
        mailmap: update Mark Yao's email address
        userfaultfd: clear the vma->vm_userfaultfd_ctx if UFFD_EVENT_FORK fails
        mm/sparse.c: wrong allocation for mem_section
        mm/zsmalloc.c: include fs.h
        mm/debug.c: provide useful debugging information for VM_BUG
        kernel/exit.c: export abort() to modules
        mm/mprotect: add a cond_resched() inside change_pmd_range()
        kernel/acct.c: fix the acct->needcheck check in check_free_space()
        mm: check pfn_valid first in zero_resv_unavail
      d8887f1c
    • A
      fix "netfilter: xt_bpf: Fix XT_BPF_MODE_FD_PINNED mode of 'xt_bpf_info_v1'" · 040ee692
      Al Viro 提交于
      Descriptor table is a shared object; it's not a place where you can
      stick temporary references to files, especially when we don't need
      an opened file at all.
      
      Cc: stable@vger.kernel.org # v4.14
      Fixes: 98589a09 ("netfilter: xt_bpf: Fix XT_BPF_MODE_FD_PINNED mode of 'xt_bpf_info_v1'")
      Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
      040ee692
  4. 05 1月, 2018 21 次提交