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

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

Merge 4.19.172 into android-4.19-stable 



Changes in 4.19.172
	gpio: mvebu: fix pwm .get_state period calculation
	Revert "mm/slub: fix a memory leak in sysfs_slab_add()"
	futex: Move futex exit handling into futex code
	futex: Replace PF_EXITPIDONE with a state
	exit/exec: Seperate mm_release()
	futex: Split futex_mm_release() for exit/exec
	futex: Set task::futex_state to DEAD right after handling futex exit
	futex: Mark the begin of futex exit explicitly
	futex: Sanitize exit state handling
	futex: Provide state handling for exec() as well
	futex: Add mutex around futex exit
	futex: Provide distinct return value when owner is exiting
	futex: Prevent exit livelock
	futex: Ensure the correct return value from futex_lock_pi()
	futex: Replace pointless printk in fixup_owner()
	futex: Provide and use pi_state_update_owner()
	rtmutex: Remove unused argument from rt_mutex_proxy_unlock()
	futex: Use pi_state_update_owner() in put_pi_state()
	futex: Simplify fixup_pi_state_owner()
	futex: Handle faults correctly for PI futexes
	HID: wacom: Correct NULL dereference on AES pen proximity
	tracing: Fix race in trace_open and buffer resize call
	tools: Factor HOSTCC, HOSTLD, HOSTAR definitions
	dm integrity: conditionally disable "recalculate" feature
	writeback: Drop I_DIRTY_TIME_EXPIRE
	fs: fix lazytime expiration handling in __writeback_single_inode()
	Linux 4.19.172

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I9b5391e9e955a105ab9c144fa6258dcbea234211
parents d47298cd 811218ec

Documentation/device-mapper/dm-integrity.txt

+7 −0
Original line number Diff line number Diff line
@@ -146,6 +146,13 @@ block_size:number 
	Supported values are 512, 1024, 2048 and 4096 bytes.  If not

	specified the default block size is 512 bytes.



legacy_recalculate

	Allow recalculating of volumes with HMAC keys. This is disabled by

	default for security reasons - an attacker could modify the volume,

	set recalc_sector to zero, and the kernel would not detect the

	modification.





The journal mode (D/J), buffer_sectors, journal_watermark, commit_time can

be changed when reloading the target (load an inactive table and swap the

tables with suspend and resume). The other arguments should not be changed

Makefile

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

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 171

SUBLEVEL = 172

EXTRAVERSION =

NAME = "People's Front"

drivers/gpio/gpio-mvebu.c

+10 −15
Original line number Diff line number Diff line
@@ -650,9 +650,8 @@ static void mvebu_pwm_get_state(struct pwm_chip *chip, 


	spin_lock_irqsave(&mvpwm->lock, flags);



	val = (unsigned long long)

		readl_relaxed(mvebu_pwmreg_blink_on_duration(mvpwm));

	val *= NSEC_PER_SEC;

	u = readl_relaxed(mvebu_pwmreg_blink_on_duration(mvpwm));

	val = (unsigned long long) u * NSEC_PER_SEC;

	do_div(val, mvpwm->clk_rate);

	if (val > UINT_MAX)

		state->duty_cycle = UINT_MAX;
@@ -661,21 +660,17 @@ static void mvebu_pwm_get_state(struct pwm_chip *chip, 
	else

		state->duty_cycle = 1;



	val = (unsigned long long)

		readl_relaxed(mvebu_pwmreg_blink_off_duration(mvpwm));

	val = (unsigned long long) u; /* on duration */

	/* period = on + off duration */

	val += readl_relaxed(mvebu_pwmreg_blink_off_duration(mvpwm));

	val *= NSEC_PER_SEC;

	do_div(val, mvpwm->clk_rate);

	if (val < state->duty_cycle) {

		state->period = 1;

	} else {

		val -= state->duty_cycle;

	if (val > UINT_MAX)

		state->period = UINT_MAX;

	else if (val)

		state->period = val;

	else

		state->period = 1;

	}



	regmap_read(mvchip->regs, GPIO_BLINK_EN_OFF + mvchip->offset, &u);

	if (u)

drivers/hid/wacom_sys.c

+4 −3
Original line number Diff line number Diff line
@@ -150,9 +150,9 @@ static int wacom_wac_pen_serial_enforce(struct hid_device *hdev, 
	}



	if (flush)

		wacom_wac_queue_flush(hdev, &wacom_wac->pen_fifo);

		wacom_wac_queue_flush(hdev, wacom_wac->pen_fifo);

	else if (insert)

		wacom_wac_queue_insert(hdev, &wacom_wac->pen_fifo,

		wacom_wac_queue_insert(hdev, wacom_wac->pen_fifo,

				       raw_data, report_size);



	return insert && !flush;
@@ -1251,7 +1251,7 @@ static void wacom_devm_kfifo_release(struct device *dev, void *res) 
static int wacom_devm_kfifo_alloc(struct wacom *wacom)

{

	struct wacom_wac *wacom_wac = &wacom->wacom_wac;

	struct kfifo_rec_ptr_2 *pen_fifo = &wacom_wac->pen_fifo;

	struct kfifo_rec_ptr_2 *pen_fifo;

	int error;



	pen_fifo = devres_alloc(wacom_devm_kfifo_release,
@@ -1268,6 +1268,7 @@ static int wacom_devm_kfifo_alloc(struct wacom *wacom) 
	}



	devres_add(&wacom->hdev->dev, pen_fifo);

	wacom_wac->pen_fifo = pen_fifo;



	return 0;

}

drivers/hid/wacom_wac.h

+1 −1
Original line number Diff line number Diff line
@@ -344,7 +344,7 @@ struct wacom_wac { 
	struct input_dev *pen_input;

	struct input_dev *touch_input;

	struct input_dev *pad_input;

	struct kfifo_rec_ptr_2 pen_fifo;

	struct kfifo_rec_ptr_2 *pen_fifo;

	int pid;

	int num_contacts_left;

	u8 bt_features;