Merge tag 'v5.7-rc6' into rdma.git for-next

Linux 5.7-rc6 Conflict in drivers/net/ethernet/mellanox/mlx5/core/steering/dr_send.c resolved by deleting dr_cq_event, matching how netdev resolved it. Required for dependencies in the following patches.

Jason Gunthorpe committed 6 years ago

Commit eafd47f2 parents 0ad45e5 b9bbe6e1441 files · +15317 −8130Browse files

Showing the changes to include/linux (66 of 1441 files). Show all

Unified · Split

66 files

include/linux/amba/bus.h +1 −0
include/linux/backing-dev-defs.h +1 −1
include/linux/backing-dev.h +1 −8
include/linux/bio.h +1 −1
include/linux/blk-mq.h +1 −1
include/linux/blk_types.h +1 −1
include/linux/brcmphy.h +1 −0
include/linux/buffer_head.h +8 −0
include/linux/can/dev/peak_canfd.h +2 −2
include/linux/compiler.h +6 −0
include/linux/cpu_rmap.h +1 −1
include/linux/debugfs.h +4 −8
include/linux/digsig.h +2 −2
include/linux/dirent.h +1 −1
include/linux/dma-buf.h +1 −2
include/linux/dmaengine.h +6 −6
include/linux/enclosure.h +1 −1
include/linux/energy_model.h +1 −1
include/linux/ethtool.h +2 −2
include/linux/fs.h +1 −1
include/linux/ftrace.h +23 −0
include/linux/genalloc.h +1 −1
include/linux/host1x.h +3 −0
include/linux/i2c.h +0 −6
include/linux/igmp.h +1 −1
include/linux/ihex.h +1 −1
include/linux/iio/iio.h +1 −1
include/linux/irq.h +2 −4
include/linux/irqchip/arm-gic-v3.h +2 −0
include/linux/kvm_host.h +4 −1
include/linux/list_lru.h +1 −1
include/linux/lsm_hook_defs.h +2 −2
include/linux/memcontrol.h +4 −2
include/linux/mhi.h +10 −6
include/linux/nfs_xdr.h +2 −0
include/linux/platform_data/cros_ec_sensorhub.h +1 −0
include/linux/platform_data/wilco-ec.h +1 −1
include/linux/platform_device.h +1 −0
include/linux/pnp.h +9 −20
include/linux/posix_acl.h +1 −1
include/linux/ptp_clock_kernel.h +4 −4
include/linux/rio.h +2 −2
include/linux/rslib.h +1 −1
include/linux/sched/topology.h +1 −1
include/linux/skbuff.h +1 −1
include/linux/skmsg.h +1 −0
include/linux/stmmac.h +2 −0
include/linux/sunrpc/clnt.h +12 −1
include/linux/sunrpc/gss_api.h +3 −0
include/linux/sunrpc/gss_krb5.h +3 −3
include/linux/sunrpc/svc_rdma.h +1 −0
include/linux/sunrpc/xdr.h +1 −0
include/linux/swap.h +1 −1
include/linux/tcp.h +0 −51
include/linux/ti_wilink_st.h +3 −3
include/linux/tpm_eventlog.h +3 −3
include/linux/tracepoint.h +1 −21
include/linux/tty.h +1 −1
include/linux/vdpa.h +1 −1
include/linux/vermagic.h +5 −3
include/linux/virtio.h +0 −1
include/linux/virtio_net.h +24 −2
include/linux/virtio_vsock.h +1 −0
include/linux/vmalloc.h +1 −1
include/linux/vringh.h +6 −0
include/linux/xattr.h +1 −1

include/linux/amba/bus.h+1−0

