Re: linux-next: manual merge of the akpm tree with the rockchip tree

2017-01-10 Thread Andrew Morton
On Wed, 11 Jan 2017 10:07:33 +0900 Masahiro Yamada wrote: > 2017-01-09 11:55 GMT+09:00 Stephen Rothwell : > > Hi Andrew, > > > > Today's linux-next merge of the akpm tree got a conflict in: > > > > Documentation/devicetree/bindings/soc/rockchip/grf.txt > > > > between commit: > > > > 2c257ce

Re: linux-next: manual merge of the akpm tree with the rockchip tree

2017-01-10 Thread Masahiro Yamada
Hi Andrew, I have been wondering this because this series is touching files across sub-systems. I expected it would be pulled into upstream during the previous MW, but it was not. How long will it stay in your branch? 2017-01-09 11:55 GMT+09:00 Stephen Rothwell : > Hi Andrew, > > Today's linux