Messages in this thread | | | Date | Tue, 08 Sep 2009 14:01:38 +0300 | From | Artem Bityutskiy <> | Subject | Re: [PATCH 1/8] writeback: get rid of generic_sync_sb_inodes() export |
| |
On 09/08/2009 01:57 PM, Jens Axboe wrote: >> But well, if you do not want to carry my patch, then I'll have to >> re-base my tree later, fix stuff, and send a pull request. I mean, >> your stuff will for sure be merged first, because I send pull requests >> late, just because UBIFS is a minor thing in the kernel. > > You don't have to rebase, if my work is merged first then you just merge > Linus' tree into yours and fixup the conflict before asking Linus to > pull.
I thought Linus asked to avoid merge commits in pull requests at some point, no? So I thought that I'd re-base then, which Linus also dislikes :-)
> It's a trivial conflict, I don't understand what the fuzz is about.
Well, I was just thinking how to avoid merge commits. But I guess I can do what you suggest.
-- Best Regards, Artem Bityutskiy (Артём Битюцкий) -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |