1. 25 5月, 2018 7 次提交
  2. 23 5月, 2018 13 次提交
  3. 22 5月, 2018 11 次提交
  4. 21 5月, 2018 9 次提交
    • L
      Merge tag 'mips_fixes_4.17_2' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/mips · 6741c4bb
      Linus Torvalds 提交于
      Pull MIPS fixes from James Hogan:
      
       - fix build with DEBUG_ZBOOT and MACH_JZ4770 (4.16)
      
       - include xilfpga FDT in fitImage and stop generating dtb.o (4.15)
      
       - fix software IO coherence on CM SMP systems (4.8)
      
       - ptrace: Fix PEEKUSR/POKEUSR to o32 FGRs (3.14)
      
       - ptrace: Expose FIR register through FP regset (3.13)
      
       - fix typo in KVM debugfs file name (3.10)
      
      * tag 'mips_fixes_4.17_2' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/mips:
        MIPS: Fix ptrace(2) PTRACE_PEEKUSR and PTRACE_POKEUSR accesses to o32 FGRs
        MIPS: xilfpga: Actually include FDT in fitImage
        MIPS: xilfpga: Stop generating useless dtb.o
        KVM: Fix spelling mistake: "cop_unsuable" -> "cop_unusable"
        MIPS: ptrace: Expose FIR register through FP regset
        MIPS: Fix build with DEBUG_ZBOOT and MACH_JZ4770
        MIPS: c-r4k: Fix data corruption related to cache coherence
      6741c4bb
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 5aef268a
      Linus Torvalds 提交于
      Pull networking fixes from David Miller:
      
       1) Fix refcounting bug for connections in on-packet scheduling mode of
          IPVS, from Julian Anastasov.
      
       2) Set network header properly in AF_PACKET's packet_snd, from Willem
          de Bruijn.
      
       3) Fix regressions in 3c59x by converting to generic DMA API. It was
          relying upon the hack that the PCI DMA interfaces would accept NULL
          for EISA devices. From Christoph Hellwig.
      
       4) Remove RDMA devices before unregistering netdev in QEDE driver, from
          Michal Kalderon.
      
       5) Use after free in TUN driver ptr_ring usage, from Jason Wang.
      
       6) Properly check for missing netlink attributes in SMC_PNETID
          requests, from Eric Biggers.
      
       7) Set DMA mask before performaing any DMA operations in vmxnet3
          driver, from Regis Duchesne.
      
       8) Fix mlx5 build with SMP=n, from Saeed Mahameed.
      
       9) Classifier fixes in bcm_sf2 driver from Florian Fainelli.
      
      10) Tuntap use after free during release, from Jason Wang.
      
      11) Don't use stack memory in scatterlists in tls code, from Matt
          Mullins.
      
      12) Not fully initialized flow key object in ipv4 routing code, from
          David Ahern.
      
      13) Various packet headroom bug fixes in ip6_gre driver, from Petr
          Machata.
      
      14) Remove queues from XPS maps using correct index, from Amritha
          Nambiar.
      
      15) Fix use after free in sock_diag, from Eric Dumazet.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (64 commits)
        net: ip6_gre: fix tunnel metadata device sharing.
        cxgb4: fix offset in collecting TX rate limit info
        net: sched: red: avoid hashing NULL child
        sock_diag: fix use-after-free read in __sk_free
        sh_eth: Change platform check to CONFIG_ARCH_RENESAS
        net: dsa: Do not register devlink for unused ports
        net: Fix a bug in removing queues from XPS map
        bpf: fix truncated jump targets on heavy expansions
        bpf: parse and verdict prog attach may race with bpf map update
        bpf: sockmap update rollback on error can incorrectly dec prog refcnt
        net: test tailroom before appending to linear skb
        net: ip6_gre: Fix ip6erspan hlen calculation
        net: ip6_gre: Split up ip6gre_changelink()
        net: ip6_gre: Split up ip6gre_newlink()
        net: ip6_gre: Split up ip6gre_tnl_change()
        net: ip6_gre: Split up ip6gre_tnl_link_config()
        net: ip6_gre: Fix headroom request in ip6erspan_tunnel_xmit()
        net: ip6_gre: Request headroom in __gre6_xmit()
        selftests/bpf: check return value of fopen in test_verifier.c
        erspan: fix invalid erspan version.
        ...
      5aef268a
    • D
      mv88e6xxx: Fix uninitialized variable warning. · 7ddae24f
      David S. Miller 提交于
      In mv88e6xxx_probe(), ("np" or "pdata") might be an invariant
      but GCC can't see that, therefore:
      
      drivers/net/dsa/mv88e6xxx/chip.c: In function ‘mv88e6xxx_probe’:
      drivers/net/dsa/mv88e6xxx/chip.c:4420:13: warning: ‘compat_info’ may be used uninitialized in this function [-Wmaybe-uninitialized]
        chip->info = compat_info;
      
      Actually, it should have warned on the "if (!compat_info)" test, but
      whatever.
      
      Explicitly initialize to NULL in the variable declaration to
      deal with this.
      
      Fixes: 877b7cb0 ("net: dsa: mv88e6xxx: Add minimal platform_data support")
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      7ddae24f
    • F
      net: dsa: b53: Extend platform data to include DSA ports · bf3c592b
      Florian Fainelli 提交于
      The b53 driver already defines and internally uses platform data to let the
      glue drivers specify parameters such as the chip id.  What we were missing was
      a way to tell the core DSA layer about the ports and their type.
      
      Place a dsa_chip_data structure at the beginning of b53_platform_data for
      dsa_register_switch() to access it. This does not require modifications to
      b53_common.c which will pass platform_data trough.
      Signed-off-by: NFlorian Fainelli <f.fainelli@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      bf3c592b
    • D
      Merge branch 'mv88exxx-pdata' · bf4bd7a7
      David S. Miller 提交于
      Andrew Lunn says:
      
      ====================
      Platform data support for mv88exxx
      
      There are a few Intel based platforms making use of the mv88exxx.
      These don't easily have access to device tree in order to instantiate
      the switch driver. These patches allow the use of platform data to
      hold the configuration.
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      bf4bd7a7
    • A
      net: dsa: mv88e6xxx: Add support for EEPROM via platform data · 00baabe5
      Andrew Lunn 提交于
      Add the size of the EEPROM to the platform data, so it can also be
      instantiated by a platform device.
      Signed-off-by: NAndrew Lunn <andrew@lunn.ch>
      Reviewed-by: NFlorian Fainelli <f.fainelli@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      00baabe5
    • A
      net: dsa: mv88e6xxx: Add minimal platform_data support · 877b7cb0
      Andrew Lunn 提交于
      Not all the world uses device tree. Some parts of the world still use
      platform devices and platform data. Add basic support for probing a
      Marvell switch via platform data.
      Signed-off-by: NAndrew Lunn <andrew@lunn.ch>
      Reviewed-by: NFlorian Fainelli <f.fainelli@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      877b7cb0
    • A
      net: dsa: mv88e6xxx: Remove OF check for IRQ domain · 577941eb
      Andrew Lunn 提交于
      An IRQ domain will work without an OF node. It is not possible to
      reference interrupts via a phandle, but C code can still use
      irq_find_mapping() to get an interrupt from the domain.
      Signed-off-by: NAndrew Lunn <andrew@lunn.ch>
      Reviewed-by: NFlorian Fainelli <f.fainelli@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      577941eb
    • D
      Merge branch 'sh_eth-typos' · 81ee33d8
      David S. Miller 提交于
      Sergei Shtylyov says:
      
      ====================
      sh_eth: fix typos/grammar
      
      Here's a set of 3 patches against DaveM's 'net-next.git' repo plus the R8A77980
      support patches posted earlier. They fix the comments typos/grammar and another
      typo in the EESR bit...
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      81ee33d8