Linux-next patch from [1] has both tree merged and resolved the conflicts. I could successfully compile it, now. $ cat /proc/version Linux version 2.6.36-rc8-686 (Debian 2.6.36~rc8-3~next~20101018~dileks.1) (sedat.dilek@xxxxxxxxx) (gcc version 4.4.5 (Debian 4.4.5-4) ) #1 SMP Tue Oct 19 00:38:54 CEST 2010 - Sedat - [1] http://www.kernel.org/pub/linux/kernel/v2.6/next/patch-v2.6.36-rc8-next-20101018.bz2 On Mon, Oct 18, 2010 at 9:13 AM, Jens Axboe <axboe@xxxxxxxxx> wrote: > On 2010-10-18 02:11, Sedat Dilek wrote: >> Hi, >> >> today, I pulled linux-2.6-block/for-next GIT branch [1] on top of >> Linus-tree (2.6.36-rc8-git3). >> >> Unfortunately, ext4/next GIT branch [2] is not "GIT-pull-able" on top >> of this local GIT repository. >> The cause for this is the removal of BLKDEV_IFL_BARRIER and >> BLKDEV_IFL_WAIT in linux-2.6-block/for-next. >> >> As there are few days left for 2.6.36-final, it would be great when >> ext4/next could be prepared to work with linux-2.6-block/for-next. >> Thanks in advance. > > The argument just has to be removed. linux-next has had a fixup > patch for this for a long time. > > -- > Jens Axboe > > -- To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
