Re: linux-next: manual merge of the jdelvare-hwmon tree with Linus' tree

2013-12-16 Thread Jean Delvare
Hi Stephen, On Mon, 16 Dec 2013 11:57:33 +1100, Stephen Rothwell wrote: > Today's linux-next merge of the jdelvare-hwmon tree got a conflict in > drivers/hwmon/lm90.c between commits from Linus' tree and commits from > the jdelvare-hwmon tree. > > It looks like the jdelvare-hwmon patch series

Re: linux-next: manual merge of the jdelvare-hwmon tree with Linus' tree

2013-12-16 Thread Jean Delvare
Hi Stephen, On Mon, 16 Dec 2013 11:57:33 +1100, Stephen Rothwell wrote: Today's linux-next merge of the jdelvare-hwmon tree got a conflict in drivers/hwmon/lm90.c between commits from Linus' tree and commits from the jdelvare-hwmon tree. It looks like the jdelvare-hwmon patch series has

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

2013-12-15 Thread Stephen Rothwell
Hi Jean, Today's linux-next merge of the jdelvare-hwmon tree got a conflict in drivers/hwmon/lm90.c between commits from Linus' tree and commits from the jdelvare-hwmon tree. It looks like the jdelvare-hwmon patch series has been reset back (unintentionally?) to stuff that has already been

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

2013-12-15 Thread Stephen Rothwell
Hi Jean, Today's linux-next merge of the jdelvare-hwmon tree got a conflict in drivers/hwmon/lm90.c between commits from Linus' tree and commits from the jdelvare-hwmon tree. It looks like the jdelvare-hwmon patch series has been reset back (unintentionally?) to stuff that has already been