Re: linux-next: manual merge of the battery tree with the pci tree

Hi, On Tue, Jul 09, 2019 at 10:14:24AM +1000, Stephen Rothwell wrote: > Hi all, > > On Fri, 28 Jun 2019 13:55:11 +1000 Stephen Rothwell > wrote: > > > > Today's linux-next merge of the battery tree got a conflict in: > > > > Documentation/power/power_supply_class.txt > > > > between commit

Re: linux-next: manual merge of the battery tree with the pci tree

Hi all, On Fri, 28 Jun 2019 13:55:11 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the battery tree got a conflict in: > > Documentation/power/power_supply_class.txt > > between commit: > > 151f4e2bdc7a ("docs: power: convert docs to ReST and rename to *.rst") > > from t

linux-next: manual merge of the battery tree with the pci tree

Hi all, Today's linux-next merge of the battery tree got a conflict in: Documentation/power/power_supply_class.txt between commit: 151f4e2bdc7a ("docs: power: convert docs to ReST and rename to *.rst") from the pci tree and commit: 49c9cd95bb6d ("power: supply: add input power and volta