Commit c30abd5e authored by David S. Miller's avatar David S. Miller
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 



Three sets of overlapping changes, two in the packet scheduler
and one in the meson-gxl PHY driver.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 28dc4c8f f3b5ad89

Documentation/arm64/silicon-errata.txt

+1 −0
Original line number Diff line number Diff line
@@ -75,3 +75,4 @@ stable kernels. 
| Qualcomm Tech. | Falkor v1       | E1003           | QCOM_FALKOR_ERRATUM_1003    |

| Qualcomm Tech. | Falkor v1       | E1009           | QCOM_FALKOR_ERRATUM_1009    |

| Qualcomm Tech. | QDF2400 ITS     | E0065           | QCOM_QDF2400_ERRATUM_0065   |

| Qualcomm Tech. | Falkor v{1,2}   | E1041           | QCOM_FALKOR_ERRATUM_1041    |

Documentation/cgroup-v2.txt

+7 −0
Original line number Diff line number Diff line
@@ -898,6 +898,13 @@ controller implements weight and absolute bandwidth limit models for 
normal scheduling policy and absolute bandwidth allocation model for

realtime scheduling policy.



WARNING: cgroup2 doesn't yet support control of realtime processes and

the cpu controller can only be enabled when all RT processes are in

the root cgroup.  Be aware that system management software may already

have placed RT processes into nonroot cgroups during the system boot

process, and these processes may need to be moved to the root cgroup

before the cpu controller can be enabled.





CPU Interface Files

~~~~~~~~~~~~~~~~~~~

Documentation/devicetree/bindings/usb/am33xx-usb.txt

+2 −0
Original line number Diff line number Diff line
@@ -95,6 +95,7 @@ usb: usb@47400000 { 
		reg = <0x47401300 0x100>;

		reg-names = "phy";

		ti,ctrl_mod = <&ctrl_mod>;

		#phy-cells = <0>;

	};



	usb0: usb@47401000 {
@@ -141,6 +142,7 @@ usb: usb@47400000 { 
		reg = <0x47401b00 0x100>;

		reg-names = "phy";

		ti,ctrl_mod = <&ctrl_mod>;

		#phy-cells = <0>;

	};



	usb1: usb@47401800 {

Documentation/filesystems/overlayfs.txt

+34 −0
Original line number Diff line number Diff line
@@ -156,6 +156,40 @@ handle it in two different ways: 
   root of the overlay.  Finally the directory is moved to the new

   location.



There are several ways to tune the "redirect_dir" feature.



Kernel config options:



- OVERLAY_FS_REDIRECT_DIR:

    If this is enabled, then redirect_dir is turned on by  default.

- OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW:

    If this is enabled, then redirects are always followed by default. Enabling

    this results in a less secure configuration.  Enable this option only when

    worried about backward compatibility with kernels that have the redirect_dir

    feature and follow redirects even if turned off.



Module options (can also be changed through /sys/module/overlay/parameters/*):



- "redirect_dir=BOOL":

    See OVERLAY_FS_REDIRECT_DIR kernel config option above.

- "redirect_always_follow=BOOL":

    See OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW kernel config option above.

- "redirect_max=NUM":

    The maximum number of bytes in an absolute redirect (default is 256).



Mount options:



- "redirect_dir=on":

    Redirects are enabled.

- "redirect_dir=follow":

    Redirects are not created, but followed.

- "redirect_dir=off":

    Redirects are not created and only followed if "redirect_always_follow"

    feature is enabled in the kernel/module config.

- "redirect_dir=nofollow":

    Redirects are not created and not followed (equivalent to "redirect_dir=off"

    if "redirect_always_follow" feature is not enabled).



Non-directories

---------------