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

Commit cc949a9b authored by Blagovest Kolenichev's avatar Blagovest Kolenichev
Browse files

Merge android-4.14-p.93 (ca784704) into msm-4.14 



* refs/heads/tmp-ca784704:
  Linux 4.14.93
  tools: power/acpi, revert to LD = gcc
  bnx2x: Fix NULL pointer dereference in bnx2x_del_all_vlans() on some hw
  drm/vc4: Set ->is_yuv to false when num_planes == 1
  lib: fix build failure in CONFIG_DEBUG_VIRTUAL test
  power: supply: olpc_battery: correct the temperature units
  intel_th: msu: Fix an off-by-one in attribute store
  genwqe: Fix size check
  ceph: don't update importing cap's mseq when handing cap export
  sched/fair: Fix infinite loop in update_blocked_averages() by reverting a9e7f654
  iommu/vt-d: Handle domain agaw being less than iommu agaw
  rxe: fix error completion wr_id and qp_num
  9p/net: put a lower bound on msize
  powerpc/tm: Set MSR[TS] just prior to recheckpoint
  arm64: relocatable: fix inconsistencies in linker script and options
  arm64: drop linker script hack to hide __efistub_ symbols
  scripts/kallsyms: filter arm64's __efistub_ symbols
  lockd: Show pid of lockd for remote locks
  selinux: policydb - fix byte order and alignment issues
  b43: Fix error in cordic routine
  gfs2: Fix loop in gfs2_rbm_find
  gfs2: Get rid of potential double-freeing in gfs2_create_inode
  dlm: memory leaks on error path in dlm_user_request()
  dlm: lost put_lkb on error path in receive_convert() and receive_unlock()
  dlm: possible memory leak on error path in create_lkb()
  dlm: fixed memory leaks after failed ls_remove_names allocation
  ALSA: usb-audio: Fix an out-of-bound read in create_composite_quirks
  ALSA: usb-audio: Avoid access before bLength check in build_audio_procunit()
  ALSA: cs46xx: Potential NULL dereference in probe
  dm zoned: Fix target BIO completion handling
  dm verity: fix crash on bufio buffer that was allocated with vmalloc
  vhost/vsock: fix uninitialized vhost_vsock->guest_cid
  raid6/ppc: Fix build for clang
  powerpc/boot: Set target when cross-compiling for clang
  Makefile: Export clang toolchain variables
  kbuild: consolidate Clang compiler flags
  kbuild: add -no-integrated-as Clang option unconditionally
  md: raid10: remove VLAIS
  ftrace: Build with CPPFLAGS to get -Qunused-arguments
  powerpc: Disable -Wbuiltin-requires-header when setjmp is used
  powerpc: avoid -mno-sched-epilog on GCC 4.9 and newer
  sunrpc: use SVC_NET() in svcauth_gss_* functions
  sunrpc: fix cache_head leak due to queued request
  mm, swap: fix swapoff with KSM pages
  mm, hmm: mark hmm_devmem_{add, add_resource} EXPORT_SYMBOL_GPL
  mm, hmm: use devm semantics for hmm_devmem_{add, remove}
  mm, devm_memremap_pages: kill mapping "System RAM" support
  mm, devm_memremap_pages: mark devm_memremap_pages() EXPORT_SYMBOL_GPL
  hwpoison, memory_hotplug: allow hwpoisoned pages to be offlined
  zram: fix double free backing device
  fork: record start_time late
  tools: fix cross-compile var clobbering
  genirq/affinity: Don't return with empty affinity masks on error
  scsi: lpfc: do not set queue->page_count to 0 if pc_sli4_params.wqpcnt is invalid
  scsi: zfcp: fix posting too many status read buffers leading to adapter shutdown
  serial/sunsu: fix refcount leak
  qmi_wwan: Fix qmap header retrieval in qmimux_rx_fixup
  net: netxen: fix a missing check and an uninitialized use
  Input: synaptics - enable SMBus for HP EliteBook 840 G4
  gpio: mvebu: only fail on missing clk if pwm is actually to be used
  virtio: fix test build after uio.h change
  kbuild: fix false positive warning/error about missing libelf
  mac80211: free skb fraglist before freeing the skb
  vxge: ensure data0 is initialized in when fetching firmware version information
  lan78xx: Resolve issue with changing MAC address
  net: macb: fix dropped RX frames due to a race
  net: macb: fix random memory corruption on RX with 64-bit DMA
  qed: Fix an error code qed_ll2_start_xmit()
  SUNRPC: Fix a race with XPRT_CONNECTING
  net: hns: Fix ping failed when use net bridge and send multicast
  net: hns: Add mac pcs config when enable|disable mac
  net: hns: Fix ntuple-filters status error.
  net: hns: Avoid net reset caused by pause frames storm
  net: hns: Free irq when exit from abnormal branch
  net: hns: Clean rx fbd when ae stopped.
  net: hns: Fixed bug that netdev was opened twice
  net: hns: Some registers use wrong address according to the datasheet.
  net: hns: All ports can not work when insmod hns ko after rmmod.
  net: hns: Incorrect offset address used for some registers.
  w90p910_ether: remove incorrect __init annotation
  drivers: net: xgene: Remove unnecessary forward declarations
  x86, hyperv: remove PCI dependency
  scsi: target: iscsi: cxgbit: add missing spin_lock_init()
  scsi: target: iscsi: cxgbit: fix csk leak
  bnx2x: Send update-svid ramrod with retry/poll flags enabled
  bnx2x: Remove configured vlans as part of unload sequence.
  bnx2x: Clear fip MAC when fcoe offload support is disabled
  netfilter: nat: can't use dst_hold on noref dst
  netfilter: ipset: do not call ipset_nest_end after nla_nest_cancel
  i40e: fix mac filter delete when setting mac address
  x86/dump_pagetables: Fix LDT remap address marker
  x86/mm: Fix guard hole handling
  ieee802154: ca8210: fix possible u8 overflow in ca8210_rx_done
  ibmvnic: Fix non-atomic memory allocation in IRQ context
  Input: synaptics - enable RMI on ThinkPad T560
  Input: omap-keypad - fix idle configuration to not block SoC idle states
  scsi: bnx2fc: Fix NULL dereference in error handling
  netfilter: seqadj: re-load tcp header pointer after possible head reallocation
  xfrm: Fix NULL pointer dereference in xfrm_input when skb_dst_force clears the dst_entry.
  xfrm: Fix bucket count reported to userspace
  xfrm: Fix error return code in xfrm_output_one()
  checkstack.pl: fix for aarch64
  Input: restore EV_ABS ABS_RESERVED
  ARM: dts: imx7d-nitrogen7: Fix the description of the Wifi clock
  ARM: imx: update the cpu power up timing setting on i.mx6sx
  HID: ite: Add USB id match for another ITE based keyboard rfkill key quirk
  powerpc/mm: Fix linux page tables build with some configs
  powerpc: Fix COFF zImage booting on old powermacs
  pinctrl: meson: fix pull enable register calculation

