Loading Documentation/devicetree/bindings/net/marvell-orion-net.txt +1 −0 Original line number Diff line number Diff line Loading @@ -49,6 +49,7 @@ Optional port properties: and - phy-handle: See ethernet.txt file in the same directory. - phy-mode: See ethernet.txt file in the same directory. or Loading Documentation/networking/netdev-FAQ.txt +4 −4 Original line number Diff line number Diff line Loading @@ -29,8 +29,8 @@ A: There are always two trees (git repositories) in play. Both are driven Linus, and net-next is where the new code goes for the future release. You can find the trees here: http://git.kernel.org/?p=linux/kernel/git/davem/net.git http://git.kernel.org/?p=linux/kernel/git/davem/net-next.git https://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git https://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git Q: How often do changes from these trees make it to the mainline Linus tree? Loading Loading @@ -76,7 +76,7 @@ Q: So where are we now in this cycle? A: Load the mainline (Linus) page here: http://git.kernel.org/?p=linux/kernel/git/torvalds/linux.git https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git and note the top of the "tags" section. If it is rc1, it is early in the dev cycle. If it was tagged rc7 a week ago, then a release Loading Loading @@ -123,7 +123,7 @@ A: Normally Greg Kroah-Hartman collects stable commits himself, but It contains the patches which Dave has selected, but not yet handed off to Greg. If Greg already has the patch, then it will be here: http://git.kernel.org/cgit/linux/kernel/git/stable/stable-queue.git https://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git A quick way to find whether the patch is in this stable-queue is to simply clone the repo, and then git grep the mainline commit ID, e.g. Loading Documentation/networking/nf_conntrack-sysctl.txt +0 −18 Original line number Diff line number Diff line Loading @@ -33,24 +33,6 @@ nf_conntrack_events - BOOLEAN If this option is enabled, the connection tracking code will provide userspace with connection tracking events via ctnetlink. nf_conntrack_events_retry_timeout - INTEGER (seconds) default 15 This option is only relevant when "reliable connection tracking events" are used. Normally, ctnetlink is "lossy", that is, events are normally dropped when userspace listeners can't keep up. Userspace can request "reliable event mode". When this mode is active, the conntrack will only be destroyed after the event was delivered. If event delivery fails, the kernel periodically re-tries to send the event to userspace. This is the maximum interval the kernel should use when re-trying to deliver the destroy event. A higher number means there will be fewer delivery retries and it will take longer for a backlog to be processed. nf_conntrack_expect_max - INTEGER Maximum size of expectation table. Default value is nf_conntrack_buckets / 256. Minimum is 1. Loading Documentation/virtual/kvm/locking.txt +11 −1 Original line number Diff line number Diff line Loading @@ -4,7 +4,17 @@ KVM Lock Overview 1. Acquisition Orders --------------------- (to be written) The acquisition orders for mutexes are as follows: - kvm->lock is taken outside vcpu->mutex - kvm->lock is taken outside kvm->slots_lock and kvm->irq_lock - kvm->slots_lock is taken outside kvm->irq_lock, though acquiring them together is quite rare. For spinlocks, kvm_lock is taken outside kvm->mmu_lock. Everything else is a leaf: no other lock is taken inside the critical sections. 2: Exception ------------ Loading MAINTAINERS +39 −19 Original line number Diff line number Diff line Loading @@ -2552,15 +2552,18 @@ S: Supported F: drivers/net/ethernet/broadcom/genet/ BROADCOM BNX2 GIGABIT ETHERNET DRIVER M: Sony Chacko <sony.chacko@qlogic.com> M: Dept-HSGLinuxNICDev@qlogic.com M: Rasesh Mody <rasesh.mody@cavium.com> M: Harish Patil <harish.patil@cavium.com> M: Dept-GELinuxNICDev@cavium.com L: netdev@vger.kernel.org S: Supported F: drivers/net/ethernet/broadcom/bnx2.* F: drivers/net/ethernet/broadcom/bnx2_* BROADCOM BNX2X 10 GIGABIT ETHERNET DRIVER M: Ariel Elior <ariel.elior@qlogic.com> M: Yuval Mintz <Yuval.Mintz@cavium.com> M: Ariel Elior <ariel.elior@cavium.com> M: everest-linux-l2@cavium.com L: netdev@vger.kernel.org S: Supported F: drivers/net/ethernet/broadcom/bnx2x/ Loading Loading @@ -2767,7 +2770,9 @@ S: Supported F: drivers/scsi/bfa/ BROCADE BNA 10 GIGABIT ETHERNET DRIVER M: Rasesh Mody <rasesh.mody@qlogic.com> M: Rasesh Mody <rasesh.mody@cavium.com> M: Sudarsana Kalluru <sudarsana.kalluru@cavium.com> M: Dept-GELinuxNICDev@cavium.com L: netdev@vger.kernel.org S: Supported F: drivers/net/ethernet/brocade/bna/ Loading Loading @@ -7920,6 +7925,10 @@ F: mm/ MEMORY TECHNOLOGY DEVICES (MTD) M: David Woodhouse <dwmw2@infradead.org> M: Brian Norris <computersforpeace@gmail.com> M: Boris Brezillon <boris.brezillon@free-electrons.com> M: Marek Vasut <marek.vasut@gmail.com> M: Richard Weinberger <richard@nod.at> M: Cyrille Pitchen <cyrille.pitchen@atmel.com> L: linux-mtd@lists.infradead.org W: http://www.linux-mtd.infradead.org/ Q: http://patchwork.ozlabs.org/project/linux-mtd/list/ Loading Loading @@ -8517,11 +8526,10 @@ F: Documentation/devicetree/bindings/net/wireless/ F: drivers/net/wireless/ NETXEN (1/10) GbE SUPPORT M: Manish Chopra <manish.chopra@qlogic.com> M: Sony Chacko <sony.chacko@qlogic.com> M: Rajesh Borundia <rajesh.borundia@qlogic.com> M: Manish Chopra <manish.chopra@cavium.com> M: Rahul Verma <rahul.verma@cavium.com> M: Dept-GELinuxNICDev@cavium.com L: netdev@vger.kernel.org W: http://www.qlogic.com S: Supported F: drivers/net/ethernet/qlogic/netxen/ Loading Loading @@ -9897,33 +9905,32 @@ F: Documentation/scsi/LICENSE.qla4xxx F: drivers/scsi/qla4xxx/ QLOGIC QLA3XXX NETWORK DRIVER M: Jitendra Kalsaria <jitendra.kalsaria@qlogic.com> M: Ron Mercer <ron.mercer@qlogic.com> M: linux-driver@qlogic.com M: Dept-GELinuxNICDev@cavium.com L: netdev@vger.kernel.org S: Supported F: Documentation/networking/LICENSE.qla3xxx F: drivers/net/ethernet/qlogic/qla3xxx.* QLOGIC QLCNIC (1/10)Gb ETHERNET DRIVER M: Dept-GELinuxNICDev@qlogic.com M: Harish Patil <harish.patil@cavium.com> M: Manish Chopra <manish.chopra@cavium.com> M: Dept-GELinuxNICDev@cavium.com L: netdev@vger.kernel.org S: Supported F: drivers/net/ethernet/qlogic/qlcnic/ QLOGIC QLGE 10Gb ETHERNET DRIVER M: Harish Patil <harish.patil@qlogic.com> M: Sudarsana Kalluru <sudarsana.kalluru@qlogic.com> M: Dept-GELinuxNICDev@qlogic.com M: linux-driver@qlogic.com M: Harish Patil <harish.patil@cavium.com> M: Manish Chopra <manish.chopra@cavium.com> M: Dept-GELinuxNICDev@cavium.com L: netdev@vger.kernel.org S: Supported F: drivers/net/ethernet/qlogic/qlge/ QLOGIC QL4xxx ETHERNET DRIVER M: Yuval Mintz <Yuval.Mintz@qlogic.com> M: Ariel Elior <Ariel.Elior@qlogic.com> M: everest-linux-l2@qlogic.com M: Yuval Mintz <Yuval.Mintz@cavium.com> M: Ariel Elior <Ariel.Elior@cavium.com> M: everest-linux-l2@cavium.com L: netdev@vger.kernel.org S: Supported F: drivers/net/ethernet/qlogic/qed/ Loading Loading @@ -11401,6 +11408,17 @@ W: http://www.st.com/spear S: Maintained F: drivers/clk/spear/ SPI NOR SUBSYSTEM M: Cyrille Pitchen <cyrille.pitchen@atmel.com> M: Marek Vasut <marek.vasut@gmail.com> L: linux-mtd@lists.infradead.org W: http://www.linux-mtd.infradead.org/ Q: http://patchwork.ozlabs.org/project/linux-mtd/list/ T: git git://github.com/spi-nor/linux.git S: Maintained F: drivers/mtd/spi-nor/ F: include/linux/mtd/spi-nor.h SPI SUBSYSTEM M: Mark Brown <broonie@kernel.org> L: linux-spi@vger.kernel.org Loading Loading @@ -12780,6 +12798,7 @@ F: include/uapi/linux/virtio_console.h VIRTIO CORE, NET AND BLOCK DRIVERS M: "Michael S. Tsirkin" <mst@redhat.com> M: Jason Wang <jasowang@redhat.com> L: virtualization@lists.linux-foundation.org S: Maintained F: Documentation/devicetree/bindings/virtio/ Loading Loading @@ -12810,6 +12829,7 @@ F: include/uapi/linux/virtio_gpu.h VIRTIO HOST (VHOST) M: "Michael S. Tsirkin" <mst@redhat.com> M: Jason Wang <jasowang@redhat.com> L: kvm@vger.kernel.org L: virtualization@lists.linux-foundation.org L: netdev@vger.kernel.org Loading Loading
Documentation/devicetree/bindings/net/marvell-orion-net.txt +1 −0 Original line number Diff line number Diff line Loading @@ -49,6 +49,7 @@ Optional port properties: and - phy-handle: See ethernet.txt file in the same directory. - phy-mode: See ethernet.txt file in the same directory. or Loading
Documentation/networking/netdev-FAQ.txt +4 −4 Original line number Diff line number Diff line Loading @@ -29,8 +29,8 @@ A: There are always two trees (git repositories) in play. Both are driven Linus, and net-next is where the new code goes for the future release. You can find the trees here: http://git.kernel.org/?p=linux/kernel/git/davem/net.git http://git.kernel.org/?p=linux/kernel/git/davem/net-next.git https://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git https://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git Q: How often do changes from these trees make it to the mainline Linus tree? Loading Loading @@ -76,7 +76,7 @@ Q: So where are we now in this cycle? A: Load the mainline (Linus) page here: http://git.kernel.org/?p=linux/kernel/git/torvalds/linux.git https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git and note the top of the "tags" section. If it is rc1, it is early in the dev cycle. If it was tagged rc7 a week ago, then a release Loading Loading @@ -123,7 +123,7 @@ A: Normally Greg Kroah-Hartman collects stable commits himself, but It contains the patches which Dave has selected, but not yet handed off to Greg. If Greg already has the patch, then it will be here: http://git.kernel.org/cgit/linux/kernel/git/stable/stable-queue.git https://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git A quick way to find whether the patch is in this stable-queue is to simply clone the repo, and then git grep the mainline commit ID, e.g. Loading
Documentation/networking/nf_conntrack-sysctl.txt +0 −18 Original line number Diff line number Diff line Loading @@ -33,24 +33,6 @@ nf_conntrack_events - BOOLEAN If this option is enabled, the connection tracking code will provide userspace with connection tracking events via ctnetlink. nf_conntrack_events_retry_timeout - INTEGER (seconds) default 15 This option is only relevant when "reliable connection tracking events" are used. Normally, ctnetlink is "lossy", that is, events are normally dropped when userspace listeners can't keep up. Userspace can request "reliable event mode". When this mode is active, the conntrack will only be destroyed after the event was delivered. If event delivery fails, the kernel periodically re-tries to send the event to userspace. This is the maximum interval the kernel should use when re-trying to deliver the destroy event. A higher number means there will be fewer delivery retries and it will take longer for a backlog to be processed. nf_conntrack_expect_max - INTEGER Maximum size of expectation table. Default value is nf_conntrack_buckets / 256. Minimum is 1. Loading
Documentation/virtual/kvm/locking.txt +11 −1 Original line number Diff line number Diff line Loading @@ -4,7 +4,17 @@ KVM Lock Overview 1. Acquisition Orders --------------------- (to be written) The acquisition orders for mutexes are as follows: - kvm->lock is taken outside vcpu->mutex - kvm->lock is taken outside kvm->slots_lock and kvm->irq_lock - kvm->slots_lock is taken outside kvm->irq_lock, though acquiring them together is quite rare. For spinlocks, kvm_lock is taken outside kvm->mmu_lock. Everything else is a leaf: no other lock is taken inside the critical sections. 2: Exception ------------ Loading
MAINTAINERS +39 −19 Original line number Diff line number Diff line Loading @@ -2552,15 +2552,18 @@ S: Supported F: drivers/net/ethernet/broadcom/genet/ BROADCOM BNX2 GIGABIT ETHERNET DRIVER M: Sony Chacko <sony.chacko@qlogic.com> M: Dept-HSGLinuxNICDev@qlogic.com M: Rasesh Mody <rasesh.mody@cavium.com> M: Harish Patil <harish.patil@cavium.com> M: Dept-GELinuxNICDev@cavium.com L: netdev@vger.kernel.org S: Supported F: drivers/net/ethernet/broadcom/bnx2.* F: drivers/net/ethernet/broadcom/bnx2_* BROADCOM BNX2X 10 GIGABIT ETHERNET DRIVER M: Ariel Elior <ariel.elior@qlogic.com> M: Yuval Mintz <Yuval.Mintz@cavium.com> M: Ariel Elior <ariel.elior@cavium.com> M: everest-linux-l2@cavium.com L: netdev@vger.kernel.org S: Supported F: drivers/net/ethernet/broadcom/bnx2x/ Loading Loading @@ -2767,7 +2770,9 @@ S: Supported F: drivers/scsi/bfa/ BROCADE BNA 10 GIGABIT ETHERNET DRIVER M: Rasesh Mody <rasesh.mody@qlogic.com> M: Rasesh Mody <rasesh.mody@cavium.com> M: Sudarsana Kalluru <sudarsana.kalluru@cavium.com> M: Dept-GELinuxNICDev@cavium.com L: netdev@vger.kernel.org S: Supported F: drivers/net/ethernet/brocade/bna/ Loading Loading @@ -7920,6 +7925,10 @@ F: mm/ MEMORY TECHNOLOGY DEVICES (MTD) M: David Woodhouse <dwmw2@infradead.org> M: Brian Norris <computersforpeace@gmail.com> M: Boris Brezillon <boris.brezillon@free-electrons.com> M: Marek Vasut <marek.vasut@gmail.com> M: Richard Weinberger <richard@nod.at> M: Cyrille Pitchen <cyrille.pitchen@atmel.com> L: linux-mtd@lists.infradead.org W: http://www.linux-mtd.infradead.org/ Q: http://patchwork.ozlabs.org/project/linux-mtd/list/ Loading Loading @@ -8517,11 +8526,10 @@ F: Documentation/devicetree/bindings/net/wireless/ F: drivers/net/wireless/ NETXEN (1/10) GbE SUPPORT M: Manish Chopra <manish.chopra@qlogic.com> M: Sony Chacko <sony.chacko@qlogic.com> M: Rajesh Borundia <rajesh.borundia@qlogic.com> M: Manish Chopra <manish.chopra@cavium.com> M: Rahul Verma <rahul.verma@cavium.com> M: Dept-GELinuxNICDev@cavium.com L: netdev@vger.kernel.org W: http://www.qlogic.com S: Supported F: drivers/net/ethernet/qlogic/netxen/ Loading Loading @@ -9897,33 +9905,32 @@ F: Documentation/scsi/LICENSE.qla4xxx F: drivers/scsi/qla4xxx/ QLOGIC QLA3XXX NETWORK DRIVER M: Jitendra Kalsaria <jitendra.kalsaria@qlogic.com> M: Ron Mercer <ron.mercer@qlogic.com> M: linux-driver@qlogic.com M: Dept-GELinuxNICDev@cavium.com L: netdev@vger.kernel.org S: Supported F: Documentation/networking/LICENSE.qla3xxx F: drivers/net/ethernet/qlogic/qla3xxx.* QLOGIC QLCNIC (1/10)Gb ETHERNET DRIVER M: Dept-GELinuxNICDev@qlogic.com M: Harish Patil <harish.patil@cavium.com> M: Manish Chopra <manish.chopra@cavium.com> M: Dept-GELinuxNICDev@cavium.com L: netdev@vger.kernel.org S: Supported F: drivers/net/ethernet/qlogic/qlcnic/ QLOGIC QLGE 10Gb ETHERNET DRIVER M: Harish Patil <harish.patil@qlogic.com> M: Sudarsana Kalluru <sudarsana.kalluru@qlogic.com> M: Dept-GELinuxNICDev@qlogic.com M: linux-driver@qlogic.com M: Harish Patil <harish.patil@cavium.com> M: Manish Chopra <manish.chopra@cavium.com> M: Dept-GELinuxNICDev@cavium.com L: netdev@vger.kernel.org S: Supported F: drivers/net/ethernet/qlogic/qlge/ QLOGIC QL4xxx ETHERNET DRIVER M: Yuval Mintz <Yuval.Mintz@qlogic.com> M: Ariel Elior <Ariel.Elior@qlogic.com> M: everest-linux-l2@qlogic.com M: Yuval Mintz <Yuval.Mintz@cavium.com> M: Ariel Elior <Ariel.Elior@cavium.com> M: everest-linux-l2@cavium.com L: netdev@vger.kernel.org S: Supported F: drivers/net/ethernet/qlogic/qed/ Loading Loading @@ -11401,6 +11408,17 @@ W: http://www.st.com/spear S: Maintained F: drivers/clk/spear/ SPI NOR SUBSYSTEM M: Cyrille Pitchen <cyrille.pitchen@atmel.com> M: Marek Vasut <marek.vasut@gmail.com> L: linux-mtd@lists.infradead.org W: http://www.linux-mtd.infradead.org/ Q: http://patchwork.ozlabs.org/project/linux-mtd/list/ T: git git://github.com/spi-nor/linux.git S: Maintained F: drivers/mtd/spi-nor/ F: include/linux/mtd/spi-nor.h SPI SUBSYSTEM M: Mark Brown <broonie@kernel.org> L: linux-spi@vger.kernel.org Loading Loading @@ -12780,6 +12798,7 @@ F: include/uapi/linux/virtio_console.h VIRTIO CORE, NET AND BLOCK DRIVERS M: "Michael S. Tsirkin" <mst@redhat.com> M: Jason Wang <jasowang@redhat.com> L: virtualization@lists.linux-foundation.org S: Maintained F: Documentation/devicetree/bindings/virtio/ Loading Loading @@ -12810,6 +12829,7 @@ F: include/uapi/linux/virtio_gpu.h VIRTIO HOST (VHOST) M: "Michael S. Tsirkin" <mst@redhat.com> M: Jason Wang <jasowang@redhat.com> L: kvm@vger.kernel.org L: virtualization@lists.linux-foundation.org L: netdev@vger.kernel.org Loading
