1. 22 5月, 2017 9 次提交
  2. 19 5月, 2017 6 次提交
    • L
      Merge tag 'md/4.12-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/shli/md · 8b4822de
      Linus Torvalds 提交于
      Pull MD fixes from Shaohua Li:
      
       - Several bug fixes for raid5-cache from Song Liu, mainly handle
         journal disk error
      
       - Fix bad block handling in choosing raid1 disk from Tomasz Majchrzak
      
       - Simplify external metadata array sysfs handling from Artur
         Paszkiewicz
      
       - Optimize raid0 discard handling from me, now raid0 will dispatch
         large discard IO directly to underlayer disks.
      
      * tag 'md/4.12-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/shli/md:
        raid1: prefer disk without bad blocks
        md/r5cache: handle sync with data in write back cache
        md/r5cache: gracefully handle journal device errors for writeback mode
        md/raid1/10: avoid unnecessary locking
        md/raid5-cache: in r5l_do_submit_io(), submit io->split_bio first
        md/md0: optimize raid0 discard handling
        md: don't return -EAGAIN in md_allow_write for external metadata arrays
        md/raid5: make use of spin_lock_irq over local_irq_disable + spin_lock
      8b4822de
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 667f867c
      Linus Torvalds 提交于
      Pull networking fixes from David Miller:
      
       1) Don't allow negative TCP reordering values, from Soheil Hassas
          Yeganeh.
      
       2) Don't overflow while parsing ipv6 header options, from Craig Gallek.
      
       3) Handle more cleanly the case where an individual route entry during
          a dump will not fit into the allocated netlink SKB, from David
          Ahern.
      
       4) Add missing CONFIG_INET dependency for mlx5e, from Arnd Bergmann.
      
       5) Allow neighbour updates to converge more quickly via gratuitous
          ARPs, from Ihar Hrachyshka.
      
       6) Fix compile error from CONFIG_INET is disabled, from Eric Dumazet.
      
       7) Fix use after free in x25 protocol init, from Lin Zhang.
      
       8) Valid VLAN pvid ranges passed into br_validate(), from Tobias
          Jungel.
      
       9) NULL out address lists in child sockets in SCTP, this is similar to
          the fix we made for inet connection sockets last week. From Eric
          Dumazet.
      
      10) Fix NULL deref in mlxsw driver, from Ido Schimmel.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (27 commits)
        mlxsw: spectrum: Avoid possible NULL pointer dereference
        sh_eth: Do not print an error message for probe deferral
        sh_eth: Use platform device for printing before register_netdev()
        mlxsw: spectrum_router: Fix rif counter freeing routine
        mlxsw: spectrum_dpipe: Fix incorrect entry index
        cxgb4: update latest firmware version supported
        qmi_wwan: add another Lenovo EM74xx device ID
        sctp: do not inherit ipv6_{mc|ac|fl}_list from parent
        udp: make *udp*_queue_rcv_skb() functions static
        bridge: netlink: check vlan_default_pvid range
        net: ethernet: faraday: To support device tree usage.
        net: x25: fix one potential use-after-free issue
        bpf: adjust verifier heuristics
        ipv6: Check ip6_find_1stfragopt() return value properly.
        selftests/bpf: fix broken build due to types.h
        bnxt_en: Check status of firmware DCBX agent before setting DCB_CAP_DCBX_HOST.
        bnxt_en: Call bnxt_dcb_init() after getting firmware DCBX configuration.
        net: fix compile error in skb_orphan_partial()
        ipv6: Prevent overrun when parsing v6 header options
        neighbour: update neigh timestamps iff update is effective
        ...
      667f867c
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc · a58a260f
      Linus Torvalds 提交于
      Pull sparc fixes from David Miller:
       "Three sparc bug fixes"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
        sparc/ftrace: Fix ftrace graph time measurement
        sparc: Fix -Wstringop-overflow warning
        sparc64: Fix mapping of 64k pages with MAP_FIXED
      a58a260f
    • L
      Merge tag 'kbuild-fixes-v4.12' of... · 5396a018
      Linus Torvalds 提交于
      Merge tag 'kbuild-fixes-v4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild
      
      Pull Kbuild fix from Masahiro Yamada:
       "Fix headers_install to not delete pre-existing headers in the install
        destination"
      
      * tag 'kbuild-fixes-v4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
        kbuild: skip install/check of headers right under uapi directories
      5396a018
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace · 16d95c43
      Linus Torvalds 提交于
      Pull pid namespace fixes from Eric Biederman:
       "These are two bugs that turn out to have simple fixes that were
        reported during the merge window. Both of these issues have existed
        for a while and it just happens that they both were reported at almost
        the same time"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace:
        pid_ns: Fix race between setns'ed fork() and zap_pid_ns_processes()
        pid_ns: Sleep in TASK_INTERRUPTIBLE in zap_pid_ns_processes
      16d95c43
    • L
      Merge tag 'hwmon-for-linus-v4.12-rc2' of... · af5d2856
      Linus Torvalds 提交于
      Merge tag 'hwmon-for-linus-v4.12-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
      
      Pull hwmon fix from Guenter Roeck:
       "Fix problem with hotplug state machine in coretemp driver"
      
      * tag 'hwmon-for-linus-v4.12-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
        hwmon: (coretemp) Handle frozen hotplug state correctly
      af5d2856
  3. 18 5月, 2017 25 次提交