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

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

Merge branch 'android11-5.4' into 'android11-5.4-lts' 



Sync up with android11-5.4 for the following commits:

459ed28f BACKPORT: ext4: don't BUG if someone dirty pages without asking ext4 first
a894c2e4 ANDROID: incremental-fs: limit mount stack depth
cab636f0 Revert "ANDROID: dm-bow: Protect Ranges fetched and erased from the RB tree"
9e366537 ANDROID: usb: gadget: f_accessory: add compat_ioctl support
55f3c636 UPSTREAM: sr9700: sanity check for packet length
ea62106b ANDROID: ABI: update allowed list for galaxy
4581cd01 ANDROID: GKI: Add symbol list for Zebra
67a04462 UPSTREAM: Revert "xfrm: state and policy should fail if XFRMA_IF_ID 0"
598165f1 UPSTREAM: usb: gadget: clear related members when goto fail
9901d8bd UPSTREAM: usb: gadget: don't release an existing dev->buf

Change-Id: I069190826ae1e15e32719984e4a92ff90a5721a9
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 4bd8a3c0 459ed28f

android/abi_gki_aarch64.xml

+117638 −114145

File changed.

Preview size limit exceeded, changes collapsed.

android/abi_gki_aarch64_galaxy

+1 −0
Original line number Diff line number Diff line
@@ -167,6 +167,7 @@ 
  __tracepoint_device_pm_callback_end

  __tracepoint_device_pm_callback_start

  __tracepoint_gpu_mem_total

  __tracepoint_kfree_skb

  __tracepoint_pelt_cfs_tp

  __tracepoint_suspend_resume

  __tty_alloc_driver

android/abi_gki_aarch64_zebra

0 → 100644
+8 −0
Original line number Diff line number Diff line 
[abi_symbol_list]

# commonly used symbols



# for wifi

  mmc_sw_reset

  nla_reserve

  nla_append

  prandom_seed

build.config.gki.aarch64

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ android/abi_gki_aarch64_sunxi 
android/abi_gki_aarch64_unisoc

android/abi_gki_aarch64_vivo

android/abi_gki_aarch64_xiaomi

android/abi_gki_aarch64_zebra

"

TRIM_NONLISTED_KMI=1

KMI_SYMBOL_LIST_ADD_ONLY=1

drivers/md/dm-bow.c

+4 −13
Original line number Diff line number Diff line
@@ -236,7 +236,6 @@ static void set_type(struct bow_context *bc, struct bow_range **br, int type) 


	(*br)->type = type;



	mutex_lock(&bc->ranges_lock);

	if (next->type == type) {

		if (type == TRIMMED)

			list_del(&next->trimmed_list);
@@ -250,7 +249,6 @@ static void set_type(struct bow_context *bc, struct bow_range **br, int type) 
		rb_erase(&(*br)->node, &bc->ranges);

		kfree(*br);

	}

	mutex_unlock(&bc->ranges_lock);



	*br = NULL;

}
@@ -601,7 +599,6 @@ static void dm_bow_dtr(struct dm_target *ti) 
	struct bow_context *bc = (struct bow_context *) ti->private;

	struct kobject *kobj;



	mutex_lock(&bc->ranges_lock);

	while (rb_first(&bc->ranges)) {

		struct bow_range *br = container_of(rb_first(&bc->ranges),

						    struct bow_range, node);
@@ -609,8 +606,6 @@ static void dm_bow_dtr(struct dm_target *ti) 
		rb_erase(&br->node, &bc->ranges);

		kfree(br);

	}

	mutex_unlock(&bc->ranges_lock);



	if (bc->workqueue)

		destroy_workqueue(bc->workqueue);

	if (bc->bufio)
@@ -1187,7 +1182,6 @@ static void dm_bow_tablestatus(struct dm_target *ti, char *result, 
		return;

	}



	mutex_lock(&bc->ranges_lock);

	for (i = rb_first(&bc->ranges); i; i = rb_next(i)) {

		struct bow_range *br = container_of(i, struct bow_range, node);
@@ -1195,11 +1189,11 @@ static void dm_bow_tablestatus(struct dm_target *ti, char *result, 
				    readable_type[br->type],

				    (unsigned long long)br->sector);

		if (result >= end)

			goto unlock;

			return;



		result += scnprintf(result, end - result, "\n");

		if (result >= end)

			goto unlock;

			return;



		if (br->type == TRIMMED)

			++trimmed_range_count;
@@ -1221,22 +1215,19 @@ static void dm_bow_tablestatus(struct dm_target *ti, char *result, 
		if (!rb_next(i)) {

			scnprintf(result, end - result,

				  "\nERROR: Last range not of type TOP");

			goto unlock;

			return;

		}



		if (br->sector > range_top(br)) {

			scnprintf(result, end - result,

				  "\nERROR: sectors out of order");

			goto unlock;

			return;

		}

	}



	if (trimmed_range_count != trimmed_list_length)

		scnprintf(result, end - result,

			  "\nERROR: not all trimmed ranges in trimmed list");



unlock:

	mutex_unlock(&bc->ranges_lock);

}



static void dm_bow_status(struct dm_target *ti, status_type_t type,