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

tools/testing/selftests/net/mptcp/mptcp_join.sh 34aa6e3bccd8 ("selftests: mptcp: add ip mptcp wrappers") 857898eb4b28 ("selftests: mptcp: add missing join check") 6ef84b1517e0 ("selftests: mptcp: more robust signal race test") https://lore.kernel.org/all/20220221131842.468893-1-broonie@kernel.org/ drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/act.h drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/ct.c fb7e76ea3f3b6 ("net/mlx5e: TC, Skip redundant ct clear actions") c63741b426e11 ("net/mlx5e: Fix MPLSoUDP encap to use MPLS action information") 09bf97923224f ("net/mlx5e: TC, Move pedit_headers_action to parse_attr") 84ba8062e383 ("net/mlx5e: Test CT and SAMPLE on flow attr") efe6f961cd2e ("net/mlx5e: CT, Don't set flow flag CT for ct clear flow") 3b49a7edec1d ("net/mlx5e: TC, Reject rules with multiple CT actions")

Jakub Kicinski committed 4 years ago

Commit aaa25a22 parents 9e7b78d d8152cf227 files · +1756 −925Browse files

Showing the changes to include/linux (4 of 227 files). Show all

Unified · Split

4 files

include/linux/blkdev.h +2 −1
include/linux/nvme-tcp.h +1 −0
include/linux/sched/task.h +2 −2
include/linux/slab.h +1 −2

include/linux/blkdev.h+2−1

@@ -748,7 +748,8 @@ extern bool blk_queue_can_use_dma_map_merging(struct request_queue *q, · 747 unmodified lines
748		748
749	bool __must_check blk_get_queue(struct request_queue *);	749	bool __must_check blk_get_queue(struct request_queue *);
750	extern void blk_put_queue(struct request_queue *);	750	extern void blk_put_queue(struct request_queue *);
751	extern void blk_set_queue_dying(struct request_queue *);	751
		752	void blk_mark_disk_dead(struct gendisk *disk);
752		753
753	#ifdef CONFIG_BLOCK	754	#ifdef CONFIG_BLOCK
754	/*	755	/*

include/linux/nvme-tcp.h+1−0

@@ -12,6 +12,7 @@ · 11 unmodified lines
12	#define NVME_TCP_DISC_PORT 8009	12	#define NVME_TCP_DISC_PORT 8009
13	#define NVME_TCP_ADMIN_CCSZ SZ_8K	13	#define NVME_TCP_ADMIN_CCSZ SZ_8K
14	#define NVME_TCP_DIGEST_LENGTH 4	14	#define NVME_TCP_DIGEST_LENGTH 4
		15	#define NVME_TCP_MIN_MAXH2CDATA 4096
15		16
16	enum nvme_tcp_pfv {	17	enum nvme_tcp_pfv {
17	NVME_TCP_PFV_1_0 = 0x0,	18	NVME_TCP_PFV_1_0 = 0x0,

include/linux/sched/task.h+2−2

@@ -54,8 +54,8 @@ extern asmlinkage void schedule_tail(struct task_struct *prev); · 53 unmodified lines
54	extern void init_idle(struct task_struct *idle, int cpu);	54	extern void init_idle(struct task_struct *idle, int cpu);
55		55
56	extern int sched_fork(unsigned long clone_flags, struct task_struct *p);	56	extern int sched_fork(unsigned long clone_flags, struct task_struct *p);
57	extern void sched_post_fork(struct task_struct *p,	57	extern void sched_cgroup_fork(struct task_struct p, struct kernel_clone_args kargs);
58	struct kernel_clone_args *kargs);	58	extern void sched_post_fork(struct task_struct *p);
59	extern void sched_dead(struct task_struct *p);	59	extern void sched_dead(struct task_struct *p);
60		60
61	void __noreturn do_task_dead(void);	61	void __noreturn do_task_dead(void);

include/linux/slab.h+1−2

@@ -660,8 +660,7 @@ static inline __alloc_size(1, 2) void *kcalloc(size_t n, size_t size, gfp_t flag · 659 unmodified lines
660	* allocator where we care about the real place the memory allocation	660	* allocator where we care about the real place the memory allocation
661	* request comes from.	661	* request comes from.
662	*/	662	*/
663	extern void *__kmalloc_track_caller(size_t size, gfp_t flags, unsigned long caller)	663	extern void *__kmalloc_track_caller(size_t size, gfp_t flags, unsigned long caller);
664	__alloc_size(1);
665	#define kmalloc_track_caller(size, flags) \	664	#define kmalloc_track_caller(size, flags) \
666	__kmalloc_track_caller(size, flags, _RET_IP_)	665	__kmalloc_track_caller(size, flags, _RET_IP_)
667		666