From mboxrd@z Thu Jan 1 00:00:00 1970 From: Theodore Ts'o Subject: Re: linux-next: manual merge of the block tree with the ext4 tree Date: Sat, 29 Nov 2014 12:38:18 -0500 Message-ID: <20141129173818.GB4362@thunk.org> References: <20141127145347.0083c0bc@canb.auug.org.au> <20141129100833.GA31892@kria> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from imap.thunk.org ([74.207.234.97]:58041 "EHLO imap.thunk.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751434AbaK2Ri3 (ORCPT ); Sat, 29 Nov 2014 12:38:29 -0500 Content-Disposition: inline In-Reply-To: <20141129100833.GA31892@kria> Sender: linux-next-owner@vger.kernel.org List-ID: To: Sabrina Dubroca Cc: Stephen Rothwell , Jens Axboe , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Tejun Heo , Jeremiah Mahler Note the relevant changes from the ext4 tree were dropped from the dev branch, so this shouldn't be an issue moving forward. - Ted