Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (6b0a7f84) · Commits · jan.koester / Linux

.clang-format

+24 −0

Original line number	Original line	Diff line number	Diff line
	@@ -78,6 +78,8 @@ ForEachMacros:
	- 'ata_qc_for_each_with_internal'		- 'ata_qc_for_each_with_internal'
	- 'ax25_for_each'		- 'ax25_for_each'
	- 'ax25_uid_for_each'		- 'ax25_uid_for_each'
			- '__bio_for_each_bvec'
			- 'bio_for_each_bvec'
	- 'bio_for_each_integrity_vec'		- 'bio_for_each_integrity_vec'
	- '__bio_for_each_segment'		- '__bio_for_each_segment'
	- 'bio_for_each_segment'		- 'bio_for_each_segment'
	@@ -118,10 +120,12 @@ ForEachMacros:
	- 'drm_for_each_legacy_plane'		- 'drm_for_each_legacy_plane'
	- 'drm_for_each_plane'		- 'drm_for_each_plane'
	- 'drm_for_each_plane_mask'		- 'drm_for_each_plane_mask'
			- 'drm_for_each_privobj'
	- 'drm_mm_for_each_hole'		- 'drm_mm_for_each_hole'
	- 'drm_mm_for_each_node'		- 'drm_mm_for_each_node'
	- 'drm_mm_for_each_node_in_range'		- 'drm_mm_for_each_node_in_range'
	- 'drm_mm_for_each_node_safe'		- 'drm_mm_for_each_node_safe'
			- 'flow_action_for_each'
	- 'for_each_active_drhd_unit'		- 'for_each_active_drhd_unit'
	- 'for_each_active_iommu'		- 'for_each_active_iommu'
	- 'for_each_available_child_of_node'		- 'for_each_available_child_of_node'
	@@ -158,6 +162,9 @@ ForEachMacros:
	- 'for_each_dss_dev'		- 'for_each_dss_dev'
	- 'for_each_efi_memory_desc'		- 'for_each_efi_memory_desc'
	- 'for_each_efi_memory_desc_in_map'		- 'for_each_efi_memory_desc_in_map'
			- 'for_each_element'
			- 'for_each_element_extid'
			- 'for_each_element_id'
	- 'for_each_endpoint_of_node'		- 'for_each_endpoint_of_node'
	- 'for_each_evictable_lru'		- 'for_each_evictable_lru'
	- 'for_each_fib6_node_rt_rcu'		- 'for_each_fib6_node_rt_rcu'
	@@ -195,6 +202,7 @@ ForEachMacros:
	- 'for_each_net_rcu'		- 'for_each_net_rcu'
	- 'for_each_new_connector_in_state'		- 'for_each_new_connector_in_state'
	- 'for_each_new_crtc_in_state'		- 'for_each_new_crtc_in_state'
			- 'for_each_new_mst_mgr_in_state'
	- 'for_each_new_plane_in_state'		- 'for_each_new_plane_in_state'
	- 'for_each_new_private_obj_in_state'		- 'for_each_new_private_obj_in_state'
	- 'for_each_node'		- 'for_each_node'
	@@ -210,8 +218,10 @@ ForEachMacros:
	- 'for_each_of_pci_range'		- 'for_each_of_pci_range'
	- 'for_each_old_connector_in_state'		- 'for_each_old_connector_in_state'
	- 'for_each_old_crtc_in_state'		- 'for_each_old_crtc_in_state'
			- 'for_each_old_mst_mgr_in_state'
	- 'for_each_oldnew_connector_in_state'		- 'for_each_oldnew_connector_in_state'
	- 'for_each_oldnew_crtc_in_state'		- 'for_each_oldnew_crtc_in_state'
			- 'for_each_oldnew_mst_mgr_in_state'
	- 'for_each_oldnew_plane_in_state'		- 'for_each_oldnew_plane_in_state'
	- 'for_each_oldnew_plane_in_state_reverse'		- 'for_each_oldnew_plane_in_state_reverse'
	- 'for_each_oldnew_private_obj_in_state'		- 'for_each_oldnew_private_obj_in_state'
	@@ -243,6 +253,9 @@ ForEachMacros:
	- 'for_each_sg_dma_page'		- 'for_each_sg_dma_page'
	- 'for_each_sg_page'		- 'for_each_sg_page'
	- 'for_each_sibling_event'		- 'for_each_sibling_event'
			- 'for_each_subelement'
			- 'for_each_subelement_extid'
			- 'for_each_subelement_id'
	- '__for_each_thread'		- '__for_each_thread'
	- 'for_each_thread'		- 'for_each_thread'
	- 'for_each_zone'		- 'for_each_zone'
	@@ -252,6 +265,8 @@ ForEachMacros:
	- 'fwnode_for_each_child_node'		- 'fwnode_for_each_child_node'
	- 'fwnode_graph_for_each_endpoint'		- 'fwnode_graph_for_each_endpoint'
	- 'gadget_for_each_ep'		- 'gadget_for_each_ep'
			- 'genradix_for_each'
			- 'genradix_for_each_from'
	- 'hash_for_each'		- 'hash_for_each'
	- 'hash_for_each_possible'		- 'hash_for_each_possible'
	- 'hash_for_each_possible_rcu'		- 'hash_for_each_possible_rcu'
	@@ -293,7 +308,11 @@ ForEachMacros:
	- 'key_for_each'		- 'key_for_each'
	- 'key_for_each_safe'		- 'key_for_each_safe'
	- 'klp_for_each_func'		- 'klp_for_each_func'
			- 'klp_for_each_func_safe'
			- 'klp_for_each_func_static'
	- 'klp_for_each_object'		- 'klp_for_each_object'
			- 'klp_for_each_object_safe'
			- 'klp_for_each_object_static'
	- 'kvm_for_each_memslot'		- 'kvm_for_each_memslot'
	- 'kvm_for_each_vcpu'		- 'kvm_for_each_vcpu'
	- 'list_for_each'		- 'list_for_each'
	@@ -324,6 +343,8 @@ ForEachMacros:
	- 'media_device_for_each_intf'		- 'media_device_for_each_intf'
	- 'media_device_for_each_link'		- 'media_device_for_each_link'
	- 'media_device_for_each_pad'		- 'media_device_for_each_pad'
			- 'mp_bvec_for_each_page'
			- 'mp_bvec_for_each_segment'
	- 'nanddev_io_for_each_page'		- 'nanddev_io_for_each_page'
	- 'netdev_for_each_lower_dev'		- 'netdev_for_each_lower_dev'
	- 'netdev_for_each_lower_private'		- 'netdev_for_each_lower_private'
	@@ -375,6 +396,7 @@ ForEachMacros:
	- 'rht_for_each_rcu'		- 'rht_for_each_rcu'
	- 'rht_for_each_rcu_from'		- 'rht_for_each_rcu_from'
	- '__rq_for_each_bio'		- '__rq_for_each_bio'
			- 'rq_for_each_bvec'
	- 'rq_for_each_segment'		- 'rq_for_each_segment'
	- 'scsi_for_each_prot_sg'		- 'scsi_for_each_prot_sg'
	- 'scsi_for_each_sg'		- 'scsi_for_each_sg'
	@@ -410,6 +432,8 @@ ForEachMacros:
	- 'v4l2_m2m_for_each_src_buf_safe'		- 'v4l2_m2m_for_each_src_buf_safe'
	- 'virtio_device_for_each_vq'		- 'virtio_device_for_each_vq'
	- 'xa_for_each'		- 'xa_for_each'
			- 'xa_for_each_marked'
			- 'xa_for_each_start'
	- 'xas_for_each'		- 'xas_for_each'
	- 'xas_for_each_conflict'		- 'xas_for_each_conflict'
	- 'xas_for_each_marked'		- 'xas_for_each_marked'

