# Conflicts:
#	arch/arm/src/stm32f7/stm32_i2c.c
#	configs/stm32f746-ws/nsh/defconfig

Upstream_nucleo 144

armv7-a/armv6-m/arm/a1x: Convert *err() to either *info() or add ERROR:, depending on if an error is reported

armv7-r/armv7-m: Convert *err() to either *info() or add ERROR:, depending on if an error is reported

Common/Calypso/C5471: Convert *err() to either *info() or add ERROR:, depending on if an error is reported

LPC11xx/LPC17xx: Convert *err() to either *info() or add ERROR:, depending on if an error is reported

LPC2378/LPC214x: Convert *err() to either *info() or add ERROR:, depending on if an error is reported