Merge tag 'flexible-array-conversions-5.10-rc2' of... (53760f9b) · Commits · 戴 / test

Merge tag 'flexible-array-conversions-5.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux Pull more flexible-array member conversions from Gustavo A. R. Silva: "Replace zero-length arrays with flexible-array members" * tag 'flexible-array-conversions-5.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux: printk: ringbuffer: Replace zero-length array with flexible-array member net/smc: Replace zero-length array with flexible-array member net/mlx5: Replace zero-length array with flexible-array member mei: hw: Replace zero-length array with flexible-array member gve: Replace zero-length array with flexible-array member Bluetooth: btintel: Replace zero-length array with flexible-array member scsi: target: tcmu: Replace zero-length array with flexible-array member ima: Replace zero-length array with flexible-array member enetc: Replace zero-length array with flexible-array member fs: Replace zero-length array with flexible-array member Bluetooth: Replace zero-length array with flexible-array member params: Replace zero-length array with flexible-array member tracepoint: Replace zero-length array with flexible-array member platform/chrome: cros_ec_proto: Replace zero-length array with flexible-array member platform/chrome: cros_ec_commands: Replace zero-length array with flexible-array member mailbox: zynqmp-ipi-message: Replace zero-length array with flexible-array member dmaengine: ti-cppi5: Replace zero-length array with flexible-array member

drivers/bluetooth/btintel.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -47,7 +47,7 @@ enum {
		struct intel_tlv {
		u8 type;
		u8 len;
		u8 val[0];
		u8 val[];
		} __packed;

		struct intel_version_tlv {

drivers/misc/mei/hw.h

+3 −3

Original line number	Diff line number	Diff line
		@@ -224,7 +224,7 @@ struct mei_ext_hdr {
		u8 type;
		u8 length;
		u8 ext_payload[2];
		u8 hdr[0];
		u8 hdr[];
		};

		/**
		@@ -238,7 +238,7 @@ struct mei_ext_meta_hdr {
		u8 count;
		u8 size;
		u8 reserved[2];
		struct mei_ext_hdr hdrs[0];
		struct mei_ext_hdr hdrs[];
		};

		/*
		@@ -308,7 +308,7 @@ struct mei_msg_hdr {
		u32 dma_ring:1;
		u32 internal:1;
		u32 msg_complete:1;
		u32 extension[0];
		u32 extension[];
		} __packed;

		/* The length is up to 9 bits */

drivers/net/ethernet/freescale/enetc/enetc_qos.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -402,7 +402,7 @@ struct enetc_psfp_gate {
		u32 num_entries;
		refcount_t refcount;
		struct hlist_node node;
		struct action_gate_entry entries[0];
		struct action_gate_entry entries[];
		};

		/* Only enable the green color frame now

drivers/net/ethernet/google/gve/gve_adminq.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -198,7 +198,7 @@ static_assert(sizeof(struct stats) == 16);

		struct gve_stats_report {
		__be64 written_count;
		struct stats stats[0];
		struct stats stats[];
		};

		static_assert(sizeof(struct gve_stats_report) == 8);

drivers/net/ethernet/google/gve/gve_main.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -116,9 +116,8 @@ static int gve_alloc_stats_report(struct gve_priv *priv)
		priv->tx_cfg.num_queues;
		rx_stats_num = (GVE_RX_STATS_REPORT_NUM + NIC_RX_STATS_REPORT_NUM) *
		priv->rx_cfg.num_queues;
		priv->stats_report_len = sizeof(struct gve_stats_report) +
		(tx_stats_num + rx_stats_num) *
		sizeof(struct stats);
		priv->stats_report_len = struct_size(priv->stats_report, stats,
		tx_stats_num + rx_stats_num);
		priv->stats_report =
		dma_alloc_coherent(&priv->pdev->dev, priv->stats_report_len,
		&priv->stats_report_bus, GFP_KERNEL);

Admin message