The following commit has been merged in the master branch: commit a3a8b54b4f1a261656eb6c9a517e68e1204cef39 Merge: 7e062cda7d90543ac8c7700fc7c5527d0c0f22ad 336feb502a715909a8136eb6a62a83d7268a353b Author: Linus Torvalds torvalds@linux-foundation.org Date: Wed May 25 13:52:24 2022 -0700

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()

diff --combined drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c index 95b5b5bfa1ff,cd6ca562348d..09807753196a --- a/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c @@@ -793,7 -793,7 +793,7 @@@ bool dp_is_interlane_aligned(union lane 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 +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;

@@@ -4440,7 -4440,7 +4440,7 @@@ static void dp_test_get_audio_test_data &dpcd_pattern_type.value, sizeof(dpcd_pattern_type));

- channel_count = dpcd_test_mode.bits.channel_count + 1; + channel_count = min(dpcd_test_mode.bits.channel_count + 1, AUDIO_CHANNELS_COUNT);

// read pattern periods for requested channels when sawTooth pattern is requested if (dpcd_pattern_type.value == AUDIO_TEST_PATTERN_SAWTOOTH ||