Re: linux-next: manual merge of the pm tree with the i3c tree

2021-02-17 Thread Andy Shevchenko
On Wed, Feb 17, 2021 at 4:11 AM Stephen Rothwell wrote: > > Hi all, > > Today's linux-next merge of the pm tree got a conflict in: > > MAINTAINERS > > between commit: > > f06a1af8e739 ("MAINTAINERS: Add Silvaco I3C master") > > from the i3c tree and commit: > > 4590d98f5a4f ("sfi: Remove

linux-next: manual merge of the pm tree with the i3c tree

2021-02-16 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the pm tree got a conflict in: MAINTAINERS between commit: f06a1af8e739 ("MAINTAINERS: Add Silvaco I3C master") from the i3c tree and commit: 4590d98f5a4f ("sfi: Remove framework for deprecated firmware") from the pm tree. I fixed it up (see below)