On Mon, Jan 11, 2021 at 01:08:51PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the char-misc tree got conflicts in:
>
> include/linux/mod_devicetable.h
> scripts/mod/devicetable-offsets.c
> scripts/mod/file2alias.c
>
> between commit:
>
> eb0e90a82098 ("platform/surface: aggregator: Add dedicated bus and device
> type")
>
> from the drivers-x86 tree and commits:
>
> 9326eecd9365 ("fpga: dfl: move dfl_device_id to mod_devicetable.h")
> 4a224acec597 ("fpga: dfl: add dfl bus support to MODULE_DEVICE_TABLE()")
>
> from the char-misc 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.
Thanks, this looks correct, and expected as new subsystems add
auto-loading capabilities at the same time.
greg k-h
