Skip to content

Commit ef4cb0a

Browse files
committed
LTS: Update to 4.14.348
This corresponds to 4.19.315 upstream (v4.19.314..v4.19.315). Signed-off-by: Vegard Nossum <[email protected]>
1 parent fb341e5 commit ef4cb0a

File tree

4 files changed

+91
-3
lines changed

4 files changed

+91
-3
lines changed

.elts/config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
upstream_repo: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
22
upstream_base: 4.19.304
33
base: 4.14.336
4-
upstream_version: 4.19.314
5-
version: 4.14.347
4+
upstream_version: 4.19.315
5+
version: 4.14.348

.elts/meta/4.14.348.yaml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
ebc7ed8686acc9ab4fc68b9c9ad601b094c37a9c:
2+
title: 'Revert "selftests: mm: fix map_hugetlb failure on 64K page size systems"'
3+
dcd987848b62bdf1bbc0a44b0af4d42c364e8d1e:
4+
title: 'dm: limit the number of targets and parameter size area'
5+
mainline: bd504bcfec41a503b32054da5472904b404341a4
6+
upstream: 1ddc0c3f4996c4ca1216ede1fa7699a803204590
7+
30741c3b9f4e080264a6b52a95391902a9b71108:
8+
title: 'btrfs: add missing mutex_unlock in btrfs_relocate_sys_chunks()'
9+
mainline: 9af503d91298c3f2945e73703f0e00995be08c30
10+
upstream: 6ffbcb3704046668ede6551b236960597d71a005
11+
1d8ba83736394d3167acb51f49623624d74ac1e0:
12+
title: 'serial: kgdboc: Fix NMI-safety problems from keyboard reset code'
13+
mainline: b2aba15ad6f908d1a620fd97f6af5620c3639742
14+
upstream: 512b9385201c7dec1b8d490711e9b578ae50525e
15+
fb341e5794b05a39dfaa8f073dc5a23072b09992:
16+
title: 'docs: kernel_include.py: Cope with docutils 0.21'
17+
mainline: d43ddd5c91802a46354fa4c4381416ef760676e2
18+
upstream: 4b431a786f0ca86614b2d00e17b313956d7ef035

.elts/upstream/4.19.315.yaml

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
aa62ab6ada92ba8780aa9355184720ee950242a7:
2+
title: 'Revert "selftests: mm: fix map_hugetlb failure on 64K page size systems"'
3+
1ddc0c3f4996c4ca1216ede1fa7699a803204590:
4+
title: 'dm: limit the number of targets and parameter size area'
5+
mainline: bd504bcfec41a503b32054da5472904b404341a4
6+
backport: dcd987848b62bdf1bbc0a44b0af4d42c364e8d1e
7+
6ffbcb3704046668ede6551b236960597d71a005:
8+
title: 'btrfs: add missing mutex_unlock in btrfs_relocate_sys_chunks()'
9+
mainline: 9af503d91298c3f2945e73703f0e00995be08c30
10+
backport: 30741c3b9f4e080264a6b52a95391902a9b71108
11+
e57b1e9a69dfc0cad4f338115a11ea676ec52447:
12+
title: 'tracing: Simplify creation and deletion of synthetic events'
13+
mainline: faacb361f271be4baf2d807e2eeaba87e059225f
14+
skipped: not applicable to 4.14
15+
7d00580499a839de612fa06340141c5ae1018fb2:
16+
title: 'tracing: Add unified dynamic event framework'
17+
mainline: 5448d44c38557fc15d1c53b608a9c9f0e1ca8f86
18+
skipped: not applicable to 4.14
19+
73b24eeb0eb3b349b33f8e2d8f5ef9c839b51fde:
20+
title: 'tracing: Use dyn_event framework for synthetic events'
21+
mainline: 7bbab38d07f3185fddf6fce126e2239010efdfce
22+
skipped: not applicable to 4.14
23+
8f7139ab2b533aa03c5c8b7cd5f3119405e605e7:
24+
title: 'tracing: Remove unneeded synth_event_mutex'
25+
mainline: 0e2b81f7b52a1c1a8c46986f9ca01eb7b3c421f8
26+
skipped: not applicable to 4.14
27+
13b957b785b0c58b99608c8b677368ed14e973ce:
28+
title: 'tracing: Consolidate trace_add/remove_event_call back to the nolock functions'
29+
mainline: 7e1413edd6194a9807aa5f3ac0378b9b4b9da879
30+
skipped: not applicable to 4.14
31+
1415e7a48bb2a4418495fa2c6d94bbcb0b23ff33:
32+
title: 'string.h: Add str_has_prefix() helper function'
33+
mainline: 72921427d46bf9731a1ab7864adc64c43dfae29f
34+
skipped: not applicable to 4.14
35+
03aacb9039bfd4ec096e6b2c91cd749242ed968e:
36+
title: 'tracing: Use str_has_prefix() helper for histogram code'
37+
mainline: 754481e6954cbef53f8bc4412ad48dde611e21d3
38+
skipped: not applicable to 4.14
39+
b2aba66d3117e19481a4ac2f7263b78e1a2f5d7e:
40+
title: 'tracing: Use str_has_prefix() instead of using fixed sizes'
41+
mainline: b6b2735514bcd70ad1556a33892a636b20ece671
42+
skipped: not applicable to 4.14
43+
647c999c9e03097855e64a409a297cef6422ab65:
44+
title: 'tracing: Have the historgram use the result of str_has_prefix() for len of prefix'
45+
mainline: 036876fa56204ae0fa59045bd6bbb2691a060633
46+
skipped: not applicable to 4.14
47+
5dc8fe9c75f4ad8dfadef2e269b6e8f67a75c330:
48+
title: 'tracing: Refactor hist trigger action code'
49+
mainline: 7d18a10c316783357fb1b2b649cfcf97c70a7bee
50+
skipped: not applicable to 4.14
51+
93b9409a082d1662b5ec8d5b6a6c47ab5dbecd9f:
52+
title: 'tracing: Split up onmatch action data'
53+
mainline: c3e49506a0f426a850675e39419879214060ca8b
54+
skipped: not applicable to 4.14
55+
19ff3696807411eb05a3ece07397416ddb6c8263:
56+
title: 'tracing: Generalize hist trigger onmax and save action'
57+
mainline: 466f4528fbc692ea56deca278fa6aeb79e6e8b21
58+
skipped: not applicable to 4.14
59+
3fe17266dba8f84e12758f1f6d057e733d2b52a8:
60+
title: 'tracing: Remove unnecessary var_ref destroy in track_data_destroy()'
61+
mainline: ff9d31d0d46672e201fc9ff59c42f1eef5f00c77
62+
skipped: not applicable to 4.14
63+
512b9385201c7dec1b8d490711e9b578ae50525e:
64+
title: 'serial: kgdboc: Fix NMI-safety problems from keyboard reset code'
65+
mainline: b2aba15ad6f908d1a620fd97f6af5620c3639742
66+
backport: 1d8ba83736394d3167acb51f49623624d74ac1e0
67+
4b431a786f0ca86614b2d00e17b313956d7ef035:
68+
title: 'docs: kernel_include.py: Cope with docutils 0.21'
69+
mainline: d43ddd5c91802a46354fa4c4381416ef760676e2
70+
backport: fb341e5794b05a39dfaa8f073dc5a23072b09992

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPDX-License-Identifier: GPL-2.0
22
VERSION = 4
33
PATCHLEVEL = 14
4-
SUBLEVEL = 347
4+
SUBLEVEL = 348
55
EXTRAVERSION = -openela
66
NAME = Petit Gorille
77

0 commit comments

Comments
 (0)