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

Commit e7da47f2 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Merge android-4.9.96 (320d53a9) into msm-4.9"

parents 230f5ef8 2c5fffe9

Documentation/device-mapper/verity.txt

+11 −0
Original line number Diff line number Diff line
@@ -109,6 +109,17 @@ fec_start <offset> 
    This is the offset, in <data_block_size> blocks, from the start of the

    FEC device to the beginning of the encoding data.



check_at_most_once

    Verify data blocks only the first time they are read from the data device,

    rather than every time.  This reduces the overhead of dm-verity so that it

    can be used on systems that are memory and/or CPU constrained.  However, it

    provides a reduced level of security because only offline tampering of the

    data device's content will be detected, not online tampering.



    Hash blocks are still verified each time they are read from the hash device,

    since verification of hash blocks is less performance critical than data

    blocks, and a hash block will not be verified any more after all the data

    blocks it covers have been verified anyway.



Theory of operation

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

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 9

SUBLEVEL = 95

SUBLEVEL = 96

EXTRAVERSION =

NAME = Roaring Lionus

arch/arm/boot/dts/at91sam9g25.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
				atmel,mux-mask = <

				      /*    A         B          C     */

				       0xffffffff 0xffe0399f 0xc000001c  /* pioA */

				       0x0007ffff 0x8000fe3f 0x00000000  /* pioB */

				       0x0007ffff 0x00047e3f 0x00000000  /* pioB */

				       0x80000000 0x07c0ffff 0xb83fffff  /* pioC */

				       0x003fffff 0x003f8000 0x00000000  /* pioD */

				      >;

arch/arm/boot/dts/exynos5250.dtsi

+4 −4
Original line number Diff line number Diff line
@@ -640,7 +640,7 @@ 
			power-domains = <&pd_gsc>;

			clocks = <&clock CLK_GSCL0>;

			clock-names = "gscl";

			iommu = <&sysmmu_gsc0>;

			iommus = <&sysmmu_gsc0>;

		};



		gsc_1:  gsc@13e10000 {
@@ -650,7 +650,7 @@ 
			power-domains = <&pd_gsc>;

			clocks = <&clock CLK_GSCL1>;

			clock-names = "gscl";

			iommu = <&sysmmu_gsc1>;

			iommus = <&sysmmu_gsc1>;

		};



		gsc_2:  gsc@13e20000 {
@@ -660,7 +660,7 @@ 
			power-domains = <&pd_gsc>;

			clocks = <&clock CLK_GSCL2>;

			clock-names = "gscl";

			iommu = <&sysmmu_gsc2>;

			iommus = <&sysmmu_gsc2>;

		};



		gsc_3:  gsc@13e30000 {
@@ -670,7 +670,7 @@ 
			power-domains = <&pd_gsc>;

			clocks = <&clock CLK_GSCL3>;

			clock-names = "gscl";

			iommu = <&sysmmu_gsc3>;

			iommus = <&sysmmu_gsc3>;

		};



		hdmi: hdmi@14530000 {

arch/arm/boot/dts/sama5d4.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -1362,7 +1362,7 @@ 
			pinctrl@fc06a000 {

				#address-cells = <1>;

				#size-cells = <1>;

				compatible = "atmel,at91sam9x5-pinctrl", "atmel,at91rm9200-pinctrl", "simple-bus";

				compatible = "atmel,sama5d3-pinctrl", "atmel,at91sam9x5-pinctrl", "simple-bus";

				ranges = <0xfc068000 0xfc068000 0x100

					  0xfc06a000 0xfc06a000 0x4000>;

				/* WARNING: revisit as pin spec has changed */