Commit a3a8b54b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'Wstringop-overflow-fixes-5.19-rc1' of... 

Merge tag 'Wstringop-overflow-fixes-5.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux

Pull Wstringop-overflow fixes from Gustavo Silva:
 "Fix some -Wstringop-overflow warnings when building with GCC-11. All
  the patches have been in linux-next during the last development cycle.

  This is part of the ongoing efforts to globally enable
  -Wstringop-overflow"

* tag 'Wstringop-overflow-fixes-5.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux:
  drm/i915: Fix -Wstringop-overflow warning in call to intel_read_wm_latency()
  drm/amd/display: Fix Wstringop-overflow warnings in dc_link_dp.c
  scsi: fcoe: Fix Wstringop-overflow warnings in fcoe_wwn_from_mac()
parents 7e062cda 336feb50

drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c

+2 −2
Original line number Diff line number Diff line
@@ -793,7 +793,7 @@ bool dp_is_interlane_aligned(union lane_align_status_updated align_status) 
void dp_hw_to_dpcd_lane_settings(

		const struct link_training_settings *lt_settings,

		const struct dc_lane_settings hw_lane_settings[LANE_COUNT_DP_MAX],

		union dpcd_training_lane dpcd_lane_settings[LANE_COUNT_DP_MAX])

		union dpcd_training_lane dpcd_lane_settings[])

{

	uint8_t lane = 0;
@@ -823,7 +823,7 @@ void dp_decide_lane_settings( 
		const struct link_training_settings *lt_settings,

		const union lane_adjust ln_adjust[LANE_COUNT_DP_MAX],

		struct dc_lane_settings hw_lane_settings[LANE_COUNT_DP_MAX],

		union dpcd_training_lane dpcd_lane_settings[LANE_COUNT_DP_MAX])

		union dpcd_training_lane dpcd_lane_settings[])

{

	uint32_t lane;

drivers/gpu/drm/amd/display/dc/inc/dc_link_dp.h

+2 −2
Original line number Diff line number Diff line
@@ -148,12 +148,12 @@ bool dp_is_max_vs_reached( 
void dp_hw_to_dpcd_lane_settings(

	const struct link_training_settings *lt_settings,

	const struct dc_lane_settings hw_lane_settings[LANE_COUNT_DP_MAX],

	union dpcd_training_lane dpcd_lane_settings[LANE_COUNT_DP_MAX]);

	union dpcd_training_lane dpcd_lane_settings[]);

void dp_decide_lane_settings(

	const struct link_training_settings *lt_settings,

	const union lane_adjust ln_adjust[LANE_COUNT_DP_MAX],

	struct dc_lane_settings hw_lane_settings[LANE_COUNT_DP_MAX],

	union dpcd_training_lane dpcd_lane_settings[LANE_COUNT_DP_MAX]);

	union dpcd_training_lane dpcd_lane_settings[]);



uint32_t dp_translate_training_aux_read_interval(uint32_t dpcd_aux_read_interval);

drivers/gpu/drm/i915/intel_pm.c

+1 −1
Original line number Diff line number Diff line
@@ -2859,7 +2859,7 @@ static void ilk_compute_wm_level(const struct drm_i915_private *dev_priv, 
}



static void intel_read_wm_latency(struct drm_i915_private *dev_priv,

				  u16 wm[8])

				  u16 wm[])

{

	struct intel_uncore *uncore = &dev_priv->uncore;

drivers/scsi/fcoe/fcoe_ctlr.c

+1 −1
Original line number Diff line number Diff line
@@ -1969,7 +1969,7 @@ EXPORT_SYMBOL(fcoe_ctlr_recv_flogi); 
 *

 * Returns: u64 fc world wide name

 */

u64 fcoe_wwn_from_mac(unsigned char mac[MAX_ADDR_LEN],

u64 fcoe_wwn_from_mac(unsigned char mac[ETH_ALEN],

		      unsigned int scheme, unsigned int port)

{

	u64 wwn;

include/scsi/libfcoe.h

+2 −1
Original line number Diff line number Diff line
@@ -249,7 +249,8 @@ int fcoe_ctlr_recv_flogi(struct fcoe_ctlr *, struct fc_lport *, 
			 struct fc_frame *);



/* libfcoe funcs */

u64 fcoe_wwn_from_mac(unsigned char mac[MAX_ADDR_LEN], unsigned int, unsigned int);

u64 fcoe_wwn_from_mac(unsigned char mac[ETH_ALEN], unsigned int scheme,

		      unsigned int port);

int fcoe_libfc_config(struct fc_lport *, struct fcoe_ctlr *,

		      const struct libfc_function_template *, int init_fcp);

u32 fcoe_fc_crc(struct fc_frame *fp);