Merge branch 'linus' into x86/mm, to pick up a bugfix

  pids.max

 A read-write single value file which exists on non-root cgroups.  The

 default is "max".

	A read-write single value file which exists on non-root

	cgroups.  The default is "max".

	Hard limit of number of processes.

	A read-only single value file which exists on all cgroups.

 The number of processes currently in the cgroup and its descendants.

	The number of processes currently in the cgroup and its

	descendants.

Organisational operations are not blocked by cgroup policies, so it is

possible to have pids.current > pids.max.  This can be done by either

			  For Axon it can be absent, though my current driver

			  doesn't handle phy-address yet so for now, keep

			  0x00ffffff in it.

    - phy-handle	: Used to describe configurations where a external PHY

			  is used. Please refer to:

			  Documentation/devicetree/bindings/net/ethernet.txt

    - rx-fifo-size-gige : 1 cell, Rx fifo size in bytes for 1000 Mb/sec

			  operations (if absent the value is the same as

			  rx-fifo-size).  For Axon, either absent or 2048.

			  offload, phandle of the TAH device node.

    - tah-channel       : 1 cell, optional. If appropriate, channel used on the

			  TAH engine.

    - fixed-link	: Fixed-link subnode describing a link to a non-MDIO

			  managed entity. See

			  Documentation/devicetree/bindings/net/fixed-link.txt

			  for details.

    - mdio subnode	: When the EMAC has a phy connected to its local

			  mdio, which us supported by the kernel's network

			  PHY library in drivers/net/phy, there must be device

			  tree subnode with the following required properties:

				- #address-cells: Must be <1>.

				- #size-cells: Must be <0>.

    Example:

			  For PHY definitions: Please refer to

			  Documentation/devicetree/bindings/net/phy.txt and

			  Documentation/devicetree/bindings/net/ethernet.txt

    Examples:

	EMAC0: ethernet@40000800 {

		device_type = "network";

		zmii-channel = <0>;

	};

	EMAC1: ethernet@ef600c00 {

		device_type = "network";

		compatible = "ibm,emac-apm821xx", "ibm,emac4sync";

		interrupt-parent = <&EMAC1>;

		interrupts = <0 1>;

		#interrupt-cells = <1>;

		#address-cells = <0>;

		#size-cells = <0>;

		interrupt-map = <0 &UIC2 0x10 IRQ_TYPE_LEVEL_HIGH /* Status */

				 1 &UIC2 0x14 IRQ_TYPE_LEVEL_HIGH /* Wake */>;

		reg = <0xef600c00 0x000000c4>;

		local-mac-address = [000000000000]; /* Filled in by U-Boot */

		mal-device = <&MAL0>;

		mal-tx-channel = <0>;

		mal-rx-channel = <0>;

		cell-index = <0>;

		max-frame-size = <9000>;

		rx-fifo-size = <16384>;

		tx-fifo-size = <2048>;

		fifo-entry-size = <10>;

		phy-mode = "rgmii";

		phy-handle = <&phy0>;

		phy-map = <0x00000000>;

		rgmii-device = <&RGMII0>;

		rgmii-channel = <0>;

		tah-device = <&TAH0>;

		tah-channel = <0>;

		has-inverted-stacr-oc;

		has-new-stacr-staopc;

	        mdio {

			#address-cells = <1>;

			#size-cells = <0>;

			phy0: ethernet-phy@0 {

				compatible = "ethernet-phy-ieee802.3-c22";

				reg = <0>;

			};

		};

	};

      ii) McMAL node

    Required properties:

    - revision           : as provided by the RGMII new version register if

			   available.

			   For Axon: 0x0000012a

		FALSE (router)

forwarding - BOOLEAN

	Enable IP forwarding on this interface.

	Enable IP forwarding on this interface.  This controls whether packets

	received _on_ this interface can be forwarded.

mc_forwarding - BOOLEAN

	Do multicast routing. The kernel needs to be compiled with CONFIG_MROUTE

	def_bool y

	depends on COMPAT && SYSVIPC

config KEYS_COMPAT

	def_bool y

	depends on COMPAT && KEYS

endmenu

menu "Power management options"

static inline bool system_uses_ttbr0_pan(void)

{

	return IS_ENABLED(CONFIG_ARM64_SW_TTBR0_PAN) &&

		!cpus_have_cap(ARM64_HAS_PAN);

		!cpus_have_const_cap(ARM64_HAS_PAN);

}

#endif /* __ASSEMBLY__ */