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

2015-03-20 Thread Krzysztof Kozlowski
On pią, 2015-03-20 at 08:58 +0100, Krzysztof Kozlowski wrote: > 2015-03-20 5:11 GMT+01:00 Stephen Rothwell : > > Hi Sebastian, > > > > Today's linux-next merge of the battery tree got conflicts in > > drivers/hid/wacom.h and drivers/hid/wacom_sys.c between commit > > 953f2c5f7163 ("HID: wacom: Cent

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

2015-03-20 Thread Krzysztof Kozlowski
2015-03-20 5:11 GMT+01:00 Stephen Rothwell : > Hi Sebastian, > > Today's linux-next merge of the battery tree got conflicts in > drivers/hid/wacom.h and drivers/hid/wacom_sys.c between commit > 953f2c5f7163 ("HID: wacom: Centralize updating of wacom_wac battery > status") and fce9957d8f61 ("HID: wa

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

2015-03-19 Thread Stephen Rothwell
Hi Sebastian, Today's linux-next merge of the battery tree got conflicts in drivers/hid/wacom.h and drivers/hid/wacom_sys.c between commit 953f2c5f7163 ("HID: wacom: Centralize updating of wacom_wac battery status") and fce9957d8f61 ("HID: wacom: Allow dynamic battery creation/destruction") from t