[Linux-zigbee-devel] How to merge net-next on the raspberry pi kernel?

2014-05-12 Thread Cristiano
Hi, I've fetched both the raspberry pi 3.14 kernel and net-next. Instead of trying to merge the net-next master branch on the raspberry pi rpi-3.14y branch (due to conflicts) I would try to checkout only the linux-zigbee files from net-next master on rpi-3.14y as described here: http://jasonr

Re: [Linux-zigbee-devel] How to merge net-next on the raspberry pi kernel?

2014-05-12 Thread Thomas Stilwell
On Monday 12 May 2014 21:11:25 Cristiano wrote: > Hi, >I've fetched both the raspberry pi 3.14 kernel and net-next. > Instead of trying to merge the net-next master branch on the raspberry > pi rpi-3.14y branch (due to conflicts) I would try to checkout only the > linux-zigbee files from net-ne