Commit 4081b335 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'mmp/hsic' into arm/dt 

* mmp/hsic:
  ARM: dts: mmp3-dell-ariel: Enable the HSIC
  ARM: dts: mmp3: Add HSIC controllers
  dt-bindings: phy: Add binding for marvell,mmp3-hsic-phy
  clk: mmp2: Add HSIC clocks
  dt-bindings: marvell,mmp2: Add clock ids for the HSIC clocks
  + Linux 5.5-rc2
parents 3b6930e8 0bc5f749

.mailmap

+2 −0
Original line number Diff line number Diff line
@@ -276,3 +276,5 @@ Gustavo Padovan <gustavo@las.ic.unicamp.br> 
Gustavo Padovan <padovan@profusion.mobi>

Changbin Du <changbin.du@intel.com> <changbin.du@intel.com>

Changbin Du <changbin.du@intel.com> <changbin.du@gmail.com>

Steve Wise <larrystevenwise@gmail.com> <swise@chelsio.com>

Steve Wise <larrystevenwise@gmail.com> <swise@opengridcomputing.com>

Documentation/admin-guide/device-mapper/dm-integrity.rst

+1 −1
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ journal_crypt:algorithm(:key) (the key is optional) 
	Encrypt the journal using given algorithm to make sure that the

	attacker can't read the journal. You can use a block cipher here

	(such as "cbc(aes)") or a stream cipher (for example "chacha20",

	"salsa20", "ctr(aes)" or "ecb(arc4)").

	"salsa20" or "ctr(aes)").



	The journal contains history of last writes to the block device,

	an attacker reading the journal could see the last sector nubmers

Documentation/admin-guide/device-mapper/index.rst

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ Device Mapper 
    cache-policies

    cache

    delay

    dm-clone

    dm-crypt

    dm-dust

    dm-flakey

Documentation/devicetree/bindings/arm/sunxi.yaml

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ title: Allwinner platforms device tree bindings 


maintainers:

  - Chen-Yu Tsai <wens@csie.org>

  - Maxime Ripard <maxime.ripard@bootlin.com>

  - Maxime Ripard <mripard@kernel.org>



properties:

  $nodename:

Documentation/devicetree/bindings/bus/allwinner,sun50i-a64-de2.yaml

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ title: Allwinner A64 Display Engine Bus Device Tree Bindings 


maintainers:

  - Chen-Yu Tsai <wens@csie.org>

  - Maxime Ripard <maxime.ripard@bootlin.com>

  - Maxime Ripard <mripard@kernel.org>



properties:

  $nodename:

CRA Git | Maintained and supported by SUSTech CRA and CCSE