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

Commit 00a5539a authored by Srinivasarao P's avatar Srinivasarao P
Browse files

Merge android-4.4.101 (f0b9d2d0) into msm-4.4 



* refs/heads/tmp-f0b9d2d0
  Linux 4.4.101
  mm/pagewalk.c: report holes in hugetlb ranges
  mm/page_ext.c: check if page_ext is not prepared
  mm: check the return value of lookup_page_ext for all call sites
  coda: fix 'kernel memory exposure attempt' in fsync
  mm/page_alloc.c: broken deferred calculation
  ipmi: fix unsigned long underflow
  ocfs2: should wait dio before inode lock in ocfs2_setattr()
  nvme: Fix memory order on async queue deletion
  arm64: fix dump_instr when PAN and UAO are in use
  serial: omap: Fix EFR write on RTS deassertion
  ima: do not update security.ima if appraisal status is not INTEGRITY_PASS
  net/sctp: Always set scope_id in sctp_inet6_skb_msgname
  fealnx: Fix building error on MIPS
  sctp: do not peel off an assoc from one netns to another one
  af_netlink: ensure that NLMSG_DONE never fails in dumps
  vlan: fix a use-after-free in vlan_device_event()
  bonding: discard lowest hash bit for 802.3ad layer3+4
  netfilter/ipvs: clear ipvs_property flag when SKB net namespace changed
  tcp: do not mangle skb->cb[] in tcp_make_synack()

Conflicts:
	mm/debug-pagealloc.c
	mm/page_ext.c
	mm/page_owner.c

Change-Id: I551aff1b4c8a0d72f64a234abb8ac88990fbc9e5
Signed-off-by: default avatarSrinivasarao P <spathi@codeaurora.org>
parents f373da75 f0b9d2d0

Makefile

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

PATCHLEVEL = 4

SUBLEVEL = 100

SUBLEVEL = 101

EXTRAVERSION =

NAME = Blurry Fish Butt

drivers/char/ipmi/ipmi_msghandler.c

+6 −4
Original line number Diff line number Diff line
@@ -4029,7 +4029,8 @@ smi_from_recv_msg(ipmi_smi_t intf, struct ipmi_recv_msg *recv_msg, 
}



static void check_msg_timeout(ipmi_smi_t intf, struct seq_table *ent,

			      struct list_head *timeouts, long timeout_period,

			      struct list_head *timeouts,

			      unsigned long timeout_period,

			      int slot, unsigned long *flags,

			      unsigned int *waiting_msgs)

{
@@ -4042,8 +4043,8 @@ static void check_msg_timeout(ipmi_smi_t intf, struct seq_table *ent, 
	if (!ent->inuse)

		return;



	if (timeout_period < ent->timeout) {

		ent->timeout -= timeout_period;

	if (ent->timeout > 0) {

		(*waiting_msgs)++;

		return;

	}
@@ -4109,7 +4110,8 @@ static void check_msg_timeout(ipmi_smi_t intf, struct seq_table *ent, 
	}

}



static unsigned int ipmi_timeout_handler(ipmi_smi_t intf, long timeout_period)

static unsigned int ipmi_timeout_handler(ipmi_smi_t intf,

					 unsigned long timeout_period)

{

	struct list_head     timeouts;

	struct ipmi_recv_msg *msg, *msg2;

drivers/net/bonding/bond_main.c

+1 −1
Original line number Diff line number Diff line
@@ -3166,7 +3166,7 @@ u32 bond_xmit_hash(struct bonding *bond, struct sk_buff *skb) 
	hash ^= (hash >> 16);

	hash ^= (hash >> 8);



	return hash;

	return hash >> 1;

}



/*-------------------------- Device entry points ----------------------------*/

drivers/net/ethernet/fealnx.c

+3 −3
Original line number Diff line number Diff line
@@ -257,8 +257,8 @@ enum rx_desc_status_bits { 
	RXFSD = 0x00000800,	/* first descriptor */

	RXLSD = 0x00000400,	/* last descriptor */

	ErrorSummary = 0x80,	/* error summary */

	RUNT = 0x40,		/* runt packet received */

	LONG = 0x20,		/* long packet received */

	RUNTPKT = 0x40,		/* runt packet received */

	LONGPKT = 0x20,		/* long packet received */

	FAE = 0x10,		/* frame align error */

	CRC = 0x08,		/* crc error */

	RXER = 0x04,		/* receive error */
@@ -1633,7 +1633,7 @@ static int netdev_rx(struct net_device *dev) 
					       dev->name, rx_status);



				dev->stats.rx_errors++;	/* end of a packet. */

				if (rx_status & (LONG | RUNT))

				if (rx_status & (LONGPKT | RUNTPKT))

					dev->stats.rx_length_errors++;

				if (rx_status & RXER)

					dev->stats.rx_frame_errors++;

drivers/nvme/host/pci.c

+1 −1
Original line number Diff line number Diff line
@@ -350,8 +350,8 @@ static void async_completion(struct nvme_queue *nvmeq, void *ctx, 
	struct async_cmd_info *cmdinfo = ctx;

	cmdinfo->result = le32_to_cpup(&cqe->result);

	cmdinfo->status = le16_to_cpup(&cqe->status) >> 1;

	queue_kthread_work(cmdinfo->worker, &cmdinfo->work);

	blk_mq_free_request(cmdinfo->req);

	queue_kthread_work(cmdinfo->worker, &cmdinfo->work);

}



static inline struct nvme_cmd_info *get_cmd_from_tag(struct nvme_queue *nvmeq,