Conflicts:
	mm/memory_hotplug.c

Change-Id: Ief6b04b21694f384fb73e20f770857068a13b458
Signed-off-by: default avatarBlagovest Kolenichev <bkolenichev@codeaurora.org>
parents aac4b174 ca784704

Makefile

+18 −12
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

VERSION = 4

PATCHLEVEL = 14

SUBLEVEL = 92

SUBLEVEL = 93

EXTRAVERSION =

NAME = Petit Gorille
@@ -491,15 +491,18 @@ ifeq ($(cc-name),clang) 
ifneq ($(CROSS_COMPILE),)

CLANG_TRIPLE	?= $(CROSS_COMPILE)

CLANG_TARGET	:= --target=$(notdir $(CLANG_TRIPLE:%-=%))

GCC_TOOLCHAIN	:= $(realpath $(dir $(shell which $(LD)))/..)

CLANG_FLAGS	:= --target=$(notdir $(CROSS_COMPILE:%-=%))

GCC_TOOLCHAIN_DIR := $(dir $(shell which $(LD)))

CLANG_FLAGS	+= --prefix=$(GCC_TOOLCHAIN_DIR)

GCC_TOOLCHAIN	:= $(realpath $(GCC_TOOLCHAIN_DIR)/..)

endif

ifneq ($(GCC_TOOLCHAIN),)

