[ath:master 2/4] drivers/net/ethernet/intel/ice/ice_ptp.c:165:15: error: implicit declaration of function 'ice_read_sma_ctrl'; did you mean 'ice_read_sr_word'?

[Jeff Johnson]

On 11/13/2024 8:06 AM, Jeff Johnson wrote:
> On 11/13/2024 2:58 AM, Kalle Valo wrote:
>> kernel test robot <lkp at intel.com> writes:
>>
>>> tree:   https://git.kernel.org/pub/scm/linux/kernel/git/ath/ath.git master
>>> head:   fc6f018eda7f9054e427f731db1e8b200f22873c
>>> commit: 33e2bcda33620fc43cc948627be525ddb342c446 [2/4] Merge branch 'ath-current'
>>> config: arc-allyesconfig
>>> (https://download.01.org/0day-ci/archive/20241113/202411131838.DE0FWg8Q-lkp@intel.com/config)
>>> compiler: arceb-elf-gcc (GCC) 13.2.0
>>> reproduce (this is a W=1 build):
>>> (https://download.01.org/0day-ci/archive/20241113/202411131838.DE0FWg8Q-lkp@intel.com/reproduce)
>>>
>>> If you fix the issue in a separate patch/commit (i.e. not just a new version of
>>> the same patch/commit), kindly add following tags
>>> | Reported-by: kernel test robot <lkp at intel.com>
>>> | Closes: https://lore.kernel.org/oe-kbuild-all/202411131838.DE0FWg8Q-lkp@intel.com/
>>>
>>> All error/warnings (new ones prefixed by >>):
>>>
>>>    drivers/net/ethernet/intel/ice/ice_ptp.c: In function 'ice_ptp_set_sma_cfg':
>>>>> drivers/net/ethernet/intel/ice/ice_ptp.c:165:15: error: implicit
>>>>> declaration of function 'ice_read_sma_ctrl'; did you mean
>>>>> 'ice_read_sr_word'? [-Werror=implicit-function-declaration]
>>>      165 |         err = ice_read_sma_ctrl(&pf->hw, &data);
>>>          |               ^~~~~~~~~~~~~~~~~
>>>          |               ice_read_sr_word
>>>>> drivers/net/ethernet/intel/ice/ice_ptp.c:187:16: error: implicit
>>>>> declaration of function 'ice_write_sma_ctrl'; did you mean
>>>>> 'ice_write_intrl'? [-Werror=implicit-function-declaration]
>>>      187 |         return ice_write_sma_ctrl(&pf->hw, data);
>>>          |                ^~~~~~~~~~~~~~~~~~
>>>          |                ice_write_intrl
>>
>> Our ath.git master branch is an integration branch of other branches and
>> it's not sent forward to other trees. Looks like we did a merge error in
> 
> By "we" Kalle means me. :)
> I did a bad conflict resolution and have locally validated the correct
> resolution and will be updating ath/{main,master} shortly
> 
>> the master branch but no action needed as it's only within ath.git.
>> We'll try to fix it the next time we update the master branch.

this issue should now be resolved