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

Commit fb6faf04 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 4.14.19 into android-4.14 



Changes in 4.14.19
	.gitignore: sort normal pattern rules alphabetically
	.gitignore: move *.dtb and *.dtb.S patterns to the top-level .gitignore
	kbuild: rpm-pkg: keep spec file until make mrproper
	ip6mr: fix stale iterator
	net: igmp: add a missing rcu locking section
	qlcnic: fix deadlock bug
	qmi_wwan: Add support for Quectel EP06
	r8169: fix RTL8168EP take too long to complete driver initialization.
	tcp: release sk_frag.page in tcp_disconnect
	vhost_net: stop device during reset owner
	Revert "defer call to mem_cgroup_sk_alloc()"
	net: ipv6: send unsolicited NA after DAD
	rocker: fix possible null pointer dereference in rocker_router_fib_event_work
	tcp_bbr: fix pacing_gain to always be unity when using lt_bw
	ipv6: Fix SO_REUSEPORT UDP socket with implicit sk_ipv6only
	soreuseport: fix mem leak in reuseport_add_sock()
	media: mtk-vcodec: add missing MODULE_LICENSE/DESCRIPTION
	media: soc_camera: soc_scale_crop: add missing MODULE_DESCRIPTION/AUTHOR/LICENSE
	crypto: tcrypt - fix S/G table for test_aead_speed()
	arch: define weak abort()
	kernel/exit.c: export abort() to modules
	scsi: storvsc: missing error code in storvsc_probe()
	Revert "x86/alternative: Print unadorned pointers"
	Linux 4.14.19

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 6150ee7b 1722fe37

.gitignore

+28 −21
Original line number Original line Diff line number Diff line
@@ -7,38 +7,40 @@ 
# command after changing this file, to see if there are

# command after changing this file, to see if there are

# any tracked files which get ignored after the change.

# any tracked files which get ignored after the change.

#

#

# Normal rules

# Normal rules (sorted alphabetically)

#

#

.*

.*

*.a

*.bin

*.bz2

*.c.[012]*.*

*.dtb

*.dtb.S

*.dwo

*.elf

*.gcno

*.gz

*.i

*.ko

*.ll

*.lst

*.lz4

*.lzma

*.lzo

*.mod.c

*.o

*.o

*.o.*

*.o.*

*.a

*.order

*.patch

*.s

*.s

*.ko

*.so

*.so

*.so.dbg

*.so.dbg

*.mod.c

*.su

*.i

*.lst

*.symtypes

*.symtypes

*.order

*.elf

*.bin

*.tar

*.tar

*.gz

*.bz2

*.lzma

*.xz

*.xz

*.lz4

*.lzo

*.patch

*.gcno

*.ll

modules.builtin

Module.symvers

Module.symvers

*.dwo

modules.builtin

*.su

*.c.[012]*.*





#

#

# Top-level generic files

# Top-level generic files
@@ -53,6 +55,11 @@ Module.symvers 
/System.map

/System.map

/Module.markers

/Module.markers





#

# RPM spec file (make rpm-pkg)

#

/*.spec



#

#

# Debian directory (make deb-pkg)

# Debian directory (make deb-pkg)

#

#

Makefile

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

# SPDX-License-Identifier: GPL-2.0

VERSION = 4

VERSION = 4

PATCHLEVEL = 14

PATCHLEVEL = 14

SUBLEVEL = 18

SUBLEVEL = 19

EXTRAVERSION =

EXTRAVERSION =

NAME = Petit Gorille

NAME = Petit Gorille

arch/arc/boot/.gitignore

+0 −1
Original line number Original line Diff line number Diff line 
*.dtb*

uImage
 
uImage

arch/arm/boot/.gitignore

+0 −2
Original line number Original line Diff line number Diff line
@@ -3,5 +3,3 @@ zImage 
xipImage

xipImage

bootpImage

bootpImage

uImage
 
uImage
 
*.dtb

zImage-dtb
 
 No newline at end of file

arch/arm/kernel/traps.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -790,7 +790,6 @@ void abort(void) 
	/* if that doesn't kill us, halt */

	/* if that doesn't kill us, halt */

	panic("Oops failed to kill thread");

	panic("Oops failed to kill thread");

}

}

EXPORT_SYMBOL(abort);





void __init trap_init(void)

void __init trap_init(void)

{

{