CLANG_GCC_TC	:= --gcc-toolchain=$(GCC_TOOLCHAIN)

CLANG_FLAGS	+= --gcc-toolchain=$(GCC_TOOLCHAIN)

endif

KBUILD_CFLAGS += $(CLANG_TARGET) $(CLANG_GCC_TC) $(CLANG_PREFIX)

KBUILD_AFLAGS += $(CLANG_TARGET) $(CLANG_GCC_TC) $(CLANG_PREFIX)

KBUILD_CFLAGS += $(call cc-option, -no-integrated-as)

KBUILD_AFLAGS += $(call cc-option, -no-integrated-as)

CLANG_FLAGS	+= -no-integrated-as

KBUILD_CFLAGS	+= $(CLANG_FLAGS)

KBUILD_AFLAGS	+= $(CLANG_FLAGS)

export CLANG_FLAGS

endif



RETPOLINE_CFLAGS_GCC := -mindirect-branch=thunk-extern -mindirect-branch-register
@@ -1048,11 +1051,6 @@ ifdef CONFIG_STACK_VALIDATION 
  ifeq ($(has_libelf),1)

    objtool_target := tools/objtool FORCE

  else

    ifdef CONFIG_UNWINDER_ORC

      $(error "Cannot generate ORC metadata for CONFIG_UNWINDER_ORC=y, please install libelf-dev, libelf-devel or elfutils-libelf-devel")

    else

      $(warning "Cannot use CONFIG_STACK_VALIDATION=y, please install libelf-dev, libelf-devel or elfutils-libelf-devel")

    endif

    SKIP_STACK_VALIDATION := 1

    export SKIP_STACK_VALIDATION

  endif
@@ -1196,6 +1194,14 @@ uapi-asm-generic: 


PHONY += prepare-objtool

prepare-objtool: $(objtool_target)

ifeq ($(SKIP_STACK_VALIDATION),1)

ifdef CONFIG_UNWINDER_ORC

	@echo "error: Cannot generate ORC metadata for CONFIG_UNWINDER_ORC=y, please install libelf-dev, libelf-devel or elfutils-libelf-devel" >&2

	@false

else

	@echo "warning: Cannot use CONFIG_STACK_VALIDATION=y, please install libelf-dev, libelf-devel or elfutils-libelf-devel" >&2

endif

endif



# Check for CONFIG flags that require compiler support. Abort the build

# after .config has been processed, but before the kernel build starts.

arch/arm/boot/dts/imx7d-nitrogen7.dts

+7 −2
Original line number Diff line number Diff line
@@ -117,13 +117,17 @@ 
		compatible = "regulator-fixed";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		clocks = <&clks IMX7D_CLKO2_ROOT_DIV>;

		clock-names = "slow";

		regulator-name = "reg_wlan";

		startup-delay-us = <70000>;

		gpio = <&gpio4 21 GPIO_ACTIVE_HIGH>;

		enable-active-high;

	};



	usdhc2_pwrseq: usdhc2_pwrseq {

		compatible = "mmc-pwrseq-simple";

		clocks = <&clks IMX7D_CLKO2_ROOT_DIV>;

		clock-names = "ext_clock";

	};

};