Documentation/networking/rxrpc.txt

+9 −7

Original line number	Original line	Diff line number	Diff line
	@@ -1009,16 +1009,18 @@ The kernel interface functions are as follows:

	(*) Check call still alive.		(*) Check call still alive.

	u32 rxrpc_kernel_check_life(struct socket *sock,		bool rxrpc_kernel_check_life(struct socket *sock,
	struct rxrpc_call *call);		struct rxrpc_call *call,
			u32 *_life);
	void rxrpc_kernel_probe_life(struct socket *sock,		void rxrpc_kernel_probe_life(struct socket *sock,
	struct rxrpc_call *call);		struct rxrpc_call *call);

	The first function returns a number that is updated when ACKs are received		The first function passes back in *_life a number that is updated when
	from the peer (notably including PING RESPONSE ACKs which we can elicit by		ACKs are received from the peer (notably including PING RESPONSE ACKs
	sending PING ACKs to see if the call still exists on the server). The		which we can elicit by sending PING ACKs to see if the call still exists
	caller should compare the numbers of two calls to see if the call is still		on the server). The caller should compare the numbers of two calls to see
	alive after waiting for a suitable interval.		if the call is still alive after waiting for a suitable interval. It also
			returns true as long as the call hasn't yet reached the completed state.

	This allows the caller to work out if the server is still contactable and		This allows the caller to work out if the server is still contactable and
	if the call is still alive on the server while waiting for the server to		if the call is still alive on the server while waiting for the server to

