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

Commit c2fab09b authored by Amit Pundir's avatar Amit Pundir
Browse files

Merge branch 'android-3.18' of https://android.googlesource.com/kernel/common 



* android-3.18: (65 commits)
  UPSTREAM: arm64: add better page protections to arm64
  UPSTREAM: arm64: use fixmap for text patching
  UPSTREAM: arm64: remove the unnecessary arm64_swiotlb_init()
  UPSTREAM: arm64/efi: remove idmap manipulations from UEFI code
  UPSTREAM: arm64/efi: add missing call to early_ioremap_reset()
  UPSTREAM: arm64/efi: remove free_boot_services() and friends
  UPSTREAM: arm64/efi: move SetVirtualAddressMap() to UEFI stub
  UPSTREAM: arm64/efi: set EFI_ALLOC_ALIGN to 64 KB
  UPSTREAM: efi: efistub: allow allocation alignment larger than EFI_PAGE_SIZE
  UPSTREAM: efi: split off remapping code from efi_config_init()
  UPSTREAM: arm64/mm: add create_pgd_mapping() to create private page tables
  UPSTREAM: arm64/mm: add explicit struct_mm argument to __create_mapping()
  UPSTREAM: efi: efi-stub: notify on DTB absence
  UPSTREAM: arm64: dmi: set DMI string as dump stack arch description
  UPSTREAM: arm64: dmi: Add SMBIOS/DMI support
  UPSTREAM: dmi: add support for SMBIOS 3.0 64-bit entry point
  UPSTREAM: efi: dmi: add support for SMBIOS 3.0 UEFI configuration table
  UPSTREAM: arm64/efi: drop redundant set_bit(EFI_CONFIG_TABLES)
  UPSTREAM: arm64/efi: invert UEFI memory region reservation logic
  UPSTREAM: arm64/efi: set PE/COFF file alignment to 512 bytes
  ...

Signed-off-by: default avatarAmit Pundir <amit.pundir@linaro.org>

Conflicts:
	arch/arm64/Kconfig.debug
        ==> Add changes from LSK commit 62b089fa "coresight:
            moving to new "hwtracing" directory" as well as changes
            from AOSP commit 43e0bfd3 "UPSTREAM: arm64: add
            better page protections to arm64".

	arch/arm64/kernel/efi.c
	arch/arm64/kernel/setup.c
        ==> Pick changes from AOSP commits 3b9b3260 "UPSTREAM:
            arm64/efi: move SetVirtualAddressMap() to UEFI stub"
            and 40ab942b "UPSTREAM: arm64/efi: remove idmap
            manipulations from UEFI code" instead.

	drivers/firmware/dmi_scan.c
        ==> Add changes from LSK commit d9b30055 "firmware:
            dmi_scan: Fix ordering of product_uuid" as well as
            changes from AOSP commit 9390abcd "UPSTREAM: dmi:
            add support for SMBIOS 3.0 64-bit entry point".

	include/net/route.h
        ==> Pick changes from AOSP commit 83511cc4 "net: core:
            fix UID-based routing build" instead of Linaro commit
            a9e5d955 "net: core: fix Null ptr dereference in
            UID-based routing".

	lib/lz4/lz4_decompress.c
        ==> Pick changes from AOSP commit e5cf8538 "lz4: fix
            system halt at boot kernel on x86_64" instead.
parents 717ba911 43e0bfd3

Documentation/arm/memory.txt

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ fffe8000 fffeffff DTCM mapping area for platforms with 
fffe0000	fffe7fff	ITCM mapping area for platforms with

				ITCM mounted inside the CPU.



ffc00000	ffdfffff	Fixmap mapping region.  Addresses provided

ffc00000	ffefffff	Fixmap mapping region.  Addresses provided

				by fix_to_virt() will be located here.



fee00000	feffffff	Mapping of PCI I/O space. This is a static

Documentation/device-mapper/verity.txt

