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

Commit 5ccf581b authored by Isaac J. Manjarres's avatar Isaac J. Manjarres
Browse files

Merge remote-tracking branch 'remotes/origin/tmp-fb6faf04' into msm-4.14 



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

Change-Id: I8ba1c4dd6e81b8babac222117c6fca8771d75ed7
Signed-off-by: default avatarIsaac J. Manjarres <isaacm@codeaurora.org>
parents 8887fcbe fb6faf04

.gitignore

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

# 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.*

*.a

*.order

*.patch

*.s

*.ko

*.so

*.so.dbg

*.mod.c

*.i

*.lst

*.su

*.symtypes

*.order

*.elf

*.bin

*.tar

*.gz

*.bz2

*.lzma

*.xz

*.lz4

*.lzo

*.patch

*.gcno

*.ll

modules.builtin

Module.symvers

*.dwo

*.su

*.c.[012]*.*

modules.builtin



#

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

/Module.markers



#

# RPM spec file (make rpm-pkg)

#

/*.spec



#

# Debian directory (make deb-pkg)

#

Makefile

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

VERSION = 4

PATCHLEVEL = 14

SUBLEVEL = 18

SUBLEVEL = 19

EXTRAVERSION =

NAME = Petit Gorille

arch/arc/boot/.gitignore

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

uImage

arch/arm/boot/.gitignore

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

bootpImage

uImage
 
*.dtb

zImage-dtb
 
 No newline at end of file

arch/arm/kernel/traps.c

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

	panic("Oops failed to kill thread");

}

EXPORT_SYMBOL(abort);



void __init trap_init(void)

{