MAINTAINERS

+15 −2

Original line number	Original line	Diff line number	Diff line
	@@ -10139,7 +10139,7 @@ F: drivers/spi/spi-at91-usart.c
	F: Documentation/devicetree/bindings/mfd/atmel-usart.txt		F: Documentation/devicetree/bindings/mfd/atmel-usart.txt

	MICROCHIP KSZ SERIES ETHERNET SWITCH DRIVER		MICROCHIP KSZ SERIES ETHERNET SWITCH DRIVER
	M: Woojung Huh <Woojung.Huh@microchip.com>		M: Woojung Huh <woojung.huh@microchip.com>
	M: Microchip Linux Driver Support <UNGLinuxDriver@microchip.com>		M: Microchip Linux Driver Support <UNGLinuxDriver@microchip.com>
	L: netdev@vger.kernel.org		L: netdev@vger.kernel.org
	S: Maintained		S: Maintained
	@@ -16503,7 +16503,7 @@ F: drivers/char/virtio_console.c
	F: include/linux/virtio_console.h		F: include/linux/virtio_console.h
	F: include/uapi/linux/virtio_console.h		F: include/uapi/linux/virtio_console.h

	VIRTIO CORE, NET AND BLOCK DRIVERS		VIRTIO CORE AND NET DRIVERS
	M: "Michael S. Tsirkin" <mst@redhat.com>		M: "Michael S. Tsirkin" <mst@redhat.com>
	M: Jason Wang <jasowang@redhat.com>		M: Jason Wang <jasowang@redhat.com>
	L: virtualization@lists.linux-foundation.org		L: virtualization@lists.linux-foundation.org
	@@ -16518,6 +16518,19 @@ F: include/uapi/linux/virtio_*.h
	F: drivers/crypto/virtio/		F: drivers/crypto/virtio/
	F: mm/balloon_compaction.c		F: mm/balloon_compaction.c

			VIRTIO BLOCK AND SCSI DRIVERS
			M: "Michael S. Tsirkin" <mst@redhat.com>
			M: Jason Wang <jasowang@redhat.com>
			R: Paolo Bonzini <pbonzini@redhat.com>
			R: Stefan Hajnoczi <stefanha@redhat.com>
			L: virtualization@lists.linux-foundation.org
			S: Maintained
			F: drivers/block/virtio_blk.c
			F: drivers/scsi/virtio_scsi.c
			F: include/uapi/linux/virtio_blk.h
			F: include/uapi/linux/virtio_scsi.h
			F: drivers/vhost/scsi.c

	VIRTIO CRYPTO DRIVER		VIRTIO CRYPTO DRIVER
	M: Gonglei <arei.gonglei@huawei.com>		M: Gonglei <arei.gonglei@huawei.com>
	L: virtualization@lists.linux-foundation.org		L: virtualization@lists.linux-foundation.org

