Messages in this thread | | | Date | Fri, 21 May 2010 21:24:33 +0200 | From | Jens Axboe <> | Subject | Re: [GIT PULL] block tree for 2.6.35 |
| |
On Fri, May 21 2010, Jens Axboe wrote: > Hi Linus, > > This is the initial (and big) part of the bits stashed in the block git > tree for 2.6.35. > > - A good bunch of IO controller updates. I apologize for the quality of > the changelog for those, I should have caught that in due time. Will > not happen again. > - Updates and additions to the discard requests. > - A big drbd update. > - Fixes for a few writeback bugs and regressions. > - The pipe grow/shrink support with the default 256 page limit and > a proc file for root to modify that limit. > - Make laptop mode per-device instead of a global setting. > - And of course a good bunch of bug fixes. > > Please pull. > > git://git.kernel.dk/linux-2.6-block.git for-2.6.35
So one of your very latest pulls causes a merge conflict in ext3/fsync.c. Did not happen an hour or two ago :-)
I'll pull in your latest and send a new diffstat.
-- Jens Axboe
| |