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

Merge 5.5-rc2 into staging-next 



We want the staging driver fixes in here, and this resolves merge issues
with the isdn code that was pointed out in linux-next

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parents f59aba2f d1eef1c6

.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