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

Commit 23b839a4 authored by Todd Kjos's avatar Todd Kjos
Browse files

resolve merge conflicts of 8fed8fc1 to android-4.4 

Change-Id: I743e23d01785febb1e6285e8ebfcf80a488917c5
parents 9ead9314 8a16224b

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 9

SUBLEVEL = 15

SUBLEVEL = 16

EXTRAVERSION =

NAME = Roaring Lionus

drivers/infiniband/hw/mlx5/main.c

+9 −5
Original line number Diff line number Diff line
@@ -3141,9 +3141,11 @@ static void *mlx5_ib_add(struct mlx5_core_dev *mdev) 
	if (err)

		goto err_rsrc;



	if (MLX5_CAP_GEN(dev->mdev, max_qp_cnt)) {

		err = mlx5_ib_alloc_q_counters(dev);

		if (err)

			goto err_odp;

	}



	err = ib_register_device(&dev->ib_dev, NULL);

	if (err)
@@ -3171,6 +3173,7 @@ static void *mlx5_ib_add(struct mlx5_core_dev *mdev) 
	ib_unregister_device(&dev->ib_dev);



err_q_cnt:

	if (MLX5_CAP_GEN(dev->mdev, max_qp_cnt))

		mlx5_ib_dealloc_q_counters(dev);



err_odp:
@@ -3201,6 +3204,7 @@ static void mlx5_ib_remove(struct mlx5_core_dev *mdev, void *context) 


	mlx5_remove_roce_notifier(dev);

	ib_unregister_device(&dev->ib_dev);

	if (MLX5_CAP_GEN(dev->mdev, max_qp_cnt))

		mlx5_ib_dealloc_q_counters(dev);

	destroy_umrc_res(dev);

	mlx5_ib_odp_remove_one(dev);

fs/ext4/inode.c

+1 −2
Original line number Diff line number Diff line
@@ -3879,8 +3879,7 @@ static int ext4_block_truncate_page(handle_t *handle, 
	unsigned blocksize;

	struct inode *inode = mapping->host;



	/* If we are processing an encrypted inode during orphan list

	 * handling */

	/* If we are processing an encrypted inode during orphan list handling */

	if (ext4_encrypted_inode(inode) && !fscrypt_has_encryption_key(inode))

		return 0;