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

Commit 8faa25f7 authored by Minming Qi's avatar Minming Qi
Browse files

Merge android-4.9.119 (92e87041) into msm-4.9 



* refs/heads/tmp-92e87041:
  Linux 4.9.119
  jfs: Fix inconsistency between memory allocation and ea_buf->max_size
  IB/hfi1: Fix incorrect mixing of ERR_PTR and NULL return values
  fork: unconditionally clear stack on fork
  kmemleak: clear stale pointers from task stacks
  tcp: add tcp_ooo_try_coalesce() helper
  Btrfs: fix file data corruption after cloning a range and fsync
  i2c: imx: Fix reinit_completion() use
  ring_buffer: tracing: Inherit the tracing setting to next ring buffer
  ACPI / PCI: Bail early in acpi_pci_add_bus() if there is no ACPI handle
  ext4: fix false negatives *and* false positives in ext4_check_descriptors()
  netlink: Don't shift on 64 for ngroups
  netlink: Don't shift with UB on nlk->ngroups
  netlink: Do not subscribe to non-existent groups
  nohz: Fix local_timer_softirq_pending()
  genirq: Make force irq threading setup more robust
  scsi: qla2xxx: Return error when TMF returns
  scsi: qla2xxx: Fix ISP recovery on unload
  ANDROID: uid_sys_stats: Copy task_struct comm field to bigger buffer

Change-Id: Ib0a5c864d13324ba71124b0bc7d4ff355e33a520
Signed-off-by: default avatarBlagovest Kolenichev <bkolenichev@codeaurora.org>
Signed-off-by: default avatarMinming Qi <mqi@codeaurora.org>
parents 03f9d771 92e87041

Makefile

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

PATCHLEVEL = 9

SUBLEVEL = 118

SUBLEVEL = 119

EXTRAVERSION =

NAME = Roaring Lionus

drivers/i2c/busses/i2c-imx.c

+1 −2
Original line number Diff line number Diff line
@@ -376,6 +376,7 @@ static int i2c_imx_dma_xfer(struct imx_i2c_struct *i2c_imx, 
		goto err_desc;

	}



	reinit_completion(&dma->cmd_complete);

	txdesc->callback = i2c_imx_dma_callback;

	txdesc->callback_param = i2c_imx;

	if (dma_submit_error(dmaengine_submit(txdesc))) {
@@ -619,7 +620,6 @@ static int i2c_imx_dma_write(struct imx_i2c_struct *i2c_imx, 
	 * The first byte must be transmitted by the CPU.

	 */

	imx_i2c_write_reg(msgs->addr << 1, i2c_imx, IMX_I2C_I2DR);

	reinit_completion(&i2c_imx->dma->cmd_complete);

	time_left = wait_for_completion_timeout(

				&i2c_imx->dma->cmd_complete,

				msecs_to_jiffies(DMA_TIMEOUT));
@@ -678,7 +678,6 @@ static int i2c_imx_dma_read(struct imx_i2c_struct *i2c_imx, 
	if (result)

		return result;



	reinit_completion(&i2c_imx->dma->cmd_complete);

	time_left = wait_for_completion_timeout(

				&i2c_imx->dma->cmd_complete,

				msecs_to_jiffies(DMA_TIMEOUT));

drivers/infiniband/hw/hfi1/rc.c

+1 −1
Original line number Diff line number Diff line
@@ -397,7 +397,7 @@ int hfi1_make_rc_req(struct rvt_qp *qp, struct hfi1_pkt_state *ps) 


	lockdep_assert_held(&qp->s_lock);

	ps->s_txreq = get_txreq(ps->dev, qp);

	if (IS_ERR(ps->s_txreq))

	if (!ps->s_txreq)

		goto bail_no_tx;



	ohdr = &ps->s_txreq->phdr.hdr.u.oth;

drivers/infiniband/hw/hfi1/uc.c

+2 −2
Original line number Diff line number Diff line 
/*

 * Copyright(c) 2015, 2016 Intel Corporation.

 * Copyright(c) 2015 - 2018 Intel Corporation.

 *

 * This file is provided under a dual BSD/GPLv2 license.  When using or

 * redistributing this file, you may do so under either license.
@@ -72,7 +72,7 @@ int hfi1_make_uc_req(struct rvt_qp *qp, struct hfi1_pkt_state *ps) 
	int middle = 0;



	ps->s_txreq = get_txreq(ps->dev, qp);

	if (IS_ERR(ps->s_txreq))

	if (!ps->s_txreq)

		goto bail_no_tx;



	if (!(ib_rvt_state_ops[qp->state] & RVT_PROCESS_SEND_OK)) {

drivers/infiniband/hw/hfi1/ud.c

+2 −2
Original line number Diff line number Diff line 
/*

 * Copyright(c) 2015, 2016 Intel Corporation.

 * Copyright(c) 2015 - 2018 Intel Corporation.

 *

 * This file is provided under a dual BSD/GPLv2 license.  When using or

 * redistributing this file, you may do so under either license.
@@ -285,7 +285,7 @@ int hfi1_make_ud_req(struct rvt_qp *qp, struct hfi1_pkt_state *ps) 
	u8 sc5;



	ps->s_txreq = get_txreq(ps->dev, qp);

	if (IS_ERR(ps->s_txreq))

	if (!ps->s_txreq)

		goto bail_no_tx;



	if (!(ib_rvt_state_ops[qp->state] & RVT_PROCESS_NEXT_SEND_OK)) {