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

Commit 132de7df authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 4.9.295 into android-4.9-q 



Changes in 4.9.295
	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
	fjes: Check for error irq
	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
	x86/pkey: Fix undefined behaviour with PKRU_WD_BIT
	ARM: 9169/1: entry: fix Thumb2 bug in iWMMXt exception handling
	hwmon: (lm90) Do not report 'busy' status bit as alarm
	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.9.295

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I71a709151a59272c6e6e4bab99827b9abb189bbd
parents 1c817d47 8f660a86

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 = 9

SUBLEVEL = 294

SUBLEVEL = 295

EXTRAVERSION =

NAME = Roaring Lionus

arch/arm/kernel/entry-armv.S

+3 −5
Original line number Diff line number Diff line
@@ -631,11 +631,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]
@@ -644,7 +642,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

arch/x86/include/asm/pgtable.h

+2 −2
Original line number Diff line number Diff line
@@ -1028,8 +1028,8 @@ static inline pte_t pte_swp_clear_soft_dirty(pte_t pte) 
}

#endif



#define PKRU_AD_BIT 0x1

#define PKRU_WD_BIT 0x2

#define PKRU_AD_BIT 0x1u

#define PKRU_WD_BIT 0x2u

#define PKRU_BITS_PER_PKEY 2



static inline bool __pkru_allows_read(u32 pkru, u16 pkey)

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;

}