1. 08 4月, 2017 13 次提交
  2. 07 4月, 2017 5 次提交
    • R
      Merge branch 'acpi-scan-fixes' · dc752d54
      Rafael J. Wysocki 提交于
      * acpi-scan-fixes:
        ACPI / scan: Prefer devices without _HID for _ADR matching
      dc752d54
    • W
      Revert "Revert "arm64: hugetlb: partial revert of 66b3923a"" · 6ae979ab
      Will Deacon 提交于
      The use of the contiguous bit by our hugetlb implementation violates
      the break-before-make requirements of the architecture and can lead to
      silent data corruption or TLB conflict aborts. Once again, disable these
      hugetlb sizes whilst it gets worked out.
      
      This reverts commit ab2e1b89.
      
      Conflicts:
      	arch/arm64/mm/hugetlbpage.c
      Signed-off-by: NWill Deacon <will.deacon@arm.com>
      6ae979ab
    • L
      Merge tag 'xfs-4.11-fixes-3' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux · 269c930e
      Linus Torvalds 提交于
      Pull XFS fixes from Darrick Wong:
       "Here are three more fixes for 4.11.
      
        The first one reworks the inline directory verifier to check the
        working copy of the directory metadata and to avoid triggering a
        periodic crash in xfs/348. The second patch fixes a regression in hole
        punching at EOF that corrupts files; and the third patch closes a
        kernel memory disclosure bug.
      
        Summary:
      
         - rework the inline directory verifier to avoid crashes on disk
           corruption
      
         - don't change file size when punching holes w/ KEEP_SIZE
      
         - close a kernel memory exposure bug"
      
      * tag 'xfs-4.11-fixes-3' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux:
        xfs: fix kernel memory exposure problems
        xfs: Honor FALLOC_FL_KEEP_SIZE when punching ends of files
        xfs: rework the inline directory verifiers
      269c930e
    • L
      Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus · 977674c0
      Linus Torvalds 提交于
      Pull MIPS fixes from Ralf Baechle:
       "Lantiq:
          - Fix adding xbar resoures causing a panic
      
        Loongson3:
          - Some Loongson 3A don't identify themselves as having an FTLB so
            hardwire that knowledge into CPU probing.
          - Handle Loongson 3 TLB peculiarities in the fast path of the RDHWR
            emulation.
          - Fix invalid FTLB entries with huge page on VTLB+FTLB platforms
          - Add missing calculation of S-cache and V-cache cache-way size
      
        Ralink:
          - Fix typos in rt3883 pinctrl data
      
        Generic:
          - Force o32 fp64 support on 32bit MIPS64r6 kernels
          - Yet another build fix after the linux/sched.h changes
          - Wire up statx system call
          - Fix stack unwinding after introduction of IRQ stack
          - Fix spinlock code to build even for microMIPS with recent binutils
      
        SMP-CPS:
          - Fix retrieval of VPE mask on big endian CPUs"
      
      * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
        MIPS: IRQ Stack: Unwind IRQ stack onto task stack
        MIPS: c-r4k: Fix Loongson-3's vcache/scache waysize calculation
        MIPS: Flush wrong invalid FTLB entry for huge page
        MIPS: Check TLB before handle_ri_rdhwr() for Loongson-3
        MIPS: Add MIPS_CPU_FTLB for Loongson-3A R2
        MIPS: Lantiq: fix missing xbar kernel panic
        MIPS: smp-cps: Fix retrieval of VPE mask on big endian CPUs
        MIPS: Wire up statx system call
        MIPS: Include asm/ptrace.h now linux/sched.h doesn't
        MIPS: ralink: Fix typos in rt3883 pinctrl
        MIPS: End spinlocks with .insn
        MIPS: Force o32 fp64 support on 32bit MIPS64r6 kernels
      977674c0
    • L
      Merge tag 'trace-v4.11-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace · 4691f4a6
      Linus Torvalds 提交于
      Pull tracing fix from Steven Rostedt:
       "Wei Yongjun fixed a long standing bug in the ring buffer startup test.
      
        If for some unknown reason, the kthread that is created fails to be
        created, the return from kthread_create() is an PTR_ERR and not a
        NULL. The test incorrectly checks for NULL instead of an error"
      
      * tag 'trace-v4.11-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
        ring-buffer: Fix return value check in test_ringbuffer()
      4691f4a6
  3. 06 4月, 2017 5 次提交
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · ea6b1720
      Linus Torvalds 提交于
      Pull networking fixes from David Miller:
      
       1) Reject invalid updates to netfilter expectation policies, from Pablo
          Neira Ayuso.
      
       2) Fix memory leak in nfnl_cthelper, from Jeffy Chen.
      
       3) Don't do stupid things if we get a neigh_probe() on a neigh entry
          whose ops lack a solicit method. From Eric Dumazet.
      
       4) Don't transmit packets in r8152 driver when the carrier is off, from
          Hayes Wang.
      
       5) Fix ipv6 packet type detection in aquantia driver, from Pavel
          Belous.
      
       6) Don't write uninitialized data into hw registers in bna driver, from
          Arnd Bergmann.
      
       7) Fix locking in ping_unhash(), from Eric Dumazet.
      
       8) Make BPF verifier range checks able to understand certain sequences
          emitted by LLVM, from Alexei Starovoitov.
      
       9) Fix use after free in ipconfig, from Mark Rutland.
      
      10) Fix refcount leak on force commit in openvswitch, from Jarno
          Rajahalme.
      
      11) Fix various overflow checks in AF_PACKET, from Andrey Konovalov.
      
      12) Fix endianness bug in be2net driver, from Suresh Reddy.
      
      13) Don't forget to wake TX queues when processing a timeout, from
          Grygorii Strashko.
      
      14) ARP header on-stack storage is wrong in flow dissector, from Simon
          Horman.
      
      15) Lost retransmit and reordering SNMP stats in TCP can be
          underreported. From Yuchung Cheng.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (82 commits)
        nfp: fix potential use after free on xdp prog
        tcp: fix reordering SNMP under-counting
        tcp: fix lost retransmit SNMP under-counting
        sctp: get sock from transport in sctp_transport_update_pmtu
        net: ethernet: ti: cpsw: fix race condition during open()
        l2tp: fix PPP pseudo-wire auto-loading
        bnx2x: fix spelling mistake in macros HW_INTERRUT_ASSERT_SET_*
        l2tp: take reference on sessions being dumped
        tcp: minimize false-positives on TCP/GRO check
        sctp: check for dst and pathmtu update in sctp_packet_config
        flow dissector: correct size of storage for ARP
        net: ethernet: ti: cpsw: wake tx queues on ndo_tx_timeout
        l2tp: take a reference on sessions used in genetlink handlers
        l2tp: hold session while sending creation notifications
        l2tp: fix duplicate session creation
        l2tp: ensure session can't get removed during pppol2tp_session_ioctl()
        l2tp: fix race in l2tp_recv_common()
        sctp: use right in and out stream cnt
        bpf: add various verifier test cases for self-tests
        bpf, verifier: fix rejection of unaligned access checks for map_value_adj
        ...
      ea6b1720
    • J
      nfp: fix potential use after free on xdp prog · c383bdd1
      Jakub Kicinski 提交于
      We should unregister the net_device first, before we give back
      our reference on xdp_prog.  Otherwise xdp_prog may be freed
      before .ndo_stop() disabled the datapath.  Found by code inspection.
      
      Fixes: ecd63a02 ("nfp: add XDP support in the driver")
      Signed-off-by: NJakub Kicinski <jakub.kicinski@netronome.com>
      Reviewed-by: NSimon Horman <simon.horman@netronome.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      c383bdd1
    • Y
      tcp: fix reordering SNMP under-counting · 2d2517ee
      Yuchung Cheng 提交于
      Currently the reordering SNMP counters only increase if a connection
      sees a higher degree then it has previously seen. It ignores if the
      reordering degree is not greater than the default system threshold.
      This significantly under-counts the number of reordering events
      and falsely convey that reordering is rare on the network.
      
      This patch properly and faithfully records the number of reordering
      events detected by the TCP stack, just like the comment says "this
      exciting event is worth to be remembered". Note that even so TCP
      still under-estimate the actual reordering events because TCP
      requires TS options or certain packet sequences to detect reordering
      (i.e. ACKing never-retransmitted sequence in recovery or disordered
       state).
      Signed-off-by: NYuchung Cheng <ycheng@google.com>
      Signed-off-by: NEric Dumazet <edumazet@google.com>
      Signed-off-by: NNeal Cardwell <ncardwell@google.com>
      Signed-off-by: NSoheil Hassas Yeganeh <soheil@google.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      2d2517ee
    • Y
      tcp: fix lost retransmit SNMP under-counting · ecde8f36
      Yuchung Cheng 提交于
      The lost retransmit SNMP stat is under-counting retransmission
      that uses segment offloading. This patch fixes that so all
      retransmission related SNMP counters are consistent.
      
      Fixes: 10d3be56 ("tcp-tso: do not split TSO packets at retransmit time")
      Signed-off-by: NYuchung Cheng <ycheng@google.com>
      Signed-off-by: NEric Dumazet <edumazet@google.com>
      Signed-off-by: NNeal Cardwell <ncardwell@google.com>
      Signed-off-by: NSoheil Hassas Yeganeh <soheil@google.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      ecde8f36
    • L
      Merge tag 'mfd-fixes-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd · aeb4a576
      Linus Torvalds 提交于
      Pull MFD bug fix from Lee Jones:
       "Increase buffer size om cros-ec to allow for SPI messages"
      
      * tag 'mfd-fixes-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd:
        mfd: cros-ec: Fix host command buffer size
      aeb4a576
  4. 05 4月, 2017 17 次提交