&adc1 {
@@ -430,6 +434,7 @@ 
	bus-width = <4>;

	non-removable;

	vmmc-supply = <&reg_wlan>;

	mmc-pwrseq = <&usdhc2_pwrseq>;

	cap-power-off-card;

	keep-power-in-suspend;

	status = "okay";

arch/arm/mach-imx/cpuidle-imx6sx.c

+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ int __init imx6sx_cpuidle_init(void) 
	 * except for power up sw2iso which need to be

	 * larger than LDO ramp up time.

	 */

	imx_gpc_set_arm_power_up_timing(2, 1);

	imx_gpc_set_arm_power_up_timing(0xf, 1);

	imx_gpc_set_arm_power_down_timing(1, 1);



	return cpuidle_register(&imx6sx_cpuidle_driver, NULL);

arch/arm64/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ ifeq ($(CONFIG_RELOCATABLE), y) 
# Pass --no-apply-dynamic-relocs to restore pre-binutils-2.27 behaviour

# for relative relocs, since this leads to better Image compression

# with the relocation offsets always being zero.

LDFLAGS_vmlinux		+= -pie -shared -Bsymbolic \

LDFLAGS_vmlinux		+= -shared -Bsymbolic -z notext -z norelro \

			$(call ld-option, --no-apply-dynamic-relocs)

endif

arch/arm64/kernel/image.h

+17 −27
Original line number Diff line number Diff line
@@ -75,16 +75,6 @@ 


__efistub_stext_offset = stext - _text;



/*

 * Prevent the symbol aliases below from being emitted into the kallsyms

 * table, by forcing them to be absolute symbols (which are conveniently

 * ignored by scripts/kallsyms) rather than section relative symbols.

 * The distinction is only relevant for partial linking, and only for symbols

 * that are defined within a section declaration (which is not the case for

 * the definitions below) so the resulting values will be identical.

 */

#define KALLSYMS_HIDE(sym)	ABSOLUTE(sym)



/*

 * The EFI stub has its own symbol namespace prefixed by __efistub_, to

 * isolate it from the kernel proper. The following symbols are legally
@@ -94,27 +84,27 @@ __efistub_stext_offset = stext - _text; 
 * linked at. The routines below are all implemented in assembler in a

 * position independent manner

 */

__efistub_memcmp		= KALLSYMS_HIDE(__pi_memcmp);

__efistub_memchr		= KALLSYMS_HIDE(__pi_memchr);

__efistub_memcpy		= KALLSYMS_HIDE(__pi_memcpy);

__efistub_memmove		= KALLSYMS_HIDE(__pi_memmove);

__efistub_memset		= KALLSYMS_HIDE(__pi_memset);

__efistub_strlen		= KALLSYMS_HIDE(__pi_strlen);

__efistub_strnlen		= KALLSYMS_HIDE(__pi_strnlen);

__efistub_strcmp		= KALLSYMS_HIDE(__pi_strcmp);

__efistub_strncmp		= KALLSYMS_HIDE(__pi_strncmp);

__efistub___flush_dcache_area	= KALLSYMS_HIDE(__pi___flush_dcache_area);

__efistub_memcmp		= __pi_memcmp;

__efistub_memchr		= __pi_memchr;

__efistub_memcpy		= __pi_memcpy;

__efistub_memmove		= __pi_memmove;

__efistub_memset		= __pi_memset;

__efistub_strlen		= __pi_strlen;

__efistub_strnlen		= __pi_strnlen;

__efistub_strcmp		= __pi_strcmp;

__efistub_strncmp		= __pi_strncmp;

__efistub___flush_dcache_area	= __pi___flush_dcache_area;



#ifdef CONFIG_KASAN

__efistub___memcpy		= KALLSYMS_HIDE(__pi_memcpy);

__efistub___memmove		= KALLSYMS_HIDE(__pi_memmove);

__efistub___memset		= KALLSYMS_HIDE(__pi_memset);

__efistub___memcpy		= __pi_memcpy;

__efistub___memmove		= __pi_memmove;

__efistub___memset		= __pi_memset;

#endif



__efistub__text			= KALLSYMS_HIDE(_text);

__efistub__end			= KALLSYMS_HIDE(_end);

__efistub__edata		= KALLSYMS_HIDE(_edata);

__efistub_screen_info		= KALLSYMS_HIDE(screen_info);

__efistub__text			= _text;

__efistub__end			= _end;

__efistub__edata		= _edata;

__efistub_screen_info		= screen_info;



#endif