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

Unverified Commit dbe2d851 authored by derfelot's avatar derfelot
Browse files

Merge Linux 4.4.297 kernel 

Changes in 4.4.297: (17 commits)
        net: usb: lan78xx: add Allied Telesis AT29M2-AF
        can: kvaser_usb: get CAN clock frequency from device
        HID: holtek: fix mouse probing
        IB/qib: Fix memory leak in qib_user_sdma_queue_pkts()
        qlcnic: potential dereference null pointer of rx_queue->page_ring
        bonding: fix ad_actor_system option setting to default
        drivers: net: smc911x: Check for error irq
        hwmon: (lm90) Fix usage of CONFIG2 register in detect function
        ALSA: jack: Check the return value of kstrdup()
        ALSA: drivers: opl3: Fix incorrect use of vp->state
        ARM: 9169/1: entry: fix Thumb2 bug in iWMMXt exception handling
        xen/blkfront: fix bug in backported patch
        ax25: NPD bug when detaching AX25 device
        hamradio: defer ax25 kfree after unregister_netdev
        hamradio: improve the incomplete fix to avoid NPD
        phonet/pep: refuse to enable an unbound pipe
        Linux 4.4.297
parents 12d8dcdf 76d42990

Documentation/networking/bonding.txt

+6 −5
Original line number Diff line number Diff line
@@ -191,11 +191,12 @@ ad_actor_sys_prio 
ad_actor_system



	In an AD system, this specifies the mac-address for the actor in

	protocol packet exchanges (LACPDUs). The value cannot be NULL or

	multicast. It is preferred to have the local-admin bit set for this

	mac but driver does not enforce it. If the value is not given then

	system defaults to using the masters' mac address as actors' system

	address.

	protocol packet exchanges (LACPDUs). The value cannot be a multicast

	address. If the all-zeroes MAC is specified, bonding will internally

	use the MAC of the bond itself. It is preferred to have the

	local-admin bit set for this mac but driver does not enforce it. If

	the value is not given then system defaults to using the masters'

	mac address as actors' system address.



	This parameter has effect only in 802.3ad mode and is available through

	SysFs interface.

Makefile

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

PATCHLEVEL = 4

SUBLEVEL = 296

SUBLEVEL = 297

EXTRAVERSION =

NAME = Blurry Fish Butt

arch/arm/kernel/entry-armv.S

+3 −5
Original line number Diff line number Diff line
@@ -625,11 +625,9 @@ call_fpe: 
	tstne	r0, #0x04000000			@ bit 26 set on both ARM and Thumb-2

	reteq	lr

	and	r8, r0, #0x00000f00		@ mask out CP number

 THUMB(	lsr	r8, r8, #8		)

	mov	r7, #1

	add	r6, r10, #TI_USED_CP

 ARM(	strb	r7, [r6, r8, lsr #8]	)	@ set appropriate used_cp[]

 THUMB(	strb	r7, [r6, r8]		)	@ set appropriate used_cp[]

	add	r6, r10, r8, lsr #8		@ add used_cp[] array offset first

	strb	r7, [r6, #TI_USED_CP]		@ set appropriate used_cp[]

#ifdef CONFIG_IWMMXT

	@ Test if we need to give access to iWMMXt coprocessors

	ldr	r5, [r10, #TI_FLAGS]
@@ -638,7 +636,7 @@ call_fpe: 
	bcs	iwmmxt_task_enable

#endif

 ARM(	add	pc, pc, r8, lsr #6	)

 THUMB(	lsl	r8, r8, #2		)

 THUMB(	lsr	r8, r8, #6		)

 THUMB(	add	pc, r8			)

	nop

drivers/block/xen-blkfront.c

+0 −4
Original line number Diff line number Diff line
@@ -493,8 +493,6 @@ static int blkif_queue_discard_req(struct request *req) 
	else

		ring_req->u.discard.flag = 0;



	info->ring.req_prod_pvt++;



	/* Copy the request to the ring page. */

	*final_ring_req = *ring_req;

	info->shadow[id].inflight = true;
@@ -711,8 +709,6 @@ static int blkif_queue_rw_req(struct request *req) 
	if (setup.segments)

		kunmap_atomic(setup.segments);



	info->ring.req_prod_pvt++;



	/* Copy request(s) to the ring page. */

	*final_ring_req = *ring_req;

	info->shadow[id].inflight = true;

drivers/hid/hid-holtek-mouse.c

+15 −0
Original line number Diff line number Diff line
@@ -68,8 +68,23 @@ static __u8 *holtek_mouse_report_fixup(struct hid_device *hdev, __u8 *rdesc, 
static int holtek_mouse_probe(struct hid_device *hdev,

			      const struct hid_device_id *id)

{

	int ret;



	if (!hid_is_usb(hdev))

		return -EINVAL;



	ret = hid_parse(hdev);

	if (ret) {

		hid_err(hdev, "hid parse failed: %d\n", ret);

		return ret;

	}



	ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT);

	if (ret) {

		hid_err(hdev, "hw start failed: %d\n", ret);

		return ret;

	}



	return 0;

}