Re: linux-next: manual merge of the workqueues tree with Linus' tree

Hi Tejun, On Tue, 19 Mar 2013 15:13:08 -0700 Tejun Heo wrote: > > On Wed, Mar 20, 2013 at 09:05:40AM +1100, Stephen Rothwell wrote: > > > Anyways, I pulled master into wq/for-next and resolved it there, so it > > > shouldn't cause you any more trouble. > > > > Ah, OK, thanks. One small point,

Re: linux-next: manual merge of the workqueues tree with Linus' tree

On Wed, Mar 20, 2013 at 09:05:40AM +1100, Stephen Rothwell wrote: > > Anyways, I pulled master into wq/for-next and resolved it there, so it > > shouldn't cause you any more trouble. > > Ah, OK, thanks. One small point, when you do a back merge like that, > you should always put an explanation i

Re: linux-next: manual merge of the workqueues tree with Linus' tree

Hi Tejun, On Tue, 19 Mar 2013 14:12:33 -0700 Tejun Heo wrote: > > On Tue, Mar 19, 2013 at 01:19:38PM +1100, Stephen Rothwell wrote: > > @@@ -456,40 -462,30 +462,30 @@@ static int worker_pool_assign_id(struc > > { > > int ret; > > > > - mutex_lock(&worker_pool_idr_mutex); > > - ret =

Re: linux-next: manual merge of the workqueues tree with Linus' tree

Hey, Stephen. On Tue, Mar 19, 2013 at 01:19:38PM +1100, Stephen Rothwell wrote: > @@@ -456,40 -462,30 +462,30 @@@ static int worker_pool_assign_id(struc > { > int ret; > > - mutex_lock(&worker_pool_idr_mutex); > - ret = idr_alloc(&worker_pool_idr, pool, 0, 0, GFP_KERNEL); > -