Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b7ee32b1 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 5.3-rc8 into android-mainline 



Linux 5.3-rc8

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I2908bd47266c7645d360bbe273bb10ada3cc8e3c
parents 91e15d7d f74c2bb9

.clang-format

+14 −3
Original line number Diff line number Diff line
@@ -107,10 +107,13 @@ ForEachMacros: 
  - 'css_for_each_descendant_post'

  - 'css_for_each_descendant_pre'

  - 'device_for_each_child_node'

  - 'dma_fence_chain_for_each'

  - 'drm_atomic_crtc_for_each_plane'

  - 'drm_atomic_crtc_state_for_each_plane'

  - 'drm_atomic_crtc_state_for_each_plane_state'

  - 'drm_atomic_for_each_plane_damage'

  - 'drm_client_for_each_connector_iter'

  - 'drm_client_for_each_modeset'

  - 'drm_connector_for_each_possible_encoder'

  - 'drm_for_each_connector_iter'

  - 'drm_for_each_crtc'
@@ -126,6 +129,7 @@ ForEachMacros: 
  - 'drm_mm_for_each_node_in_range'

  - 'drm_mm_for_each_node_safe'

  - 'flow_action_for_each'

  - 'for_each_active_dev_scope'

  - 'for_each_active_drhd_unit'

  - 'for_each_active_iommu'

  - 'for_each_available_child_of_node'
@@ -153,6 +157,8 @@ ForEachMacros: 
  - 'for_each_cpu_not'

  - 'for_each_cpu_wrap'

  - 'for_each_dev_addr'

  - 'for_each_dev_scope'

  - 'for_each_displayid_db'

  - 'for_each_dma_cap_mask'

  - 'for_each_dpcm_be'

  - 'for_each_dpcm_be_rollback'
@@ -169,6 +175,8 @@ ForEachMacros: 
  - 'for_each_evictable_lru'

  - 'for_each_fib6_node_rt_rcu'

  - 'for_each_fib6_walker_rt'

  - 'for_each_free_mem_pfn_range_in_zone'

  - 'for_each_free_mem_pfn_range_in_zone_from'

  - 'for_each_free_mem_range'

  - 'for_each_free_mem_range_reverse'

  - 'for_each_func_rsrc'
@@ -178,6 +186,7 @@ ForEachMacros: 
  - 'for_each_ip_tunnel_rcu'

  - 'for_each_irq_nr'

  - 'for_each_link_codecs'

  - 'for_each_link_platforms'

  - 'for_each_lru'

  - 'for_each_matching_node'

  - 'for_each_matching_node_and_match'
@@ -302,7 +311,10 @@ ForEachMacros: 
  - 'ide_port_for_each_present_dev'

  - 'idr_for_each_entry'

  - 'idr_for_each_entry_continue'

  - 'idr_for_each_entry_continue_ul'

  - 'idr_for_each_entry_ul'

  - 'in_dev_for_each_ifa_rcu'

  - 'in_dev_for_each_ifa_rtnl'

  - 'inet_bind_bucket_for_each'

  - 'inet_lhash2_for_each_icsk_rcu'

  - 'key_for_each'
@@ -343,8 +355,6 @@ ForEachMacros: 
  - 'media_device_for_each_intf'

  - 'media_device_for_each_link'

  - 'media_device_for_each_pad'

  - 'mp_bvec_for_each_page'

  - 'mp_bvec_for_each_segment'

  - 'nanddev_io_for_each_page'

  - 'netdev_for_each_lower_dev'

  - 'netdev_for_each_lower_private'
@@ -381,18 +391,19 @@ ForEachMacros: 
  - 'radix_tree_for_each_slot'

  - 'radix_tree_for_each_tagged'

  - 'rbtree_postorder_for_each_entry_safe'

  - 'rdma_for_each_block'

  - 'rdma_for_each_port'

  - 'resource_list_for_each_entry'

  - 'resource_list_for_each_entry_safe'

  - 'rhl_for_each_entry_rcu'

  - 'rhl_for_each_rcu'

  - 'rht_for_each'

  - 'rht_for_each_from'

  - 'rht_for_each_entry'

  - 'rht_for_each_entry_from'

  - 'rht_for_each_entry_rcu'

  - 'rht_for_each_entry_rcu_from'

  - 'rht_for_each_entry_safe'

  - 'rht_for_each_from'

  - 'rht_for_each_rcu'

  - 'rht_for_each_rcu_from'

  - '__rq_for_each_bio'

Documentation/process/embargoed-hardware-issues.rst

+7 −7
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ Mitigation development 


The initial response team sets up an encrypted mailing-list or repurposes

an existing one if appropriate. The disclosing party should provide a list

of contacts for all other parties who have already been, or should be

of contacts for all other parties who have already been, or should be,

informed about the issue. The response team contacts these parties so they

can name experts who should be subscribed to the mailing-list.
@@ -217,11 +217,11 @@ an involved disclosed party. The current ambassadors list: 
  AMD

  IBM

  Intel

  Qualcomm

  Qualcomm	Trilok Soni <tsoni@codeaurora.org>



  Microsoft

  Microsoft	Sasha Levin <sashal@kernel.org>

  VMware

  XEN

  Xen		Andrew Cooper <andrew.cooper3@citrix.com>



  Canonical	Tyler Hicks <tyhicks@canonical.com>

  Debian	Ben Hutchings <ben@decadent.org.uk>
@@ -230,8 +230,8 @@ an involved disclosed party. The current ambassadors list: 
  SUSE		Jiri Kosina <jkosina@suse.cz>



  Amazon

  Google

  ============== ========================================================

  Google	Kees Cook <keescook@chromium.org>

  ============= ========================================================



If you want your organization to be added to the ambassadors list, please

contact the hardware security team. The nominated ambassador has to

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
VERSION = 5

PATCHLEVEL = 3

SUBLEVEL = 0

EXTRAVERSION = -rc7

EXTRAVERSION = -rc8

NAME = Bobtail Squid



# *DOCUMENTATION*

arch/arm64/boot/dts/renesas/hihope-common.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -279,6 +279,7 @@ 
	mmc-hs200-1_8v;

	non-removable;

	fixed-emmc-driver-type = <1>;

	status = "okay";

};



&usb_extal_clk {

arch/arm64/boot/dts/renesas/r8a77995-draak.dts

+3 −3
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ 
		reg = <0x0 0x48000000 0x0 0x18000000>;

	};



	reg_1p8v: regulator0 {

	reg_1p8v: regulator-1p8v {

		compatible = "regulator-fixed";

		regulator-name = "fixed-1.8V";

		regulator-min-microvolt = <1800000>;
@@ -106,7 +106,7 @@ 
		regulator-always-on;

	};



	reg_3p3v: regulator1 {

	reg_3p3v: regulator-3p3v {

		compatible = "regulator-fixed";

		regulator-name = "fixed-3.3V";

		regulator-min-microvolt = <3300000>;
@@ -115,7 +115,7 @@ 
		regulator-always-on;

	};



	reg_12p0v: regulator1 {

	reg_12p0v: regulator-12p0v {

		compatible = "regulator-fixed";

		regulator-name = "D12.0V";

		regulator-min-microvolt = <12000000>;