@@ -65,6 +65,7 @@ struct amba_device { · 64 unmodified lines
65	65	struct device dev;
66	66	struct resource res;
67	67	struct clk *pclk;
	68	+ struct device_dma_parameters dma_parms;
68	69	unsigned int periphid;
69	70	unsigned int cid;
70	71	struct amba_cs_uci_id uci;

include/linux/backing-dev-defs.h+1−1

@@ -54,7 +54,6 @@ enum wb_reason { · 53 unmodified lines
54	54	WB_REASON_SYNC,
55	55	WB_REASON_PERIODIC,
56	56	WB_REASON_LAPTOP_TIMER,
57		− WB_REASON_FREE_MORE_MEM,
58	57	WB_REASON_FS_FREE_SPACE,
59	58	/*
60	59	* There is no bdi forker thread any more and works are done
@@ -220,6 +219,7 @@ struct backing_dev_info { · 159 unmodified lines
220	219	wait_queue_head_t wb_waitq;
221	220
222	221	struct device *dev;
	222	+ char dev_name[64];
223	223	struct device *owner;
224	224
225	225	struct timer_list laptop_mode_wb_timer;

include/linux/backing-dev.h+1−8

@@ -505,13 +505,6 @@ static inline int bdi_rw_congested(struct backing_dev_info *bdi) · 504 unmodified lines
505	505	(1 << WB_async_congested));
506	506	}
507	507
508		−extern const char *bdi_unknown_name;
509		−
510		−static inline const char bdi_dev_name(struct backing_dev_info bdi)
511		−{
512		− if (!bdi \|\| !bdi->dev)
513		− return bdi_unknown_name;
514		− return dev_name(bdi->dev);
515		−}
	508	+const char bdi_dev_name(struct backing_dev_info bdi);
516	509
517	510	#endif /* _LINUX_BACKING_DEV_H */

include/linux/bio.h+1−1

@@ -319,7 +319,7 @@ struct bio_integrity_payload { · 318 unmodified lines
319	319	struct work_struct bip_work; /* I/O completion */
320	320
321	321	struct bio_vec *bip_vec;
322		− struct bio_vec bip_inline_vecs[0];/* embedded bvec array */
	322	+ struct bio_vec bip_inline_vecs[];/* embedded bvec array */
323	323	};
324	324
325	325	#if defined(CONFIG_BLK_DEV_INTEGRITY)

include/linux/blk-mq.h+1−1

@@ -173,7 +173,7 @@ struct blk_mq_hw_ctx { · 172 unmodified lines
173	173	* blocking (BLK_MQ_F_BLOCKING). Must be the last member - see also
174	174	* blk_mq_hw_ctx_size().
175	175	*/
176		− struct srcu_struct srcu[0];
	176	+ struct srcu_struct srcu[];
177	177	};
178	178
179	179	/**

include/linux/blk_types.h+1−1

@@ -198,7 +198,7 @@ struct bio { · 197 unmodified lines
198	198	* double allocations for a small number of bio_vecs. This member
199	199	* MUST obviously be kept at the very end of the bio.
200	200	*/
201		− struct bio_vec bi_inline_vecs[0];
	201	+ struct bio_vec bi_inline_vecs[];
202	202	};
203	203
204	204	#define BIO_RESET_BYTES offsetof(struct bio, bi_max_vecs)

include/linux/brcmphy.h+1−0

@@ -245,6 +245,7 @@ · 244 unmodified lines
245	245	#define BCM54810_EXP_BROADREACH_LRE_MISC_CTL_EN (1 << 0)
246	246	#define BCM54810_SHD_CLK_CTL 0x3
247	247	#define BCM54810_SHD_CLK_CTL_GTXCLK_EN (1 << 9)
	248	+#define BCM54810_SHD_SCR3_TRDDAPD 0x0100
248	249
249	250	/* BCM54612E Registers */
250	251	#define BCM54612E_EXP_SPARE0 (MII_BCM54XX_EXP_SEL_ETC + 0x34)

include/linux/buffer_head.h+8−0

@@ -189,6 +189,8 @@ struct buffer_head __getblk_gfp(struct block_device bdev, sector_t block, · 188 unmodified lines
189	189	void __brelse(struct buffer_head *);
190	190	void __bforget(struct buffer_head *);
191	191	void __breadahead(struct block_device *, sector_t block, unsigned int size);
	192	+void __breadahead_gfp(struct block_device *, sector_t block, unsigned int size,
	193	+ gfp_t gfp);
192	194	struct buffer_head __bread_gfp(struct block_device ,
193	195	sector_t block, unsigned size, gfp_t gfp);
194	196	void invalidate_bh_lrus(void);
@@ -319,6 +321,12 @@ sb_breadahead(struct super_block *sb, sector_t block) · 124 unmodified lines
319	321	__breadahead(sb->s_bdev, block, sb->s_blocksize);
320	322	}
321	323
	324	+static inline void
	325	+sb_breadahead_unmovable(struct super_block *sb, sector_t block)
	326	+{
	327	+ __breadahead_gfp(sb->s_bdev, block, sb->s_blocksize, 0);
	328	+}
	329	+
322	330	static inline struct buffer_head *
323	331	sb_getblk(struct super_block *sb, sector_t block)
324	332	{

include/linux/can/dev/peak_canfd.h+2−2

@@ -189,7 +189,7 @@ struct __packed pucan_rx_msg { · 188 unmodified lines
189	189	u8 client;
190	190	__le16 flags;
191	191	__le32 can_id;
192		− u8 d[0];
	192	+ u8 d[];
193	193	};
194	194
195	195	/* uCAN error types */
@@ -266,7 +266,7 @@ struct __packed pucan_tx_msg { · 70 unmodified lines
266	266	u8 client;
267	267	__le16 flags;
268	268	__le32 can_id;
269		− u8 d[0];
	269	+ u8 d[];
270	270	};
271	271
272	272	/* build the cmd opcode_channel field with respect to the correct endianness */

include/linux/compiler.h+6−0

@@ -356,4 +356,10 @@ static inline void offset_to_ptr(const int off) · 355 unmodified lines
356	356	/* &a[0] degrades to a pointer: a different type from an array */
357	357	#define __must_be_array(a) BUILD_BUG_ON_ZERO(__same_type((a), &(a)[0]))
358	358
	359	+/*
	360	+ * This is needed in functions which generate the stack canary, see
	361	+ * arch/x86/kernel/smpboot.c::start_secondary() for an example.
	362	+ */
	363	+#define prevent_tail_call_optimization() mb()
	364	+
359	365	#endif /* __LINUX_COMPILER_H */

include/linux/cpu_rmap.h+1−1

@@ -28,7 +28,7 @@ struct cpu_rmap { · 27 unmodified lines
28	28	struct {
29	29	u16 index;
30	30	u16 dist;
31		− } near[0];
	31	+ } near[];
32	32	};
33	33	#define CPU_RMAP_DIST_INF 0xffff
34	34

include/linux/debugfs.h+4−8

@@ -103,8 +103,8 @@ void debugfs_create_u8(const char name, umode_t mode, struct dentry parent, · 102 unmodified lines
103	103	u8 *value);
104	104	void debugfs_create_u16(const char name, umode_t mode, struct dentry parent,
105	105	u16 *value);
106		−struct dentry debugfs_create_u32(const char name, umode_t mode,
107		− struct dentry parent, u32 value);
	106	+void debugfs_create_u32(const char name, umode_t mode, struct dentry parent,
	107	+ u32 *value);
108	108	void debugfs_create_u64(const char name, umode_t mode, struct dentry parent,
109	109	u64 *value);
110	110	struct dentry debugfs_create_ulong(const char name, umode_t mode,
@@ -250,12 +250,8 @@ static inline void debugfs_create_u8(const char *name, umode_t mode, · 139 unmodified lines
250	250	static inline void debugfs_create_u16(const char *name, umode_t mode,
251	251	struct dentry parent, u16 value) { }
252	252
253		−static inline struct dentry debugfs_create_u32(const char name, umode_t mode,
254		− struct dentry *parent,
255		− u32 *value)
256		−{
257		− return ERR_PTR(-ENODEV);
258		−}
	253	+static inline void debugfs_create_u32(const char *name, umode_t mode,
	254	+ struct dentry parent, u32 value) { }
259	255
260	256	static inline void debugfs_create_u64(const char *name, umode_t mode,
261	257	struct dentry parent, u64 value) { }

include/linux/digsig.h+2−2

@@ -29,7 +29,7 @@ struct pubkey_hdr { · 28 unmodified lines
29	29	uint32_t timestamp; /* key made, always 0 for now */
30	30	uint8_t algo;
31	31	uint8_t nmpi;
32		− char mpi[0];
	32	+ char mpi[];
33	33	} __packed;
34	34
35	35	struct signature_hdr {
@@ -39,7 +39,7 @@ struct signature_hdr { · 3 unmodified lines
39	39	uint8_t hash;
40	40	uint8_t keyid[8];
41	41	uint8_t nmpi;
42		− char mpi[0];
	42	+ char mpi[];
43	43	} __packed;
44	44
45	45	#if defined(CONFIG_SIGNATURE) \|\| defined(CONFIG_SIGNATURE_MODULE)

include/linux/dirent.h+1−1

@@ -7,7 +7,7 @@ struct linux_dirent64 { · 6 unmodified lines
7	7	s64 d_off;
8	8	unsigned short d_reclen;
9	9	unsigned char d_type;
10		− char d_name[0];
	10	+ char d_name[];
11	11	};
12	12
13	13	#endif

include/linux/dma-buf.h+1−2

@@ -329,13 +329,12 @@ struct dma_buf { · 328 unmodified lines
329	329
330	330	/**
331	331	* struct dma_buf_attach_ops - importer operations for an attachment
332		− * @move_notify: [optional] notification that the DMA-buf is moving
333	332	*
334	333	* Attachment operations implemented by the importer.
335	334	*/
336	335	struct dma_buf_attach_ops {
337	336	/**
338		− * @move_notify
	337	+ * @move_notify: [optional] notification that the DMA-buf is moving
339	338	*
340	339	* If this callback is provided the framework can avoid pinning the
341	340	* backing store while mappings exists.

include/linux/dmaengine.h+6−6

@@ -83,9 +83,9 @@ enum dma_transfer_direction { · 82 unmodified lines
83	83	/**
84	84	* Interleaved Transfer Request
85	85	* ----------------------------
86		− * A chunk is collection of contiguous bytes to be transfered.
	86	+ * A chunk is collection of contiguous bytes to be transferred.
87	87	* The gap(in bytes) between two chunks is called inter-chunk-gap(ICG).
88		− * ICGs may or maynot change between chunks.
	88	+ * ICGs may or may not change between chunks.
89	89	* A FRAME is the smallest series of contiguous {chunk,icg} pairs,
90	90	* that when repeated an integral number of times, specifies the transfer.
91	91	* A transfer template is specification of a Frame, the number of times
@@ -341,13 +341,11 @@ struct dma_chan { · 249 unmodified lines
341	341	* @chan: driver channel device
342	342	* @device: sysfs device
343	343	* @dev_id: parent dma_device dev_id
344		− * @idr_ref: reference count to gate release of dma_device dev_id
345	344	*/
346	345	struct dma_chan_dev {
347	346	struct dma_chan *chan;
348	347	struct device device;
349	348	int dev_id;
350		− atomic_t *idr_ref;
351	349	};
352	350
353	351	/**
@@ -835,6 +833,8 @@ struct dma_device { · 481 unmodified lines
835	833	int dev_id;
836	834	struct device *dev;
837	835	struct module *owner;
	836	+ struct ida chan_ida;
	837	+ struct mutex chan_mutex; /* to protect chan_ida */
838	838
839	839	u32 src_addr_widths;
840	840	u32 dst_addr_widths;
@@ -1069,7 +1069,7 @@ static inline int dmaengine_terminate_all(struct dma_chan *chan) · 228 unmodified lines
1069	1069	* dmaengine_synchronize() needs to be called before it is safe to free
1070	1070	* any memory that is accessed by previously submitted descriptors or before
1071	1071	* freeing any resources accessed from within the completion callback of any
1072		− * perviously submitted descriptors.
	1072	+ * previously submitted descriptors.
1073	1073	*
1074	1074	* This function can be called from atomic context as well as from within a
1075	1075	* complete callback of a descriptor submitted on the same channel.
@@ -1091,7 +1091,7 @@ static inline int dmaengine_terminate_async(struct dma_chan *chan) · 15 unmodified lines
1091	1091	*
1092	1092	* Synchronizes to the DMA channel termination to the current context. When this
1093	1093	* function returns it is guaranteed that all transfers for previously issued
1094		− * descriptors have stopped and and it is safe to free the memory assoicated
	1094	+ * descriptors have stopped and it is safe to free the memory associated
1095	1095	* with them. Furthermore it is guaranteed that all complete callback functions
1096	1096	* for a previously submitted descriptor have finished running and it is safe to
1097	1097	* free resources accessed from within the complete callbacks.

include/linux/enclosure.h+1−1

@@ -101,7 +101,7 @@ struct enclosure_device { · 100 unmodified lines
101	101	struct device edev;
102	102	struct enclosure_component_callbacks *cb;
103	103	int components;
104		− struct enclosure_component component[0];
	104	+ struct enclosure_component component[];
105	105	};
106	106
107	107	static inline struct enclosure_device *

include/linux/energy_model.h+1−1

@@ -36,7 +36,7 @@ struct em_cap_state { · 35 unmodified lines
36	36	struct em_perf_domain {
37	37	struct em_cap_state *table;
38	38	int nr_cap_states;
39		− unsigned long cpus[0];
	39	+ unsigned long cpus[];
40	40	};
41	41
42	42	#ifdef CONFIG_ENERGY_MODEL

include/linux/ethtool.h+2−2

@@ -35,7 +35,7 @@ struct compat_ethtool_rxnfc { · 34 unmodified lines
35	35	compat_u64 data;
36	36	struct compat_ethtool_rx_flow_spec fs;
37	37	u32 rule_cnt;
38		− u32 rule_locs[0];
	38	+ u32 rule_locs[];
39	39	};
40	40
41	41	#endif /* CONFIG_COMPAT */
@@ -462,7 +462,7 @@ int ethtool_check_ops(const struct ethtool_ops *ops); · 420 unmodified lines
462	462
463	463	struct ethtool_rx_flow_rule {
464	464	struct flow_rule *rule;
465		− unsigned long priv[0];
	465	+ unsigned long priv[];
466	466	};
467	467
468	468	struct ethtool_rx_flow_spec_input {

include/linux/fs.h+1−1

@@ -983,7 +983,7 @@ struct file_handle { · 982 unmodified lines
983	983	__u32 handle_bytes;
984	984	int handle_type;
985	985	/* file identifier */
986		− unsigned char f_handle[0];
	986	+ unsigned char f_handle[];
987	987	};
988	988
989	989	static inline struct file get_file(struct file f)

include/linux/ftrace.h+23−0

@@ -210,6 +210,29 @@ struct ftrace_ops { · 209 unmodified lines
210	210	#endif
211	211	};
212	212
	213	+extern struct ftrace_ops __rcu *ftrace_ops_list;
	214	+extern struct ftrace_ops ftrace_list_end;
	215	+
	216	+/*
	217	+ * Traverse the ftrace_global_list, invoking all entries. The reason that we
	218	+ * can use rcu_dereference_raw_check() is that elements removed from this list
	219	+ * are simply leaked, so there is no need to interact with a grace-period
	220	+ * mechanism. The rcu_dereference_raw_check() calls are needed to handle
	221	+ * concurrent insertions into the ftrace_global_list.
	222	+ *
	223	+ * Silly Alpha and silly pointer-speculation compiler optimizations!
	224	+ */
	225	+#define do_for_each_ftrace_op(op, list) \
	226	+ op = rcu_dereference_raw_check(list); \
	227	+ do
	228	+
	229	+/*
	230	+ * Optimized for just a single item in the list (as that is the normal case).
	231	+ */
	232	+#define while_for_each_ftrace_op(op) \
	233	+ while (likely(op = rcu_dereference_raw_check((op)->next)) && \
	234	+ unlikely((op) != &ftrace_list_end))
	235	+
213	236	/*
214	237	* Type of the current tracing.
215	238	*/

include/linux/genalloc.h+1−1

@@ -76,7 +76,7 @@ struct gen_pool_chunk { · 75 unmodified lines
76	76	void owner; / private data to retrieve at alloc time */
77	77	unsigned long start_addr; /* start address of memory chunk */
78	78	unsigned long end_addr; /* end address of memory chunk (inclusive) */
79		− unsigned long bits[0]; /* bitmap for allocating memory chunk */
	79	+ unsigned long bits[]; /* bitmap for allocating memory chunk */
80	80	};
81	81
82	82	/*

include/linux/host1x.h+3−0

@@ -17,9 +17,12 @@ enum host1x_class { · 16 unmodified lines
17	17	HOST1X_CLASS_GR3D = 0x60,
18	18	};
19	19
	20	+struct host1x;
20	21	struct host1x_client;
21	22	struct iommu_group;
22	23
	24	+u64 host1x_get_dma_mask(struct host1x *host1x);
	25	+
23	26	/**
24	27	* struct host1x_client_ops - host1x client operations
25	28	* @init: host1x client initialization code

include/linux/i2c.h+0−6

@@ -461,12 +461,6 @@ i2c_new_scanned_device(struct i2c_adapter *adap, · 460 unmodified lines
461	461	unsigned short const *addr_list,
462	462	int (probe)(struct i2c_adapter adap, unsigned short addr));
463	463
464		−struct i2c_client *
465		−i2c_new_probed_device(struct i2c_adapter *adap,
466		− struct i2c_board_info *info,
467		− unsigned short const *addr_list,
468		− int (probe)(struct i2c_adapter adap, unsigned short addr));
469		−
470	464	/* Common custom probe functions */
471	465	int i2c_probe_func_quick_read(struct i2c_adapter *adap, unsigned short addr);
472	466

include/linux/igmp.h+1−1

@@ -38,7 +38,7 @@ struct ip_sf_socklist { · 37 unmodified lines
38	38	unsigned int sl_max;
39	39	unsigned int sl_count;
40	40	struct rcu_head rcu;
41		− __be32 sl_addr[0];
	41	+ __be32 sl_addr[];
42	42	};
43	43
44	44	#define IP_SFLSIZE(count) (sizeof(struct ip_sf_socklist) + \

include/linux/ihex.h+1−1

@@ -18,7 +18,7 @@ · 17 unmodified lines
18	18	struct ihex_binrec {
19	19	__be32 addr;
20	20	__be16 len;
21		− uint8_t data[0];
	21	+ uint8_t data[];
22	22	} __attribute__((packed));
23	23
24	24	static inline uint16_t ihex_binrec_size(const struct ihex_binrec *p)

include/linux/iio/iio.h+1−1

@@ -600,7 +600,7 @@ void iio_device_unregister(struct iio_dev *indio_dev); · 599 unmodified lines
600	600	* 0 on success, negative error number on failure.
601	601	*/
602	602	#define devm_iio_device_register(dev, indio_dev) \
603		− __devm_iio_device_register((dev), (indio_dev), THIS_MODULE);
	603	+ __devm_iio_device_register((dev), (indio_dev), THIS_MODULE)
604	604	int __devm_iio_device_register(struct device dev, struct iio_dev indio_dev,
605	605	struct module *this_mod);
606	606	void devm_iio_device_unregister(struct device dev, struct iio_dev indio_dev);

include/linux/irq.h+2−4

@@ -573,8 +573,6 @@ enum { · 572 unmodified lines
573	573	#define IRQ_DEFAULT_INIT_FLAGS ARCH_IRQ_INIT_FLAGS
574	574
575	575	struct irqaction;
576		−extern int setup_irq(unsigned int irq, struct irqaction *new);
577		−extern void remove_irq(unsigned int irq, struct irqaction *act);
578	576	extern int setup_percpu_irq(unsigned int irq, struct irqaction *new);
579	577	extern void remove_percpu_irq(unsigned int irq, struct irqaction *act);
580	578
@@ -1043,7 +1041,7 @@ struct irq_chip_generic { · 462 unmodified lines
1043	1041	unsigned long unused;
1044	1042	struct irq_domain *domain;
1045	1043	struct list_head list;
1046		− struct irq_chip_type chip_types[0];
	1044	+ struct irq_chip_type chip_types[];
1047	1045	};
1048	1046
1049	1047	/**
@@ -1079,7 +1077,7 @@ struct irq_domain_chip_generic { · 29 unmodified lines
1079	1077	unsigned int irq_flags_to_clear;
1080	1078	unsigned int irq_flags_to_set;
1081	1079	enum irq_gc_flags gc_flags;
1082		− struct irq_chip_generic *gc[0];
	1080	+ struct irq_chip_generic *gc[];
1083	1081	};
1084	1082
1085	1083	/* Generic chip callback functions */

include/linux/irqchip/arm-gic-v3.h+2−0

@@ -243,6 +243,7 @@ · 242 unmodified lines
243	243
244	244	#define GICR_TYPER_PLPIS (1U << 0)
245	245	#define GICR_TYPER_VLPIS (1U << 1)
	246	+#define GICR_TYPER_DIRTY (1U << 2)
246	247	#define GICR_TYPER_DirectLPIS (1U << 3)
247	248	#define GICR_TYPER_LAST (1U << 4)
248	249	#define GICR_TYPER_RVPEID (1U << 7)
@@ -686,6 +687,7 @@ struct rdists { · 437 unmodified lines
686	687	bool has_vlpis;
687	688	bool has_rvpeid;
688	689	bool has_direct_lpi;
	690	+ bool has_vpend_valid_dirty;
689	691	};
690	692
691	693	struct irq_domain;

include/linux/kvm_host.h+4−1

@@ -813,8 +813,11 @@ void kvm_flush_remote_tlbs(struct kvm *kvm); · 812 unmodified lines
813	813	void kvm_reload_remote_mmus(struct kvm *kvm);
814	814
815	815	bool kvm_make_vcpus_request_mask(struct kvm *kvm, unsigned int req,
	816	+ struct kvm_vcpu *except,
816	817	unsigned long *vcpu_bitmap, cpumask_var_t tmp);
817	818	bool kvm_make_all_cpus_request(struct kvm *kvm, unsigned int req);
	819	+bool kvm_make_all_cpus_request_except(struct kvm *kvm, unsigned int req,
	820	+ struct kvm_vcpu *except);
818	821	bool kvm_make_cpus_request_mask(struct kvm *kvm, unsigned int req,
819	822	unsigned long *vcpu_bitmap);
820	823
@@ -1048,7 +1051,7 @@ search_memslots(struct kvm_memslots *slots, gfn_t gfn) · 227 unmodified lines
1048	1051	start = slot + 1;
1049	1052	}
1050	1053
1051		− if (gfn >= memslots[start].base_gfn &&
	1054	+ if (start < slots->used_slots && gfn >= memslots[start].base_gfn &&
1052	1055	gfn < memslots[start].base_gfn + memslots[start].npages) {
1053	1056	atomic_set(&slots->lru_slot, start);
1054	1057	return &memslots[start];

include/linux/list_lru.h+1−1

@@ -34,7 +34,7 @@ struct list_lru_one { · 33 unmodified lines
34	34	struct list_lru_memcg {
35	35	struct rcu_head rcu;
36	36	/* array of per cgroup lists, indexed by memcg_cache_id */
37		− struct list_lru_one *lru[0];
	37	+ struct list_lru_one *lru[];
38	38	};
39	39
40	40	struct list_lru_node {

include/linux/lsm_hook_defs.h+2−2

@@ -55,7 +55,7 @@ LSM_HOOK(void, LSM_RET_VOID, bprm_committing_creds, struct linux_binprm *bprm) · 54 unmodified lines
55	55	LSM_HOOK(void, LSM_RET_VOID, bprm_committed_creds, struct linux_binprm *bprm)
56	56	LSM_HOOK(int, 0, fs_context_dup, struct fs_context *fc,
57	57	struct fs_context *src_sc)
58		−LSM_HOOK(int, 0, fs_context_parse_param, struct fs_context *fc,
	58	+LSM_HOOK(int, -ENOPARAM, fs_context_parse_param, struct fs_context *fc,
59	59	struct fs_parameter *param)
60	60	LSM_HOOK(int, 0, sb_alloc_security, struct super_block *sb)
61	61	LSM_HOOK(void, LSM_RET_VOID, sb_free_security, struct super_block *sb)
@@ -243,7 +243,7 @@ LSM_HOOK(int, -EINVAL, getprocattr, struct task_struct p, char name, · 181 unmodified lines
243	243	char **value)
244	244	LSM_HOOK(int, -EINVAL, setprocattr, const char name, void value, size_t size)
245	245	LSM_HOOK(int, 0, ismaclabel, const char *name)
246		−LSM_HOOK(int, 0, secid_to_secctx, u32 secid, char **secdata,
	246	+LSM_HOOK(int, -EOPNOTSUPP, secid_to_secctx, u32 secid, char **secdata,
247	247	u32 *seclen)
248	248	LSM_HOOK(int, 0, secctx_to_secid, const char secdata, u32 seclen, u32 secid)
249	249	LSM_HOOK(void, LSM_RET_VOID, release_secctx, char *secdata, u32 seclen)

include/linux/memcontrol.h+4−2

@@ -106,7 +106,7 @@ struct lruvec_stat { · 105 unmodified lines
106	106	*/
107	107	struct memcg_shrinker_map {
108	108	struct rcu_head rcu;
109		− unsigned long map[0];
	109	+ unsigned long map[];
110	110	};
111	111
112	112	/*
@@ -148,7 +148,7 @@ struct mem_cgroup_threshold_ary { · 35 unmodified lines
148	148	/* Size of entries[] */
149	149	unsigned int size;
150	150	/* Array of thresholds */
151		− struct mem_cgroup_threshold entries[0];
	151	+ struct mem_cgroup_threshold entries[];
152	152	};
153	153
154	154	struct mem_cgroup_thresholds {
@@ -783,6 +783,8 @@ static inline void memcg_memory_event(struct mem_cgroup *memcg, · 628 unmodified lines
783	783	atomic_long_inc(&memcg->memory_events[event]);
784	784	cgroup_file_notify(&memcg->events_file);
785	785
	786	+ if (!cgroup_subsys_on_dfl(memory_cgrp_subsys))
	787	+ break;
786	788	if (cgrp_dfl_root.flags & CGRP_ROOT_MEMORY_LOCAL_EVENTS)
787	789	break;
788	790	} while ((memcg = parent_mem_cgroup(memcg)) &&

include/linux/mhi.h+10−6

@@ -53,9 +53,9 @@ enum mhi_callback { · 52 unmodified lines
53	53	* @MHI_CHAIN: Linked transfer
54	54	*/
55	55	enum mhi_flags {
56		− MHI_EOB,
57		− MHI_EOT,
58		− MHI_CHAIN,
	56	+ MHI_EOB = BIT(0),
	57	+ MHI_EOT = BIT(1),
	58	+ MHI_CHAIN = BIT(2),
59	59	};
60	60
61	61	/**
@@ -335,14 +335,15 @@ struct mhi_controller_config { · 273 unmodified lines
335	335	* @syserr_worker: System error worker
336	336	* @state_event: State change event
337	337	* @status_cb: CB function to notify power states of the device (required)
338		− * @link_status: CB function to query link status of the device (required)
339	338	* @wake_get: CB function to assert device wake (optional)
340	339	* @wake_put: CB function to de-assert device wake (optional)
341	340	* @wake_toggle: CB function to assert and de-assert device wake (optional)
342	341	* @runtime_get: CB function to controller runtime resume (required)
343		− * @runtimet_put: CB function to decrement pm usage (required)
	342	+ * @runtime_put: CB function to decrement pm usage (required)
344	343	* @map_single: CB function to create TRE buffer
345	344	* @unmap_single: CB function to destroy TRE buffer
	345	+ * @read_reg: Read a MHI register via the physical link (required)
	346	+ * @write_reg: Write a MHI register via the physical link (required)
346	347	* @buffer_len: Bounce buffer length
347	348	* @bounce_buf: Use of bounce buffer
348	349	* @fbc_download: MHI host needs to do complete image transfer (optional)
@@ -417,7 +418,6 @@ struct mhi_controller { · 68 unmodified lines
417	418
418	419	void (status_cb)(struct mhi_controller mhi_cntrl,
419	420	enum mhi_callback cb);
420		− int (link_status)(struct mhi_controller mhi_cntrl);
421	421	void (wake_get)(struct mhi_controller mhi_cntrl, bool override);
422	422	void (wake_put)(struct mhi_controller mhi_cntrl, bool override);
423	423	void (wake_toggle)(struct mhi_controller mhi_cntrl);
@@ -427,6 +427,10 @@ struct mhi_controller { · 3 unmodified lines
427	427	struct mhi_buf_info *buf);
428	428	void (unmap_single)(struct mhi_controller mhi_cntrl,
429	429	struct mhi_buf_info *buf);
	430	+ int (read_reg)(struct mhi_controller mhi_cntrl, void __iomem *addr,
	431	+ u32 *out);
	432	+ void (write_reg)(struct mhi_controller mhi_cntrl, void __iomem *addr,
	433	+ u32 val);
430	434
431	435	size_t buffer_len;
432	436	bool bounce_buf;

include/linux/nfs_xdr.h+2−0

@@ -1317,11 +1317,13 @@ struct nfs41_impl_id { · 1316 unmodified lines
1317	1317	struct nfstime4 date;
1318	1318	};
1319	1319
	1320	+#define MAX_BIND_CONN_TO_SESSION_RETRIES 3
1320	1321	struct nfs41_bind_conn_to_session_args {
1321	1322	struct nfs_client *client;
1322	1323	struct nfs4_sessionid sessionid;
1323	1324	u32 dir;
1324	1325	bool use_conn_in_rdma_mode;
	1326	+ int retries;
1325	1327	};
1326	1328
1327	1329	struct nfs41_bind_conn_to_session_res {

include/linux/platform_data/cros_ec_sensorhub.h+1−0

@@ -185,6 +185,7 @@ int cros_ec_sensorhub_register_push_data(struct cros_ec_sensorhub *sensorhub, · 184 unmodified lines
185	185	void cros_ec_sensorhub_unregister_push_data(struct cros_ec_sensorhub *sensorhub,
186	186	u8 sensor_num);
187	187
	188	+int cros_ec_sensorhub_ring_allocate(struct cros_ec_sensorhub *sensorhub);
188	189	int cros_ec_sensorhub_ring_add(struct cros_ec_sensorhub *sensorhub);
189	190	void cros_ec_sensorhub_ring_remove(void *arg);
190	191	int cros_ec_sensorhub_ring_fifo_enable(struct cros_ec_sensorhub *sensorhub,

include/linux/platform_data/wilco-ec.h+1−1

@@ -83,7 +83,7 @@ struct wilco_ec_response { · 82 unmodified lines
83	83	u16 result;
84	84	u16 data_size;
85	85	u8 reserved[2];
86		− u8 data[0];
	86	+ u8 data[];
87	87	} __packed;
88	88
89	89	/**

include/linux/platform_device.h+1−0

@@ -25,6 +25,7 @@ struct platform_device { · 24 unmodified lines
25	25	bool id_auto;
26	26	struct device dev;
27	27	u64 platform_dma_mask;
	28	+ struct device_dma_parameters dma_parms;
28	29	u32 num_resources;
29	30	struct resource *resource;
30	31

include/linux/pnp.h+9−20

@@ -220,10 +220,8 @@ struct pnp_card { · 219 unmodified lines
220	220	#define global_to_pnp_card(n) list_entry(n, struct pnp_card, global_list)
221	221	#define protocol_to_pnp_card(n) list_entry(n, struct pnp_card, protocol_list)
222	222	#define to_pnp_card(n) container_of(n, struct pnp_card, dev)
223		−#define pnp_for_each_card(card) \
224		− for((card) = global_to_pnp_card(pnp_cards.next); \
225		− (card) != global_to_pnp_card(&pnp_cards); \
226		− (card) = global_to_pnp_card((card)->global_list.next))
	223	+#define pnp_for_each_card(card) \
	224	+ list_for_each_entry(card, &pnp_cards, global_list)
227	225
228	226	struct pnp_card_link {
229	227	struct pnp_card *card;
@@ -276,14 +274,9 @@ struct pnp_dev { · 46 unmodified lines
276	274	#define card_to_pnp_dev(n) list_entry(n, struct pnp_dev, card_list)
277	275	#define protocol_to_pnp_dev(n) list_entry(n, struct pnp_dev, protocol_list)
278	276	#define to_pnp_dev(n) container_of(n, struct pnp_dev, dev)
279		−#define pnp_for_each_dev(dev) \
280		− for((dev) = global_to_pnp_dev(pnp_global.next); \
281		− (dev) != global_to_pnp_dev(&pnp_global); \
282		− (dev) = global_to_pnp_dev((dev)->global_list.next))
283		−#define card_for_each_dev(card,dev) \
284		− for((dev) = card_to_pnp_dev((card)->devices.next); \
285		− (dev) != card_to_pnp_dev(&(card)->devices); \
286		− (dev) = card_to_pnp_dev((dev)->card_list.next))
	277	+#define pnp_for_each_dev(dev) list_for_each_entry(dev, &pnp_global, global_list)
	278	+#define card_for_each_dev(card, dev) \
	279	+ list_for_each_entry(dev, &(card)->devices, card_list)
287	280	#define pnp_dev_name(dev) (dev)->name
288	281
289	282	static inline void pnp_get_drvdata(struct pnp_dev pdev)
@@ -437,14 +430,10 @@ struct pnp_protocol { · 147 unmodified lines
437	430	};
438	431
439	432	#define to_pnp_protocol(n) list_entry(n, struct pnp_protocol, protocol_list)
440		−#define protocol_for_each_card(protocol,card) \
441		− for((card) = protocol_to_pnp_card((protocol)->cards.next); \
442		− (card) != protocol_to_pnp_card(&(protocol)->cards); \
443		− (card) = protocol_to_pnp_card((card)->protocol_list.next))
444		−#define protocol_for_each_dev(protocol,dev) \
445		− for((dev) = protocol_to_pnp_dev((protocol)->devices.next); \
446		− (dev) != protocol_to_pnp_dev(&(protocol)->devices); \
447		− (dev) = protocol_to_pnp_dev((dev)->protocol_list.next))
	433	+#define protocol_for_each_card(protocol, card) \
	434	+ list_for_each_entry(card, &(protocol)->cards, protocol_list)
	435	+#define protocol_for_each_dev(protocol, dev) \
	436	+ list_for_each_entry(dev, &(protocol)->devices, protocol_list)
448	437
449	438	extern struct bus_type pnp_bus_type;
450	439

include/linux/posix_acl.h+1−1

@@ -28,7 +28,7 @@ struct posix_acl { · 27 unmodified lines
28	28	refcount_t a_refcount;
29	29	struct rcu_head a_rcu;
30	30	unsigned int a_count;
31		− struct posix_acl_entry a_entries[0];
	31	+ struct posix_acl_entry a_entries[];
32	32	};
33	33
34	34	#define FOREACH_ACL_ENTRY(pa, acl, pe) \

include/linux/ptp_clock_kernel.h+4−4

@@ -105,10 +105,10 @@ struct ptp_system_timestamp { · 104 unmodified lines
105	105	* parameter func: the desired function to use.
106	106	* parameter chan: the function channel index to use.
107	107	*
108		− * @do_work: Request driver to perform auxiliary (periodic) operations
109		− * Driver should return delay of the next auxiliary work scheduling
110		− * time (>=0) or negative value in case further scheduling
111		− * is not required.
	108	+ * @do_aux_work: Request driver to perform auxiliary (periodic) operations
	109	+ * Driver should return delay of the next auxiliary work
	110	+ * scheduling time (>=0) or negative value in case further
	111	+ * scheduling is not required.
112	112	*
113	113	* Drivers should embed their ptp_clock_info within a private
114	114	* structure, obtaining a reference to it using container_of().

include/linux/rio.h+2−2

@@ -100,7 +100,7 @@ struct rio_switch { · 99 unmodified lines
100	100	u32 port_ok;
101	101	struct rio_switch_ops *ops;
102	102	spinlock_t lock;
103		− struct rio_dev *nextdev[0];
	103	+ struct rio_dev *nextdev[];
104	104	};
105	105
106	106	/**
@@ -201,7 +201,7 @@ struct rio_dev { · 94 unmodified lines
201	201	u8 hopcount;
202	202	struct rio_dev *prev;
203	203	atomic_t state;
204		− struct rio_switch rswitch[0]; /* RIO switch info */
	204	+ struct rio_switch rswitch[]; /* RIO switch info */
205	205	};
206	206
207	207	#define rio_dev_g(n) list_entry(n, struct rio_dev, global_list)

include/linux/rslib.h+1−1

@@ -54,7 +54,7 @@ struct rs_codec { · 53 unmodified lines
54	54	*/
55	55	struct rs_control {
56	56	struct rs_codec *codec;
57		− uint16_t buffers[0];
	57	+ uint16_t buffers[];
58	58	};
59	59
60	60	/* General purpose RS codec, 8-bit data width, symbol width 1-15 bit */

include/linux/sched/topology.h+1−1

@@ -142,7 +142,7 @@ struct sched_domain { · 141 unmodified lines
142	142	* by attaching extra space to the end of the structure,
143	143	* depending on how many CPUs the kernel has booted up with)
144	144	*/
145		− unsigned long span[0];
	145	+ unsigned long span[];
146	146	};
147	147
148	148	static inline struct cpumask sched_domain_span(struct sched_domain sd)

include/linux/skbuff.h+1−1

@@ -4162,7 +4162,7 @@ struct skb_ext { · 4161 unmodified lines
4162	4162	refcount_t refcnt;
4163	4163	u8 offset[SKB_EXT_NUM]; /* in chunks of 8 bytes */
4164	4164	u8 chunks; /* same */
4165		− char data[0] __aligned(8);
	4165	+ char data[] __aligned(8);
4166	4166	};
4167	4167
4168	4168	struct skb_ext *__skb_ext_alloc(void);

include/linux/skmsg.h+1−0

@@ -187,6 +187,7 @@ static inline void sk_msg_xfer(struct sk_msg dst, struct sk_msg src, · 186 unmodified lines
187	187	dst->sg.data[which] = src->sg.data[which];
188	188	dst->sg.data[which].length = size;
189	189	dst->sg.size += size;
	190	+ src->sg.size -= size;
190	191	src->sg.data[which].length -= size;
191	192	src->sg.data[which].offset += size;
192	193	}

include/linux/stmmac.h+2−0

@@ -177,6 +177,8 @@ struct plat_stmmacenet_data { · 176 unmodified lines
177	177	struct stmmac_rxq_cfg rx_queues_cfg[MTL_MAX_RX_QUEUES];
178	178	struct stmmac_txq_cfg tx_queues_cfg[MTL_MAX_TX_QUEUES];
179	179	void (fix_mac_speed)(void priv, unsigned int speed);
	180	+ int (serdes_powerup)(struct net_device ndev, void *priv);
	181	+ void (serdes_powerdown)(struct net_device ndev, void *priv);
180	182	int (init)(struct platform_device pdev, void *priv);
181	183	void (exit)(struct platform_device pdev, void *priv);
182	184	struct mac_device_info (setup)(void *priv);

include/linux/sunrpc/clnt.h+12−1

@@ -71,7 +71,13 @@ struct rpc_clnt { · 70 unmodified lines
71	71	#if IS_ENABLED(CONFIG_SUNRPC_DEBUG)
72	72	struct dentry cl_debugfs; / debugfs directory */
73	73	#endif
74		− struct rpc_xprt_iter cl_xpi;
	74	+ /* cl_work is only needed after cl_xpi is no longer used,
	75	+ * and that are of similar size
	76	+ */
	77	+ union {
	78	+ struct rpc_xprt_iter cl_xpi;
	79	+ struct work_struct cl_work;
	80	+ };
75	81	const struct cred *cl_cred;
76	82	};
77	83
@@ -236,4 +242,9 @@ static inline int rpc_reply_expected(struct rpc_task *task) · 158 unmodified lines
236	242	(task->tk_msg.rpc_proc->p_decode != NULL);
237	243	}
238	244
	245	+static inline void rpc_task_close_connection(struct rpc_task *task)
	246	+{
	247	+ if (task->tk_xprt)
	248	+ xprt_force_disconnect(task->tk_xprt);
	249	+}
239	250	#endif /* _LINUX_SUNRPC_CLNT_H */

include/linux/sunrpc/gss_api.h+3−0

@@ -21,6 +21,7 @@ · 20 unmodified lines
21	21	struct gss_ctx {
22	22	struct gss_api_mech *mech_type;
23	23	void *internal_ctx_id;
	24	+ unsigned int slack, align;
24	25	};
25	26
26	27	#define GSS_C_NO_BUFFER ((struct xdr_netobj) 0)
@@ -66,6 +67,7 @@ u32 gss_wrap( · 39 unmodified lines
66	67	u32 gss_unwrap(
67	68	struct gss_ctx *ctx_id,
68	69	int offset,
	70	+ int len,
69	71	struct xdr_buf *inbuf);
70	72	u32 gss_delete_sec_context(
71	73	struct gss_ctx **ctx_id);
@@ -126,6 +128,7 @@ struct gss_api_ops { · 54 unmodified lines
126	128	u32 (*gss_unwrap)(
127	129	struct gss_ctx *ctx_id,
128	130	int offset,
	131	+ int len,
129	132	struct xdr_buf *buf);
130	133	void (*gss_delete_sec_context)(
131	134	void *internal_ctx_id);

include/linux/sunrpc/gss_krb5.h+3−3

@@ -83,7 +83,7 @@ struct gss_krb5_enctype { · 82 unmodified lines
83	83	u32 (encrypt_v2) (struct krb5_ctx kctx, u32 offset,
84	84	struct xdr_buf *buf,
85	85	struct page *pages); / v2 encryption function */
86		− u32 (decrypt_v2) (struct krb5_ctx kctx, u32 offset,
	86	+ u32 (decrypt_v2) (struct krb5_ctx kctx, u32 offset, u32 len,
87	87	struct xdr_buf buf, u32 headskip,
88	88	u32 tailskip); / v2 decryption function */
89	89	};
@@ -255,7 +255,7 @@ gss_wrap_kerberos(struct gss_ctx *ctx_id, int offset, · 165 unmodified lines
255	255	struct xdr_buf outbuf, struct page *pages);
256	256
257	257	u32
258		−gss_unwrap_kerberos(struct gss_ctx *ctx_id, int offset,
	258	+gss_unwrap_kerberos(struct gss_ctx *ctx_id, int offset, int len,
259	259	struct xdr_buf *buf);
260	260
261	261
@@ -312,7 +312,7 @@ gss_krb5_aes_encrypt(struct krb5_ctx *kctx, u32 offset, · 50 unmodified lines
312	312	struct page **pages);
313	313
314	314	u32
315		−gss_krb5_aes_decrypt(struct krb5_ctx *kctx, u32 offset,
	315	+gss_krb5_aes_decrypt(struct krb5_ctx *kctx, u32 offset, u32 len,
316	316	struct xdr_buf buf, u32 plainoffset,
317	317	u32 *plainlen);
318	318

include/linux/sunrpc/svc_rdma.h+1−0

@@ -170,6 +170,7 @@ extern bool svc_rdma_post_recvs(struct svcxprt_rdma *rdma); · 169 unmodified lines
170	170	extern void svc_rdma_recv_ctxt_put(struct svcxprt_rdma *rdma,
171	171	struct svc_rdma_recv_ctxt *ctxt);
172	172	extern void svc_rdma_flush_recv_queues(struct svcxprt_rdma *rdma);
	173	+extern void svc_rdma_release_rqst(struct svc_rqst *rqstp);
173	174	extern int svc_rdma_recvfrom(struct svc_rqst *);
174	175
175	176	/* svc_rdma_rw.c */

include/linux/sunrpc/xdr.h+1−0

@@ -184,6 +184,7 @@ xdr_adjust_iovec(struct kvec iov, __be32 p) · 183 unmodified lines
184	184	extern void xdr_shift_buf(struct xdr_buf *, size_t);
185	185	extern void xdr_buf_from_iov(struct kvec , struct xdr_buf );
186	186	extern int xdr_buf_subsegment(struct xdr_buf , struct xdr_buf , unsigned int, unsigned int);
	187	+extern void xdr_buf_trim(struct xdr_buf *, unsigned int);
187	188	extern int read_bytes_from_xdr_buf(struct xdr_buf , unsigned int, void , unsigned int);
188	189	extern int write_bytes_to_xdr_buf(struct xdr_buf , unsigned int, void , unsigned int);
189	190

include/linux/swap.h+1−1

@@ -275,7 +275,7 @@ struct swap_info_struct { · 274 unmodified lines
275	275	*/
276	276	struct work_struct discard_work; /* discard worker */
277	277	struct swap_cluster_list discard_clusters; /* discard clusters list */
278		− struct plist_node avail_lists[0]; /*
	278	+ struct plist_node avail_lists[]; /*
279	279	* entries in swap_avail_heads, one
280	280	* entry per node.
281	281	* Must be last as the number of the

include/linux/tcp.h+0−51

@@ -78,47 +78,6 @@ struct tcp_sack_block { · 77 unmodified lines
78	78	#define TCP_SACK_SEEN (1 << 0) /1 = peer is SACK capable, /
79	79	#define TCP_DSACK_SEEN (1 << 2) /1 = DSACK was received from peer/
80	80
81		−#if IS_ENABLED(CONFIG_MPTCP)
82		−struct mptcp_options_received {
83		− u64 sndr_key;
84		− u64 rcvr_key;
85		− u64 data_ack;
86		− u64 data_seq;
87		− u32 subflow_seq;
88		− u16 data_len;
89		− u16 mp_capable : 1,
90		− mp_join : 1,
91		− dss : 1,
92		− add_addr : 1,
93		− rm_addr : 1,
94		− family : 4,
95		− echo : 1,
96		− backup : 1;
97		− u32 token;
98		− u32 nonce;
99		− u64 thmac;
100		− u8 hmac[20];
101		− u8 join_id;
102		− u8 use_map:1,
103		− dsn64:1,
104		− data_fin:1,
105		− use_ack:1,
106		− ack64:1,
107		− mpc_map:1,
108		− __unused:2;
109		− u8 addr_id;
110		− u8 rm_id;
111		− union {
112		− struct in_addr addr;
113		−#if IS_ENABLED(CONFIG_MPTCP_IPV6)
114		− struct in6_addr addr6;
115		−#endif
116		− };
117		− u64 ahmac;
118		− u16 port;
119		−};
120		−#endif
121		−
122	81	struct tcp_options_received {
123	82	/* PAWS/RTTM data */
124	83	int ts_recent_stamp;/* Time we stored ts_recent (for aging) */
@@ -136,9 +95,6 @@ struct tcp_options_received { · 11 unmodified lines
136	95	u8 num_sacks; /* Number of SACK blocks */
137	96	u16 user_mss; /* mss requested by user in ioctl */
138	97	u16 mss_clamp; /* Maximal mss, negotiated at connection setup */
139		−#if IS_ENABLED(CONFIG_MPTCP)
140		− struct mptcp_options_received mptcp;
141		−#endif
142	98	};
143	99
144	100	static inline void tcp_clear_options(struct tcp_options_received *rx_opt)
@@ -148,13 +104,6 @@ static inline void tcp_clear_options(struct tcp_options_received *rx_opt) · 3 unmodified lines
148	104	#if IS_ENABLED(CONFIG_SMC)
149	105	rx_opt->smc_ok = 0;
150	106	#endif
151		−#if IS_ENABLED(CONFIG_MPTCP)
152		− rx_opt->mptcp.mp_capable = 0;
153		− rx_opt->mptcp.mp_join = 0;
154		− rx_opt->mptcp.add_addr = 0;
155		− rx_opt->mptcp.rm_addr = 0;
156		− rx_opt->mptcp.dss = 0;
157		−#endif
158	107	}
159	108
160	109	/* This is the max number of SACKS that we'll generate and process. It's safe

include/linux/ti_wilink_st.h+3−3

@@ -295,7 +295,7 @@ struct bts_header { · 294 unmodified lines
295	295	u32 magic;
296	296	u32 version;
297	297	u8 future[24];
298		− u8 actions[0];
	298	+ u8 actions[];
299	299	} __attribute__ ((packed));
300	300
301	301	/**
@@ -305,7 +305,7 @@ struct bts_header { · 3 unmodified lines
305	305	struct bts_action {
306	306	u16 type;
307	307	u16 size;
308		− u8 data[0];
	308	+ u8 data[];
309	309	} __attribute__ ((packed));
310	310
311	311	struct bts_action_send {
@@ -315,7 +315,7 @@ struct bts_action_send { · 3 unmodified lines
315	315	struct bts_action_wait {
316	316	u32 msec;
317	317	u32 size;
318		− u8 data[0];
	318	+ u8 data[];
319	319	} __attribute__ ((packed));
320	320
321	321	struct bts_action_delay {

include/linux/tpm_eventlog.h+3−3

@@ -28,7 +28,7 @@ struct tcpa_event { · 27 unmodified lines
28	28	u32 event_type;
29	29	u8 pcr_value[20]; /* SHA1 */
30	30	u32 event_size;
31		− u8 event_data[0];
	31	+ u8 event_data[];
32	32	};
33	33
34	34	enum tcpa_event_types {
@@ -55,7 +55,7 @@ enum tcpa_event_types { · 20 unmodified lines
55	55	struct tcpa_pc_event {
56	56	u32 event_id;
57	57	u32 event_size;
58		− u8 event_data[0];
	58	+ u8 event_data[];
59	59	};
60	60
61	61	enum tcpa_pc_event_ids {
@@ -102,7 +102,7 @@ struct tcg_pcr_event { · 40 unmodified lines
102	102
103	103	struct tcg_event_field {
104	104	u32 event_size;
105		− u8 event[0];
	105	+ u8 event[];
106	106	} __packed;
107	107
108	108	struct tcg_pcr_event2_head {

include/linux/tracepoint.h+1−21

@@ -156,8 +156,7 @@ static inline struct tracepoint tracepoint_ptr_deref(tracepoint_ptr_t p) · 155 unmodified lines
156	156	* Note, the proto and args passed in includes "__data" as the first parameter.
157	157	* The reason for this is to handle the "void" prototype. If a tracepoint
158	158	* has a "void" prototype, then it is invalid to declare a function
159		− * as "(void *, void)". The DECLARE_TRACE_NOARGS() will pass in just
160		− * "void data", where as the DECLARE_TRACE() will pass in "void data, proto".
	159	+ * as "(void *, void)".
161	160	*/
162	161	#define __DO_TRACE(tp, proto, args, cond, rcuidle) \
163	162	do { \
@@ -373,25 +372,6 @@ static inline struct tracepoint tracepoint_ptr_deref(tracepoint_ptr_t p) · 209 unmodified lines
373	372	# define __tracepoint_string
374	373	#endif
375	374
376		−/*
377		− * The need for the DECLARE_TRACE_NOARGS() is to handle the prototype
378		− * (void). "void" is a special value in a function prototype and can
379		− * not be combined with other arguments. Since the DECLARE_TRACE()
380		− * macro adds a data element at the beginning of the prototype,
381		− * we need a way to differentiate "(void *data, proto)" from
382		− * "(void *data, void)". The second prototype is invalid.
383		− *
384		− * DECLARE_TRACE_NOARGS() passes "void" as the tracepoint prototype
385		− * and "void *__data" as the callback prototype.
386		− *
387		− * DECLARE_TRACE() passes "proto" as the tracepoint protoype and
388		− * "void *__data, proto" as the callback prototype.
389		− */
390		−#define DECLARE_TRACE_NOARGS(name) \
391		− __DECLARE_TRACE(name, void, , \
392		− cpu_online(raw_smp_processor_id()), \
393		− void *__data, __data)
394		−
395	375	#define DECLARE_TRACE(name, proto, args) \
396	376	__DECLARE_TRACE(name, PARAMS(proto), PARAMS(args), \
397	377	cpu_online(raw_smp_processor_id()), \

include/linux/tty.h+1−1

@@ -66,7 +66,7 @@ struct tty_buffer { · 65 unmodified lines
66	66	int read;
67	67	int flags;
68	68	/* Data points here */
69		− unsigned long data[0];
	69	+ unsigned long data[];
70	70	};
71	71
72	72	/* Values for .flags field of tty_buffer */

include/linux/vdpa.h+1−1

@@ -164,7 +164,7 @@ struct vdpa_config_ops { · 163 unmodified lines
164	164	u64 (get_vq_state)(struct vdpa_device vdev, u16 idx);
165	165
166	166	/* Device ops */
167		− u16 (get_vq_align)(struct vdpa_device vdev);
	167	+ u32 (get_vq_align)(struct vdpa_device vdev);
168	168	u64 (get_features)(struct vdpa_device vdev);
169	169	int (set_features)(struct vdpa_device vdev, u64 features);
170	170	void (set_config_cb)(struct vdpa_device vdev,

include/linux/vermagic.h+5−3

@@ -1,5 +1,9 @@
1	1	/* SPDX-License-Identifier: GPL-2.0 */
	2	+#ifndef _LINUX_VERMAGIC_H
	3	+#define _LINUX_VERMAGIC_H
	4	+
2	5	#include <generated/utsrelease.h>
	6	+#include <asm/vermagic.h>
3	7
4	8	/* Simply sanity version stamp for modules. */
5	9	#ifdef CONFIG_SMP
@@ -24,9 +28,6 @@ · 18 unmodified lines
24	28	#else
25	29	#define MODULE_VERMAGIC_MODVERSIONS ""
26	30	#endif
27		−#ifndef MODULE_ARCH_VERMAGIC
28		−#define MODULE_ARCH_VERMAGIC ""
29		−#endif
30	31	#ifdef RANDSTRUCT_PLUGIN
31	32	#include <generated/randomize_layout_hash.h>
32	33	#define MODULE_RANDSTRUCT_PLUGIN "RANDSTRUCT_PLUGIN_" RANDSTRUCT_HASHED_SEED
@@ -41,3 +42,4 @@ · 8 unmodified lines
41	42	MODULE_ARCH_VERMAGIC \
42	43	MODULE_RANDSTRUCT_PLUGIN
43	44
	45	+#endif /* _LINUX_VERMAGIC_H */

include/linux/virtio.h+0−1

@@ -9,7 +9,6 @@ · 8 unmodified lines
9	9	#include <linux/device.h>
10	10	#include <linux/mod_devicetable.h>
11	11	#include <linux/gfp.h>
12		−#include <linux/vringh.h>
13	12
14	13	/**
15	14	* virtqueue - a queue to register buffers for sending or receiving.

include/linux/virtio_net.h+24−2

@@ -3,6 +3,8 @@ · 2 unmodified lines
3	3	#define _LINUX_VIRTIO_NET_H
4	4
5	5	#include <linux/if_vlan.h>
	6	+#include <uapi/linux/tcp.h>
	7	+#include <uapi/linux/udp.h>
6	8	#include <uapi/linux/virtio_net.h>
7	9
8	10	static inline int virtio_net_hdr_set_proto(struct sk_buff *skb,
@@ -28,17 +30,25 @@ static inline int virtio_net_hdr_to_skb(struct sk_buff *skb, · 19 unmodified lines
28	30	bool little_endian)
29	31	{
30	32	unsigned int gso_type = 0;
	33	+ unsigned int thlen = 0;
	34	+ unsigned int ip_proto;
31	35
32	36	if (hdr->gso_type != VIRTIO_NET_HDR_GSO_NONE) {
33	37	switch (hdr->gso_type & ~VIRTIO_NET_HDR_GSO_ECN) {
34	38	case VIRTIO_NET_HDR_GSO_TCPV4:
35	39	gso_type = SKB_GSO_TCPV4;
	40	+ ip_proto = IPPROTO_TCP;
	41	+ thlen = sizeof(struct tcphdr);
36	42	break;
37	43	case VIRTIO_NET_HDR_GSO_TCPV6:
38	44	gso_type = SKB_GSO_TCPV6;
	45	+ ip_proto = IPPROTO_TCP;
	46	+ thlen = sizeof(struct tcphdr);
39	47	break;
40	48	case VIRTIO_NET_HDR_GSO_UDP:
41	49	gso_type = SKB_GSO_UDP;
	50	+ ip_proto = IPPROTO_UDP;
	51	+ thlen = sizeof(struct udphdr);
42	52	break;
43	53	default:
44	54	return -EINVAL;
@@ -57,16 +67,22 @@ static inline int virtio_net_hdr_to_skb(struct sk_buff *skb, · 12 unmodified lines
57	67
58	68	if (!skb_partial_csum_set(skb, start, off))
59	69	return -EINVAL;
	70	+
	71	+ if (skb_transport_offset(skb) + thlen > skb_headlen(skb))
	72	+ return -EINVAL;
60	73	} else {
61	74	/* gso packets without NEEDS_CSUM do not set transport_offset.
62	75	* probe and drop if does not match one of the above types.
63	76	*/
64	77	if (gso_type && skb->network_header) {
	78	+ struct flow_keys_basic keys;
	79	+
65	80	if (!skb->protocol)
66	81	virtio_net_hdr_set_proto(skb, hdr);
67	82	retry:
68		− skb_probe_transport_header(skb);
69		− if (!skb_transport_header_was_set(skb)) {
	83	+ if (!skb_flow_dissect_flow_keys_basic(NULL, skb, &keys,
	84	+ NULL, 0, 0, 0,
	85	+ 0)) {
70	86	/* UFO does not specify ipv4 or 6: try both */
71	87	if (gso_type & SKB_GSO_UDP &&
72	88	skb->protocol == htons(ETH_P_IP)) {
@@ -75,6 +91,12 @@ retry: · 2 unmodified lines
75	91	}
76	92	return -EINVAL;
77	93	}
	94	+
	95	+ if (keys.control.thoff + thlen > skb_headlen(skb) \|\|
	96	+ keys.basic.ip_proto != ip_proto)
	97	+ return -EINVAL;
	98	+
	99	+ skb_set_transport_header(skb, keys.control.thoff);
78	100	}
79	101	}
80	102

include/linux/virtio_vsock.h+1−0

@@ -48,6 +48,7 @@ struct virtio_vsock_pkt { · 47 unmodified lines
48	48	u32 len;
49	49	u32 off;
50	50	bool reply;
	51	+ bool tap_delivered;
51	52	};
52	53
53	54	struct virtio_vsock_pkt_info {

include/linux/vmalloc.h+1−1

@@ -137,7 +137,7 @@ extern void vunmap(const void *addr); · 136 unmodified lines
137	137
138	138	extern int remap_vmalloc_range_partial(struct vm_area_struct *vma,
139	139	unsigned long uaddr, void *kaddr,
140		− unsigned long size);
	140	+ unsigned long pgoff, unsigned long size);
141	141
142	142	extern int remap_vmalloc_range(struct vm_area_struct vma, void addr,
143	143	unsigned long pgoff);

include/linux/vringh.h+6−0

@@ -14,8 +14,10 @@ · 13 unmodified lines
14	14	#include <linux/virtio_byteorder.h>
15	15	#include <linux/uio.h>
16	16	#include <linux/slab.h>
	17	+#if IS_REACHABLE(CONFIG_VHOST_IOTLB)
17	18	#include <linux/dma-direction.h>
18	19	#include <linux/vhost_iotlb.h>
	20	+#endif
19	21	#include <asm/barrier.h>
20	22
21	23	/* virtio_ring with information needed for host access. */
@@ -254,6 +256,8 @@ static inline __virtio64 cpu_to_vringh64(const struct vringh *vrh, u64 val) · 232 unmodified lines
254	256	return __cpu_to_virtio64(vringh_is_little_endian(vrh), val);
255	257	}
256	258
	259	+#if IS_REACHABLE(CONFIG_VHOST_IOTLB)
	260	+
257	261	void vringh_set_iotlb(struct vringh vrh, struct vhost_iotlb iotlb);
258	262
259	263	int vringh_init_iotlb(struct vringh *vrh, u64 features,
@@ -284,4 +288,6 @@ void vringh_notify_disable_iotlb(struct vringh *vrh); · 24 unmodified lines
284	288
285	289	int vringh_need_notify_iotlb(struct vringh *vrh);
286	290
	291	+#endif /* CONFIG_VHOST_IOTLB */
	292	+
287	293	#endif /* _LINUX_VRINGH_H */

include/linux/xattr.h+1−1

@@ -73,7 +73,7 @@ struct simple_xattr { · 72 unmodified lines
73	73	struct list_head list;
74	74	char *name;
75	75	size_t size;
76		− char value[0];
	76	+ char value[];
77	77	};
78	78
79	79	/*