Makefile

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -2,7 +2,7 @@
	VERSION = 5		VERSION = 5
	PATCHLEVEL = 1		PATCHLEVEL = 1
	SUBLEVEL = 0		SUBLEVEL = 0
	EXTRAVERSION = -rc4		EXTRAVERSION = -rc5
	NAME = Shy Crocodile		NAME = Shy Crocodile

	# DOCUMENTATION		# DOCUMENTATION

arch/arm64/include/asm/futex.h

+8 −8

Original line number	Original line	Diff line number	Diff line
	@@ -30,8 +30,8 @@ do { \
	" prfm pstl1strm, %2\n" \		" prfm pstl1strm, %2\n" \
	"1: ldxr %w1, %2\n" \		"1: ldxr %w1, %2\n" \
	insn "\n" \		insn "\n" \
	"2: stlxr %w3, %w0, %2\n" \		"2: stlxr %w0, %w3, %2\n" \
	" cbnz %w3, 1b\n" \		" cbnz %w0, 1b\n" \
	" dmb ish\n" \		" dmb ish\n" \
	"3:\n" \		"3:\n" \
	" .pushsection .fixup,\"ax\"\n" \		" .pushsection .fixup,\"ax\"\n" \
	@@ -50,30 +50,30 @@ do { \
	static inline int		static inline int
	arch_futex_atomic_op_inuser(int op, int oparg, int oval, u32 __user _uaddr)		arch_futex_atomic_op_inuser(int op, int oparg, int oval, u32 __user _uaddr)
	{		{
	int oldval = 0, ret, tmp;		int oldval, ret, tmp;
	u32 __user *uaddr = __uaccess_mask_ptr(_uaddr);		u32 __user *uaddr = __uaccess_mask_ptr(_uaddr);

	pagefault_disable();		pagefault_disable();

	switch (op) {		switch (op) {
	case FUTEX_OP_SET:		case FUTEX_OP_SET:
	__futex_atomic_op("mov %w0, %w4",		__futex_atomic_op("mov %w3, %w4",
	ret, oldval, uaddr, tmp, oparg);		ret, oldval, uaddr, tmp, oparg);
	break;		break;
	case FUTEX_OP_ADD:		case FUTEX_OP_ADD:
	__futex_atomic_op("add %w0, %w1, %w4",		__futex_atomic_op("add %w3, %w1, %w4",
	ret, oldval, uaddr, tmp, oparg);		ret, oldval, uaddr, tmp, oparg);
	break;		break;
	case FUTEX_OP_OR:		case FUTEX_OP_OR:
	__futex_atomic_op("orr %w0, %w1, %w4",		__futex_atomic_op("orr %w3, %w1, %w4",
	ret, oldval, uaddr, tmp, oparg);		ret, oldval, uaddr, tmp, oparg);
	break;		break;
	case FUTEX_OP_ANDN:		case FUTEX_OP_ANDN:
	__futex_atomic_op("and %w0, %w1, %w4",		__futex_atomic_op("and %w3, %w1, %w4",
	ret, oldval, uaddr, tmp, ~oparg);		ret, oldval, uaddr, tmp, ~oparg);
	break;		break;
	case FUTEX_OP_XOR:		case FUTEX_OP_XOR:
	__futex_atomic_op("eor %w0, %w1, %w4",		__futex_atomic_op("eor %w3, %w1, %w4",
	ret, oldval, uaddr, tmp, oparg);		ret, oldval, uaddr, tmp, oparg);
	break;		break;
	default:		default: