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

Commit ed29668d authored by David S. Miller's avatar David S. Miller
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 



Smooth Cong Wang's bug fix into 'net-next'.  Basically put
the bulk of the tcf_block_put() logic from 'net' into
tcf_block_put_ext(), but after the offload unbind.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 65c959a3 3a99df9a

Documentation/ABI/testing/sysfs-devices-power

+1 −3
Original line number Diff line number Diff line
@@ -211,9 +211,7 @@ Description: 
		device, after it has been suspended at run time, from a resume

		request to the moment the device will be ready to process I/O,

		in microseconds.  If it is equal to 0, however, this means that

		the PM QoS resume latency may be arbitrary and the special value

		"n/a" means that user space cannot accept any resume latency at

		all for the given device.

		the PM QoS resume latency may be arbitrary.



		Not all drivers support this attribute.  If it isn't supported,

		it is not present.

MAINTAINERS

+3 −3
Original line number Diff line number Diff line
@@ -6678,7 +6678,7 @@ F: include/net/ieee802154_netdev.h 
F:	Documentation/networking/ieee802154.txt



IFE PROTOCOL

M:	Yotam Gigi <yotamg@mellanox.com>

M:	Yotam Gigi <yotam.gi@gmail.com>

M:	Jamal Hadi Salim <jhs@mojatatu.com>

F:	net/ife

F:	include/net/ife.h
@@ -8751,7 +8751,7 @@ Q: http://patchwork.ozlabs.org/project/netdev/list/ 
F:	drivers/net/ethernet/mellanox/mlxsw/



MELLANOX FIRMWARE FLASH LIBRARY (mlxfw)

M:	Yotam Gigi <yotamg@mellanox.com>

M:	mlxsw@mellanox.com

L:	netdev@vger.kernel.org

S:	Supported

W:	http://www.mellanox.com
@@ -10899,7 +10899,7 @@ S: Maintained 
F:	drivers/block/ps3vram.c



PSAMPLE PACKET SAMPLING SUPPORT:

M:	Yotam Gigi <yotamg@mellanox.com>

M:	Yotam Gigi <yotam.gi@gmail.com>

S:	Maintained

F:	net/psample

F:	include/net/psample.h

arch/x86/crypto/chacha20-avx2-x86_64.S

+2 −2
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ ENTRY(chacha20_8block_xor_avx2) 


	vzeroupper

	# 4 * 32 byte stack, 32-byte aligned

	mov		%rsp, %r8

	lea		8(%rsp),%r10

	and		$~31, %rsp

	sub		$0x80, %rsp
@@ -443,6 +443,6 @@ ENTRY(chacha20_8block_xor_avx2) 
	vmovdqu		%ymm15,0x01e0(%rsi)



	vzeroupper

	mov		%r8,%rsp

	lea		-8(%r10),%rsp

	ret

ENDPROC(chacha20_8block_xor_avx2)

arch/x86/crypto/chacha20-ssse3-x86_64.S

+2 −2
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ ENTRY(chacha20_4block_xor_ssse3) 
	# done with the slightly better performing SSSE3 byte shuffling,

	# 7/12-bit word rotation uses traditional shift+OR.



	mov		%rsp,%r11

	lea		8(%rsp),%r10

	sub		$0x80,%rsp

	and		$~63,%rsp
@@ -625,6 +625,6 @@ ENTRY(chacha20_4block_xor_ssse3) 
	pxor		%xmm1,%xmm15

	movdqu		%xmm15,0xf0(%rsi)



	mov		%r11,%rsp

	lea		-8(%r10),%rsp

	ret

ENDPROC(chacha20_4block_xor_ssse3)

arch/x86/mm/fault.c

+10 −1
Original line number Diff line number Diff line
@@ -1440,7 +1440,17 @@ __do_page_fault(struct pt_regs *regs, unsigned long error_code, 
	 * make sure we exit gracefully rather than endlessly redo

	 * the fault.  Since we never set FAULT_FLAG_RETRY_NOWAIT, if

	 * we get VM_FAULT_RETRY back, the mmap_sem has been unlocked.

	 *

	 * Note that handle_userfault() may also release and reacquire mmap_sem

	 * (and not return with VM_FAULT_RETRY), when returning to userland to

	 * repeat the page fault later with a VM_FAULT_NOPAGE retval

	 * (potentially after handling any pending signal during the return to

	 * userland). The return to userland is identified whenever

	 * FAULT_FLAG_USER|FAULT_FLAG_KILLABLE are both set in flags.

	 * Thus we have to be careful about not touching vma after handling the

	 * fault, so we read the pkey beforehand.

	 */

	pkey = vma_pkey(vma);

	fault = handle_mm_fault(vma, address, flags);

	major |= fault & VM_FAULT_MAJOR;
@@ -1467,7 +1477,6 @@ __do_page_fault(struct pt_regs *regs, unsigned long error_code, 
		return;

	}



	pkey = vma_pkey(vma);

	up_read(&mm->mmap_sem);

	if (unlikely(fault & VM_FAULT_ERROR)) {

		mm_fault_error(regs, error_code, address, &pkey, fault);