Commit c5976f89 authored Dec 14, 2018 by Minming Qi

Merge android-4.9.135 (03fcc2fe) into msm-4.9



* refs/heads/tmp-03fcc2fe:
  kernel/sched: Fix up 4.9.135 merge
  Revert "BACKPORT, FROMGIT: crypto: speck - add support for the Speck block cipher"
  Revert "FROMGIT: crypto: speck - export common helpers"
  Revert "BACKPORT, FROMGIT: crypto: arm/speck - add NEON-accelerated implementation of Speck-XTS"
  Revert "BACKPORT, FROMGIT: crypto: speck - add test vectors for Speck128-XTS"
  Revert "BACKPORT, FROMGIT: crypto: speck - add test vectors for Speck64-XTS"
  Revert "BACKPORT, FROMLIST: crypto: arm64/speck - add NEON-accelerated implementation of Speck-XTS"
  Revert "fscrypt: add Speck128/256 support"
  Linux 4.9.135
  HV: properly delay KVP packets when negotiation is in progress
  ext4: avoid running out of journal credits when appending to an inline file
  sched/cputime: Fix ksoftirqd cputime accounting regression
  sched/cputime: Increment kcpustat directly on irqtime account
  macintosh/rack-meter: Convert cputime64_t use to u64
  sched/cputime: Convert kcpustat to nsecs
  usb: gadget: serial: fix oops when data rx'd after close
  HID: quirks: fix support for Apple Magic Keyboards
  ARC: build: Don't set CROSS_COMPILE in arch's Makefile
  ARC: build: Get rid of toolchain check
  netfilter: check for seqadj ext existence before adding it in nf_nat_setup_info
  mm: Preserve _PAGE_DEVMAP across mprotect() calls
  mremap: properly flush TLB before releasing the page
  iommu/amd: Return devid as alias for ACPI HID devices
  powerpc/tm: Avoid possible userspace r1 corruption on reclaim
  powerpc/tm: Fix userspace r13 corruption
  net/mlx4: Use cpumask_available for eq->affinity_mask
  scsi: sd: don't crash the host on invalid commands
  drm: mali-dp: Call drm_crtc_vblank_reset on device init
  ravb: do not write 1 to reserved bits
  Input: atakbd - fix Atari CapsLock behaviour
  Input: atakbd - fix Atari keymap
  scsi: ibmvscsis: Ensure partition name is properly NUL terminated
  scsi: ibmvscsis: Fix a stringop-overflow warning
  clocksource/drivers/ti-32k: Add CLOCK_SOURCE_SUSPEND_NONSTOP flag for non-am43 SoCs
  batman-adv: fix hardif_neigh refcount on queue_work() failure
  batman-adv: fix backbone_gw refcount on queue_work() failure
  batman-adv: Prevent duplicated tvlv handler
  batman-adv: Prevent duplicated global TT entry
  batman-adv: Prevent duplicated softif_vlan entry
  batman-adv: Prevent duplicated nc_node entry
  batman-adv: Fix segfault when writing to sysfs elp_interval
  batman-adv: Fix segfault when writing to throughput_override
  media: af9035: prevent buffer overflow on write
  ANDROID: usb: gadget: f_mtp: Return error if count is negative

Conflicts:
	fs/crypto/fscrypt_private.h
	fs/crypto/keyinfo.c
	kernel/sched/cputime.c

Change-Id: I5565f2b8c93dfbde32f617eed14b9b574fc24912
Signed-off-by: Minming Qi <mqi@codeaurora.org>

parents 5ffa7b1d b8bd066f

Documentation/filesystems/fscrypt.rst

deleted100644 → 0

+0 −626

File deleted.

Preview size limit exceeded, changes collapsed.

Makefile

+1 −1

Original line number	Diff line number	Diff line
		VERSION = 4
		PATCHLEVEL = 9
		SUBLEVEL = 134
		SUBLEVEL = 135
		EXTRAVERSION =
		NAME = Roaring Lionus

arch/arc/Makefile

+1 −23

Original line number	Diff line number	Diff line
		@@ -8,34 +8,12 @@

		UTS_MACHINE := arc

		ifeq ($(CROSS_COMPILE),)
		ifndef CONFIG_CPU_BIG_ENDIAN
		CROSS_COMPILE := arc-linux-
		else
		CROSS_COMPILE := arceb-linux-
		endif
		endif

		KBUILD_DEFCONFIG := nsim_700_defconfig

		cflags-y += -fno-common -pipe -fno-builtin -mmedium-calls -D__linux__
		cflags-$(CONFIG_ISA_ARCOMPACT) += -mA7
		cflags-$(CONFIG_ISA_ARCV2) += -mcpu=archs

		is_700 = $(shell $(CC) -dM -E - < /dev/null \| grep -q "ARC700" && echo 1 \|\| echo 0)

		ifdef CONFIG_ISA_ARCOMPACT
		ifeq ($(is_700), 0)
		$(error Toolchain not configured for ARCompact builds)
		endif
		endif

		ifdef CONFIG_ISA_ARCV2
		ifeq ($(is_700), 1)
		$(error Toolchain not configured for ARCv2 builds)
		endif
		endif

		ifdef CONFIG_ARC_CURR_IN_REG
		# For a global register defintion, make sure it gets passed to every file
		# We had a customer reported bug where some code built in kernel was NOT using
		@@ -89,7 +67,7 @@ ldflags-$(CONFIG_CPU_BIG_ENDIAN) += -EB
		# --build-id w/o "-marclinux". Default arc-elf32-ld is OK
		ldflags-$(upto_gcc44) += -marclinux

		LIBGCC := $(shell $(CC) $(cflags-y) --print-libgcc-file-name)
		LIBGCC = $(shell $(CC) $(cflags-y) --print-libgcc-file-name)

		# Modules with short calls might break for calls into builtin-kernel
		KBUILD_CFLAGS_MODULE += -mlong-calls -mno-millicode

arch/arm/crypto/Kconfig

+0 −7

Original line number	Diff line number	Diff line
		@@ -120,11 +120,4 @@ config CRYPTO_GHASH_ARM_CE
		that uses the 64x64 to 128 bit polynomial multiplication (vmull.p64)
		that is part of the ARMv8 Crypto Extensions

		config CRYPTO_SPECK_NEON
		tristate "NEON accelerated Speck cipher algorithms"
		depends on KERNEL_MODE_NEON
		select CRYPTO_BLKCIPHER
		select CRYPTO_GF128MUL
		select CRYPTO_SPECK

		endif

arch/arm/crypto/Makefile

+0 −2

Original line number	Diff line number	Diff line
		@@ -8,7 +8,6 @@ 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) += sha512-arm.o
		obj-$(CONFIG_CRYPTO_SPECK_NEON) += speck-neon.o

		ce-obj-$(CONFIG_CRYPTO_AES_ARM_CE) += aes-arm-ce.o
		ce-obj-$(CONFIG_CRYPTO_SHA1_ARM_CE) += sha1-arm-ce.o
		@@ -37,7 +36,6 @@ sha1-arm-ce-y := sha1-ce-core.o sha1-ce-glue.o
		sha2-arm-ce-y := sha2-ce-core.o sha2-ce-glue.o
		aes-arm-ce-y := aes-ce-core.o aes-ce-glue.o
		ghash-arm-ce-y := ghash-ce-core.o ghash-ce-glue.o
		speck-neon-y := speck-neon-core.o speck-neon-glue.o

		quiet_cmd_perl = PERL $@
		cmd_perl = $(PERL) $(<) > $(@)