Merge tag 'v5.12-rc3' into kvm-arm64/host-stage2 (a1baa01f) · Commits · git / linux-net

Documentation/devicetree/bindings/interrupt-controller/ingenic,intc.yaml

+1 −0

Original line number	Diff line number	Diff line
		@@ -23,6 +23,7 @@ properties:
		- enum:
		- ingenic,jz4775-intc
		- ingenic,jz4770-intc
		- ingenic,jz4760b-intc
		- const: ingenic,jz4760-intc
		- items:
		- const: ingenic,x1000-intc

Documentation/gpu/todo.rst

+21 −0

Original line number	Diff line number	Diff line
		@@ -613,6 +613,27 @@ Some of these date from the very introduction of KMS in 2008 ...

		Level: Intermediate

		Remove automatic page mapping from dma-buf importing
		----------------------------------------------------

		When importing dma-bufs, the dma-buf and PRIME frameworks automatically map
		imported pages into the importer's DMA area. drm_gem_prime_fd_to_handle() and
		drm_gem_prime_handle_to_fd() require that importers call dma_buf_attach()
		even if they never do actual device DMA, but only CPU access through
		dma_buf_vmap(). This is a problem for USB devices, which do not support DMA
		operations.

		To fix the issue, automatic page mappings should be removed from the
		buffer-sharing code. Fixing this is a bit more involved, since the import/export
		cache is also tied to &drm_gem_object.import_attach. Meanwhile we paper over
		this problem for USB devices by fishing out the USB host controller device, as
		long as that supports DMA. Otherwise importing can still needlessly fail.

		Contact: Thomas Zimmermann <tzimmermann@suse.de>, Daniel Vetter

		Level: Advanced


		Better Testing
		==============

Documentation/networking/bonding.rst

+1 −1

Original line number	Diff line number	Diff line
		@@ -1988,7 +1988,7 @@ netif_carrier.
		If use_carrier is 0, then the MII monitor will first query the
		device's (via ioctl) MII registers and check the link state. If that
		request fails (not just that it returns carrier down), then the MII
		monitor will make an ethtool ETHOOL_GLINK request to attempt to obtain
		monitor will make an ethtool ETHTOOL_GLINK request to attempt to obtain
		the same information. If both methods fail (i.e., the driver either
		does not support or had some error in processing both the MII register
		and ethtool requests), then the MII monitor will assume the link is

Documentation/networking/netdev-FAQ.rst

+6 −66

Original line number	Diff line number	Diff line
		@@ -142,73 +142,13 @@ Please send incremental versions on top of what has been merged in order to fix
		the patches the way they would look like if your latest patch series was to be
		merged.

		How can I tell what patches are queued up for backporting to the various stable releases?
		-----------------------------------------------------------------------------------------
		Normally Greg Kroah-Hartman collects stable commits himself, but for
		networking, Dave collects up patches he deems critical for the
		networking subsystem, and then hands them off to Greg.

		There is a patchworks queue that you can see here:

		https://patchwork.kernel.org/bundle/netdev/stable/?state=*

		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:

		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.
		::

		stable-queue$ git grep -l 284041ef21fdf2e
		releases/3.0.84/ipv6-fix-possible-crashes-in-ip6_cork_release.patch
		releases/3.4.51/ipv6-fix-possible-crashes-in-ip6_cork_release.patch
		releases/3.9.8/ipv6-fix-possible-crashes-in-ip6_cork_release.patch
		stable/stable-queue$

		I see a network patch and I think it should be backported to stable. Should I request it via stable@vger.kernel.org like the references in the kernel's Documentation/process/stable-kernel-rules.rst file say?
		---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
		No, not for networking. Check the stable queues as per above first
		to see if it is already queued. If not, then send a mail to netdev,
		listing the upstream commit ID and why you think it should be a stable
		candidate.

		Before you jump to go do the above, do note that the normal stable rules
		in :ref:`Documentation/process/stable-kernel-rules.rst <stable_kernel_rules>`
		still apply. So you need to explicitly indicate why it is a critical
		fix and exactly what users are impacted. In addition, you need to
		convince yourself that you really think it has been overlooked,
		vs. having been considered and rejected.

		Generally speaking, the longer it has had a chance to "soak" in
		mainline, the better the odds that it is an OK candidate for stable. So
		scrambling to request a commit be added the day after it appears should
		be avoided.

		I have created a network patch and I think it should be backported to stable. Should I add a Cc: stable@vger.kernel.org like the references in the kernel's Documentation/ directory say?
		-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
		No. See above answer. In short, if you think it really belongs in
		stable, then ensure you write a decent commit log that describes who
		gets impacted by the bug fix and how it manifests itself, and when the
		bug was introduced. If you do that properly, then the commit will get
		handled appropriately and most likely get put in the patchworks stable
		queue if it really warrants it.

		If you think there is some valid information relating to it being in
		stable that does not belong in the commit log, then use the three dash
		marker line as described in
		:ref:`Documentation/process/submitting-patches.rst <the_canonical_patch_format>`
		to temporarily embed that information into the patch that you send.

		Are all networking bug fixes backported to all stable releases?
		Are there special rules regarding stable submissions on netdev?
		---------------------------------------------------------------
		Due to capacity, Dave could only take care of the backports for the
		last two stable releases. For earlier stable releases, each stable
		branch maintainer is supposed to take care of them. If you find any
		patch is missing from an earlier stable branch, please notify
		stable@vger.kernel.org with either a commit ID or a formal patch
		backported, and CC Dave and other relevant networking developers.
		While it used to be the case that netdev submissions were not supposed
		to carry explicit ``CC: stable@vger.kernel.org`` tags that is no longer
		the case today. Please follow the standard stable rules in
		:ref:`Documentation/process/stable-kernel-rules.rst <stable_kernel_rules>`,
		and make sure you include appropriate Fixes tags!

		Is the comment style convention different for the networking content?
		---------------------------------------------------------------------

Documentation/process/stable-kernel-rules.rst

+0 −6

Original line number	Diff line number	Diff line
		@@ -35,12 +35,6 @@ Rules on what kind of patches are accepted, and which ones are not, into the
		Procedure for submitting patches to the -stable tree
		----------------------------------------------------

		- If the patch covers files in net/ or drivers/net please follow netdev stable
		submission guidelines as described in
		:ref:`Documentation/networking/netdev-FAQ.rst <netdev-FAQ>`
		after first checking the stable networking queue at
		https://patchwork.kernel.org/bundle/netdev/stable/?state=*
		to ensure the requested patch is not already queued up.
		- Security patches should not be handled (solely) by the -stable review
		process but should follow the procedures in
		:ref:`Documentation/admin-guide/security-bugs.rst <securitybugs>`.