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

Unverified Commit 881204ad authored by derfelot's avatar derfelot
Browse files

Merge Linux 4.4.255 kernel 

Changes in 4.4.255: (29 commits)
        ACPI: sysfs: Prefer "compatible" modalias
        wext: fix NULL-ptr-dereference with cfg80211's lack of commit()
        net: usb: qmi_wwan: added support for Thales Cinterion PLSx3 modem family
        KVM: x86/pmu: Fix HW_REF_CPU_CYCLES event pseudo-encoding in intel_arch_events[]
        mt7601u: fix kernel crash unplugging the device
        mt7601u: fix rx buffer refcounting
        y2038: futex: Move compat implementation into futex.c
        futex: Move futex exit handling into futex code
        futex: Replace PF_EXITPIDONE with a state
        exit/exec: Seperate mm_release()
        futex: Split futex_mm_release() for exit/exec
        futex: Set task::futex_state to DEAD right after handling futex exit
        futex: Mark the begin of futex exit explicitly
        futex: Sanitize exit state handling
        futex: Provide state handling for exec() as well
        futex: Add mutex around futex exit
        futex: Provide distinct return value when owner is exiting
        futex: Prevent exit livelock
        ARM: imx: build suspend-imx6.S with arm instruction set
        netfilter: nft_dynset: add timeout extension to template
        xfrm: Fix oops in xfrm_replay_advance_bmp
        RDMA/cxgb4: Fix the reported max_recv_sge value
        mac80211: pause TX while changing interface type
        can: dev: prevent potential information leak in can_fill_info()
        iommu/vt-d: Gracefully handle DMAR units with no supported address widths
        iommu/vt-d: Don't dereference iommu_device if IOMMU_API is not built
        NFC: fix resource leak when target index is invalid
        NFC: fix possible resource leak
        Linux 4.4.255

Conflicts:
	kernel/exit.c
parents 31d14f89 2f9c581d

Makefile

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

PATCHLEVEL = 4

SUBLEVEL = 254

SUBLEVEL = 255

EXTRAVERSION =

NAME = Blurry Fish Butt

arch/arm/mach-imx/suspend-imx6.S

+1 −0
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ 
#define MX6Q_CCM_CCR	0x0



	.align 3

	.arm



	.macro  sync_l2_cache

arch/x86/kvm/pmu_intel.c

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ static struct kvm_event_hw_type_mapping intel_arch_events[] = { 
	[4] = { 0x2e, 0x41, PERF_COUNT_HW_CACHE_MISSES },

	[5] = { 0xc4, 0x00, PERF_COUNT_HW_BRANCH_INSTRUCTIONS },

	[6] = { 0xc5, 0x00, PERF_COUNT_HW_BRANCH_MISSES },

	[7] = { 0x00, 0x30, PERF_COUNT_HW_REF_CPU_CYCLES },

	[7] = { 0x00, 0x03, PERF_COUNT_HW_REF_CPU_CYCLES },

};



/* mapping between fixed pmc index and intel_arch_events array */

drivers/acpi/device_sysfs.c

+6 −14
Original line number Diff line number Diff line
@@ -259,20 +259,12 @@ int __acpi_device_uevent_modalias(struct acpi_device *adev, 
	if (add_uevent_var(env, "MODALIAS="))

		return -ENOMEM;



	len = create_pnp_modalias(adev, &env->buf[env->buflen - 1],

				  sizeof(env->buf) - env->buflen);

	if (len < 0)

		return len;



	env->buflen += len;

	if (!adev->data.of_compatible)

		return 0;



	if (len > 0 && add_uevent_var(env, "MODALIAS="))

		return -ENOMEM;



	if (adev->data.of_compatible)

		len = create_of_modalias(adev, &env->buf[env->buflen - 1],

					 sizeof(env->buf) - env->buflen);

	else

		len = create_pnp_modalias(adev, &env->buf[env->buflen - 1],

					  sizeof(env->buf) - env->buflen);

	if (len < 0)

		return len;

drivers/infiniband/hw/cxgb4/qp.c

+1 −1
Original line number Diff line number Diff line
@@ -1898,7 +1898,7 @@ int c4iw_ib_query_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr, 
	init_attr->cap.max_send_wr = qhp->attr.sq_num_entries;

	init_attr->cap.max_recv_wr = qhp->attr.rq_num_entries;

	init_attr->cap.max_send_sge = qhp->attr.sq_max_sges;

	init_attr->cap.max_recv_sge = qhp->attr.sq_max_sges;

	init_attr->cap.max_recv_sge = qhp->attr.rq_max_sges;

	init_attr->cap.max_inline_data = T4_MAX_SEND_INLINE;

	init_attr->sq_sig_type = qhp->sq_sig_all ? IB_SIGNAL_ALL_WR : 0;

	return 0;