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

Commit 65d414cb 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:

05cd3c59 ANDROID: distribute Module.symvers
6eea8a6d UPSTREAM: usb: max-3421: Prevent corruption of freed memory
f625f1b3 ANDROID: ABI: Update allowed list for QCOM
d7aa701a UPSTREAM: driver core: Prevent warning when removing a device link from unregistered consumer
2e30052a UPSTREAM: udp: properly flush normal packet at GRO time
833c1e23 UPSTREAM: net/xfrm/compat: Copy xfrm_spdattr_type_t atributes
a95d35ae UPSTREAM: f2fs: Advertise encrypted casefolding in sysfs
8557d5a8 UPSTREAM: loop: Fix missing discard support when using LOOP_CONFIGURE
d0cca8a1 UPSTREAM: thermal/drivers/sprd: Add missing MODULE_DEVICE_TABLE
ba83fe23 UPSTREAM: nvmem: sprd: Fix an error message
98e9d16b UPSTREAM: usb: musb: Fix an error message
ace71bcb UPSTREAM: scsi: ufs: core: Cancel rpm_dev_flush_recheck_work during system suspend
dc5ccc2d UPSTREAM: scsi: ufs: core: Do not put UFS power into LPM if link is broken
5576e5e4 UPSTREAM: selinux: add proper NULL termination to the secclass_map permissions
f87a97cd UPSTREAM: of: property: fw_devlink: do not link ".*,nr-gpios"
751aaf9f UPSTREAM: udp: never accept GSO_FRAGLIST packets
01228292 UPSTREAM: udp: skip L4 aggregation for UDP tunnel packets
13ab504b UPSTREAM: xfrm/compat: Cleanup WARN()s that can be user-triggered
236d4169 UPSTREAM: pinctrl: sunxi: fix irq bank map for the Allwinner A100 pin controller
4f031c89 UPSTREAM: loop: Set correct device size when using LOOP_CONFIGURE
38866fe5 UPSTREAM: loop: unset GENHD_FL_NO_PART_SCAN on LOOP_CONFIGURE
c0609612 ANDROID: ion_system_heap: Add __GFP_NOWARN to mid-order allocations
77e911a1 ANDROID: drivers: gpu: drm: increase the MAX_DRM_OPEN_COUNT
0923d5c1 UPSTREAM: af_unix: fix garbage collect vs MSG_PEEK

Change-Id: I91712c50821a00aea9165ca5497cead9ade766e6
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents ffab1c7d 05cd3c59

android/abi_gki_aarch64_qcom

+1 −0
Original line number Diff line number Diff line
@@ -431,6 +431,7 @@ 
  devm_kmemdup

  devm_kstrdup

  devm_led_classdev_register_ext

  devm_mbox_controller_register

  devm_nvmem_cell_get

  devm_nvmem_device_get

  devm_nvmem_register

build.config.aarch64

+1 −0
Original line number Diff line number Diff line
@@ -11,4 +11,5 @@ arch/arm64/boot/Image.gz 
arch/arm64/boot/Image

vmlinux

System.map

Module.symvers

"

build.config.x86_64

+1 −0
Original line number Diff line number Diff line
@@ -8,4 +8,5 @@ FILES=" 
arch/x86/boot/bzImage

vmlinux

System.map

Module.symvers

"

drivers/base/core.c

+4 −2
Original line number Diff line number Diff line
@@ -425,8 +425,10 @@ static void devlink_remove_symlinks(struct device *dev, 
		return;

	}



	if (device_is_registered(con)) {

		snprintf(buf, len, "supplier:%s", dev_name(sup));

		sysfs_remove_link(&con->kobj, buf);

	}

	snprintf(buf, len, "consumer:%s", dev_name(con));

	sysfs_remove_link(&sup->kobj, buf);

	kfree(buf);

drivers/block/loop.c

+5 −2
Original line number Diff line number Diff line
@@ -1113,8 +1113,6 @@ static int loop_configure(struct loop_device *lo, fmode_t mode, 
	mapping = file->f_mapping;

	inode = mapping->host;



	size = get_loop_size(lo, file);



	if ((config->info.lo_flags & ~LOOP_CONFIGURE_SETTABLE_FLAGS) != 0) {

		error = -EINVAL;

		goto out_unlock;
@@ -1163,9 +1161,12 @@ static int loop_configure(struct loop_device *lo, fmode_t mode, 
	blk_queue_physical_block_size(lo->lo_queue, bsize);

	blk_queue_io_min(lo->lo_queue, bsize);



	loop_config_discard(lo);

	loop_update_rotational(lo);

	loop_update_dio(lo);

	loop_sysfs_init(lo);



	size = get_loop_size(lo, file);

	loop_set_size(lo, size);



	set_blocksize(bdev, S_ISBLK(inode->i_mode) ?
@@ -1175,6 +1176,8 @@ static int loop_configure(struct loop_device *lo, fmode_t mode, 
	if (part_shift)

		lo->lo_flags |= LO_FLAGS_PARTSCAN;

	partscan = lo->lo_flags & LO_FLAGS_PARTSCAN;

	if (partscan)

		lo->lo_disk->flags &= ~GENHD_FL_NO_PART_SCAN;



	/* Grab the block_device to prevent its destruction after we

	 * put /dev/loopXX inode. Later in __loop_clr_fd() we bdput(bdev).