+11 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ Construction Parameters 
    <version> <dev> <hash_dev>

    <data_block_size> <hash_block_size>

    <num_data_blocks> <hash_start_block>

    <algorithm> <digest> <salt>

    <algorithm> <digest> <salt> <mode>



<version>

    This is the type of the on-disk hash format.
@@ -62,6 +62,16 @@ Construction Parameters 
<salt>

    The hexadecimal encoding of the salt value.



<mode>

    Optional. The mode of operation.



    0 is the normal mode of operation where a corrupted block will result in an

      I/O error.



    1 is logging mode where corrupted blocks are logged and a uevent is sent to

      notify user space.





Theory of operation

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

Documentation/filesystems/squashfs.txt

+4 −4
Original line number Diff line number Diff line
@@ -2,10 +2,10 @@ SQUASHFS 4.0 FILESYSTEM 
=======================



Squashfs is a compressed read-only filesystem for Linux.

It uses zlib/lzo/xz compression to compress files, inodes and directories.

Inodes in the system are very small and all blocks are packed to minimise

data overhead. Block sizes greater than 4K are supported up to a maximum

of 1Mbytes (default block size 128K).

It uses zlib, lz4, lzo, or xz compression to compress files, inodes and

directories.  Inodes in the system are very small and all blocks are packed to

minimise data overhead. Block sizes greater than 4K are supported up to a

maximum of 1Mbytes (default block size 128K).



Squashfs is intended for general read-only filesystem use, for archival

use (i.e. in cases where a .tar.gz file may be used), and in constrained

Documentation/networking/ip-sysctl.txt

+7 −0
Original line number Diff line number Diff line
@@ -1378,6 +1378,13 @@ router_solicitations - INTEGER 
	routers are present.

	Default: 3



use_oif_addrs_only - BOOLEAN

	When enabled, the candidate source addresses for destinations

	routed via this interface are restricted to the set of addresses

	configured on this interface (vis. RFC 6724, section 4).



	Default: false



use_tempaddr - INTEGER

	Preference for Privacy Extensions (RFC3041).

	  <= 0 : disable Privacy Extensions

arch/arm/crypto/Makefile

+7 −1
Original line number Diff line number Diff line
@@ -6,12 +6,15 @@ obj-$(CONFIG_CRYPTO_AES_ARM) += aes-arm.o 
obj-$(CONFIG_CRYPTO_AES_ARM_BS) += aes-arm-bs.o

obj-$(CONFIG_CRYPTO_SHA1_ARM) += sha1-arm.o

obj-$(CONFIG_CRYPTO_SHA1_ARM_NEON) += sha1-arm-neon.o

obj-$(CONFIG_CRYPTO_SHA256_ARM) += sha256-arm.o

obj-$(CONFIG_CRYPTO_SHA512_ARM_NEON) += sha512-arm-neon.o



aes-arm-y	:= aes-armv4.o aes_glue.o

aes-arm-bs-y	:= aesbs-core.o aesbs-glue.o

sha1-arm-y	:= sha1-armv4-large.o sha1_glue.o

sha1-arm-neon-y	:= sha1-armv7-neon.o sha1_neon_glue.o

sha256-arm-neon-$(CONFIG_KERNEL_MODE_NEON) := sha256_neon_glue.o

sha256-arm-y	:= sha256-core.o sha256_glue.o $(sha256-arm-neon-y)

sha512-arm-neon-y := sha512-armv7-neon.o sha512_neon_glue.o



quiet_cmd_perl = PERL    $@
@@ -20,4 +23,7 @@ quiet_cmd_perl = PERL $@ 
$(src)/aesbs-core.S_shipped: $(src)/bsaes-armv7.pl

	$(call cmd,perl)



.PRECIOUS: $(obj)/aesbs-core.S
 
$(src)/sha256-core.S_shipped: $(src)/sha256-armv4.pl

	$(call cmd,perl)



.PRECIOUS: $(obj)/aesbs-core.S $(obj)/sha256-core.S