Messages in this thread |  | | Date | Mon, 4 Nov 2013 21:20:10 -0800 | From | Greg KH <> | Subject | Re: linux-next: manual merge of the staging tree with the block tree |
| |
On Tue, Nov 05, 2013 at 04:09:24PM +1100, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the staging tree got a conflict in > drivers/staging/lustre/lustre/llite/lloop.c between commit ed2d2f9a8265 > ("block: Abstract out bvec iterator") from the block tree and commit > de40d1209898 ("staging: lustre: fix bug with LL_MRF_RETURN in > loop_make_request") from the staging tree. > > I fixed it up (see below) and can carry the fix as necessary (no action > is required).
Looks good to me, thanks.
greg k-h
|  |