Commit 009ef05f authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

Merge remote-tracking branch 'torvalds/master' into perf/core 



To pick up the fixes sent for v5.12 and continue development based on
v5.12-rc2, i.e. without the swap on file bug.

This also gets a slightly newer and better tools/perf/arch/arm/util/cs-etm.c
patch version, using the BIT() macro, that had already been slated to
v5.13 but ended up going to v5.12-rc1 on an older version.

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parents 2777b81b 144c79ef

.clang-format

+1 −0
Original line number Diff line number Diff line
@@ -109,6 +109,7 @@ ForEachMacros: 
  - 'css_for_each_child'

  - 'css_for_each_descendant_post'

  - 'css_for_each_descendant_pre'

  - 'cxl_for_each_cmd'

  - 'device_for_each_child_node'

  - 'dma_fence_chain_for_each'

  - 'do_for_each_ftrace_op'

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ 
*.so.dbg

*.su

*.symtypes

*.symversions

*.tab.[ch]

*.tar

*.xz

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -237,6 +237,7 @@ Maxime Ripard <mripard@kernel.org> <maxime.ripard@free-electrons.com> 
Mayuresh Janorkar <mayur@ti.com>

Michael Buesch <m@bues.ch>

Michel Dänzer <michel@tungstengraphics.com>

Miguel Ojeda <ojeda@kernel.org> <miguel.ojeda.sandonis@gmail.com>

Mike Rapoport <rppt@kernel.org> <mike@compulab.co.il>

Mike Rapoport <rppt@kernel.org> <mike.rapoport@gmail.com>

Mike Rapoport <rppt@kernel.org> <rppt@linux.ibm.com>

CREDITS

+7 −10
Original line number Diff line number Diff line
@@ -1244,10 +1244,10 @@ S: 80050-430 - Curitiba - Paraná 
S: Brazil



N: Oded Gabbay

E: oded.gabbay@gmail.com

D: HabanaLabs and AMD KFD maintainer

S: 12 Shraga Raphaeli

S: Petah-Tikva, 4906418

E: ogabbay@kernel.org

D: HabanaLabs maintainer

S: 29 Duchifat St.

S: Ra'anana 4372029

S: Israel



N: Kumar Gala
@@ -2841,14 +2841,11 @@ S: Subiaco, 6008 
S: Perth, Western Australia

S: Australia



N: Miguel Ojeda Sandonis

E: miguel.ojeda.sandonis@gmail.com

W: http://miguelojeda.es

W: http://jair.lab.fi.uva.es/~migojed/

N: Miguel Ojeda

E: ojeda@kernel.org

W: https://ojeda.dev

D: Author of the ks0108, cfag12864b and cfag12864bfb auxiliary display drivers.

D: Maintainer of the auxiliary display drivers tree (drivers/auxdisplay/*)

S: C/ Mieses 20, 9-B

S: Valladolid 47009

S: Spain



N: Peter Oruba

Documentation/ABI/stable/sysfs-bus-fsl-mc

0 → 100644
+19 −0
Original line number Diff line number Diff line 
What:		/sys/bus/fsl-mc/rescan

Date:		January 2021

KernelVersion:	5.12

Contact:	Ioana Ciornei <ioana.ciornei@nxp.com>

Description:	Writing a non-zero value to this attribute will

		force a rescan of fsl-mc bus in the system and

		synchronize the objects under fsl-mc bus and the

		Management Complex firmware.

Users:		Userspace drivers and management tools



What:		/sys/bus/fsl-mc/autorescan

Date:		January 2021

KernelVersion:	5.12

Contact:	Ioana Ciornei <ioana.ciornei@nxp.com>

Description:	Writing a zero value to this attribute will

		disable the DPRC IRQs on which automatic rescan

		of the fsl-mc bus is performed. A non-zero value

		will enable the DPRC IRQs.

Users:		Userspace drivers and management tools