linux-next: manual merge of the broadcom tree with Linus' tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the broadcom tree got a conflict in:

  arch/arm64/configs/defconfig

between commit:

  8d8f28da8f90 ("arm64: defconfig: Enable TMP102 as module")

from Linus' tree and commit:

  10c68f40b86e ("arm64: defconfig: Enable RP1 misc/clock/gpio drivers")

from the broadcom tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc arch/arm64/configs/defconfig
index 1e99db100607,ccf2f50673a3..000000000000
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -706,7 -703,7 +707,8 @@@ CONFIG_SENSORS_RASPBERRYPI_HWMON=
  CONFIG_SENSORS_SL28CPLD=m
  CONFIG_SENSORS_INA2XX=m
  CONFIG_SENSORS_INA3221=m
 +CONFIG_SENSORS_TMP102=m
+ CONFIG_MISC_RP1=m
  CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y
  CONFIG_CPU_THERMAL=y
  CONFIG_DEVFREQ_THERMAL=y

Attachment: pgpziOIeBNjcz.pgp
Description: OpenPGP digital signature