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

Commit 8bf251c0 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge a341edbc on remote branch

Change-Id: I978b140f94c7fbc61077ef225a6d3830022455b9
parents ea45b4c7 a341edbc
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -3002,10 +3002,10 @@
		65 = /dev/infiniband/issm1     Second InfiniBand IsSM device
		  ...
		127 = /dev/infiniband/issm63    63rd InfiniBand IsSM device
		128 = /dev/infiniband/uverbs0   First InfiniBand verbs device
		129 = /dev/infiniband/uverbs1   Second InfiniBand verbs device
		192 = /dev/infiniband/uverbs0   First InfiniBand verbs device
		193 = /dev/infiniband/uverbs1   Second InfiniBand verbs device
		  ...
		159 = /dev/infiniband/uverbs31  31st InfiniBand verbs device
		223 = /dev/infiniband/uverbs31  31st InfiniBand verbs device

 232 char	Biometric Devices
		0 = /dev/biometric/sensor0/fingerprint	first fingerprint sensor on first device
+7 −0
Original line number Diff line number Diff line
@@ -5495,6 +5495,13 @@
			as generic guest with no PV drivers. Currently support
			XEN HVM, KVM, HYPER_V and VMWARE guest.

	xen.balloon_boot_timeout= [XEN]
			The time (in seconds) to wait before giving up to boot
			in case initial ballooning fails to free enough memory.
			Applies only when running as HVM or PVH guest and
			started with less memory configured than allowed at
			max. Default is 180.

	xen.event_eoi_delay=	[XEN]
			How long to delay EOI handling in case of event
			storms (jiffies). Default is 10.
+1 −1
Original line number Diff line number Diff line
# SPDX-License-Identifier: GPL-2.0
VERSION = 5
PATCHLEVEL = 4
SUBLEVEL = 147
SUBLEVEL = 161
EXTRAVERSION =
NAME = Kleptomaniac Octopus

+1 −1
Original line number Diff line number Diff line
LTS_5.4.147_f2bbf1b7baa5
LTS_5.4.161_b9d179c605d3
Loading