Re: linux-next: Tree for May 7 (iio)

2013-05-07 Thread Lars-Peter Clausen
On 05/07/2013 07:08 PM, Randy Dunlap wrote: > On 05/06/13 20:49, Stephen Rothwell wrote: >> Hi all, >> >> Please do not add any v3.11 destined work to your linux-next included >> branches until after v3.10-rc1 is released. >> >> I am receiving a (un)reasonable number of conflicts from there being >

Re: linux-next: Tree for May 7 (iio)

2013-05-07 Thread Randy Dunlap
On 05/06/13 20:49, Stephen Rothwell wrote: > Hi all, > > Please do not add any v3.11 destined work to your linux-next included > branches until after v3.10-rc1 is released. > > I am receiving a (un)reasonable number of conflicts from there being > multiple copies of some commits in various trees.