linux-next: manual merge of the akpm tree with the char-misc tree

2014-06-22 Thread Stephen Rothwell
Hi Andrew, Today's linux-next merge of the akpm tree got a conflict in drivers/w1/w1_int.c between commit fdc9167a7853 ("w1: use pr_* instead of printk") from the char-misc tree and commit "drivers/w1/w1_int.c: call put_device if device_register fails" from the akpm tree. I fixed it up (see below

RE: linux-next: manual merge of the akpm tree with the char-misc tree

2013-03-20 Thread Haiyang Zhang
t: linux-next: manual merge of the akpm tree with the char-misc > tree > > Hi Andrew, > > Today's linux-next merge of the akpm tree got a conflict in > include/linux/hyperv.h between commit 96dd86fa5881 ("Drivers: hv: Add a > new driver to support host initiated bac

RE: linux-next: manual merge of the akpm tree with the char-misc tree

2013-03-20 Thread KY Srinivasan
> Subject: linux-next: manual merge of the akpm tree with the char-misc tree > > Hi Andrew, > > Today's linux-next merge of the akpm tree got a conflict in > include/linux/hyperv.h between commit 96dd86fa5881 ("Drivers: hv: Add a > new driver to support host initiated bac

linux-next: manual merge of the akpm tree with the char-misc tree

2013-03-19 Thread Stephen Rothwell
Hi Andrew, Today's linux-next merge of the akpm tree got a conflict in include/linux/hyperv.h between commit 96dd86fa5881 ("Drivers: hv: Add a new driver to support host initiated backup") from the char-misc tree and commit "drivers/video: add Hyper-V Synthetic Video Frame Buffer Driver" from the