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

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

Merge changes Ief39b958,I1ed32b5d into msm-4.14 

* changes:
  Merge remote-tracking branch 'remotes/origin/tmp-51e322a7' into msm-4.14
  Merge remote-tracking branch 'remotes/origin/tmp-331d833e' into msm-4.14
parents 0fca060f 7ed7e2ac

Documentation/ABI/testing/sysfs-bus-iio

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ Description: 
		Description of the physical chip / device for device X.

		Typically a part number.



What:		/sys/bus/iio/devices/iio:deviceX/timestamp_clock

What:		/sys/bus/iio/devices/iio:deviceX/current_timestamp_clock

KernelVersion:	4.5

Contact:	linux-iio@vger.kernel.org

Description:

Makefile

+10 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

VERSION = 4

PATCHLEVEL = 14

SUBLEVEL = 30

SUBLEVEL = 32

EXTRAVERSION =

NAME = Petit Gorille
@@ -831,6 +831,15 @@ KBUILD_CFLAGS += $(call cc-disable-warning, pointer-sign) 
# disable invalid "can't wrap" optimizations for signed / pointers

KBUILD_CFLAGS	+= $(call cc-option,-fno-strict-overflow)



# clang sets -fmerge-all-constants by default as optimization, but this

# is non-conforming behavior for C and in fact breaks the kernel, so we

# need to disable it here generally.

KBUILD_CFLAGS	+= $(call cc-option,-fno-merge-all-constants)



# for gcc -fno-merge-all-constants disables everything, but it is fine

# to have actual conforming behavior enabled.

KBUILD_CFLAGS	+= $(call cc-option,-fmerge-constants)



# Make sure -fstack-check isn't enabled (like gentoo apparently did)

KBUILD_CFLAGS  += $(call cc-option,-fno-stack-check,)

arch/arm64/Makefile

+4 −1
Original line number Diff line number Diff line
@@ -162,7 +162,10 @@ dtbs: prepare scripts 
dtbs_install:

	$(Q)$(MAKE) $(dtbinst)=$(boot)/dts



Image-dtb Image.gz-dtb: vmlinux scripts dtbs

Image-dtb: vmlinux scripts dtbs

	$(Q)$(MAKE) $(build)=$(boot) $(boot)/$@



Image.gz-dtb: vmlinux scripts dtbs Image.gz

	$(Q)$(MAKE) $(build)=$(boot) $(boot)/$@



PHONY += vdso_install

arch/arm64/mm/mmu.c

+10 −0
Original line number Diff line number Diff line
@@ -975,3 +975,13 @@ int pmd_clear_huge(pmd_t *pmd) 
	pmd_clear(pmd);

	return 1;

}



int pud_free_pmd_page(pud_t *pud)

{

	return pud_none(*pud);

}



int pmd_free_pte_page(pmd_t *pmd)

{

	return pmd_none(*pmd);

}

arch/h8300/include/asm/byteorder.h

+0 −1
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
#ifndef __H8300_BYTEORDER_H__

#define __H8300_BYTEORDER_H__



#define __BIG_ENDIAN __ORDER_BIG_ENDIAN__

#include <linux/byteorder/big_endian.h>



#endif