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

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

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

parents e14e9f4c 5ccf581b
Loading
Loading
Loading
Loading
+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)
#
+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

+0 −1
Original line number Diff line number Diff line
*.dtb*
uImage
+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
+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)
{
Loading