From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jens Axboe Subject: Re: linux-next: manual merge of the akpm tree with the block tree Date: Mon, 12 Nov 2012 14:20:17 -0700 Message-ID: <50A16811.10503@kernel.dk> References: <20121112151540.16dd14cd1eef76432c098e8a@canb.auug.org.au> <20121112130727.e063fa37.akpm@linux-foundation.org> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Return-path: Received: from merlin.infradead.org ([205.233.59.134]:56778 "EHLO merlin.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754124Ab2KLVUd (ORCPT ); Mon, 12 Nov 2012 16:20:33 -0500 In-Reply-To: <20121112130727.e063fa37.akpm@linux-foundation.org> Sender: linux-next-owner@vger.kernel.org List-ID: To: Andrew Morton Cc: Stephen Rothwell , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Maxim Levitsky , Dan Carpenter On 2012-11-12 14:07, Andrew Morton wrote: > On Mon, 12 Nov 2012 15:15:40 +1100 > Stephen Rothwell wrote: > >> Hi Andrew, >> >> Today's linux-next merge of the akpm tree got a conflict in >> drivers/memstick/core/ms_block.h between commit 0604fa04ccc7 ("memstick: >> add support for legacy memorysticks") that use to be in the block tree >> and commits "memstick: remove unused field from state struct", "memstick: >> ms_block: fix compile issue", "memstick: use after free in >> msb_disk_release()" and "memstick: memory leak on error in msb_ftl_scan >> ()" from the akpm tree. >> >> The block tree commit has been dropped, so the 4 akpm tree patches no >> longer have anything to apply to, so I have dropped them. > > Confused. Who dropped "memstick: add support for legacy memorysticks"? > You, or Jens? I dropped it for 3.7 submission, that's why it disappeared from my for-next. > Assuming the block-tree memstick patches will rematerialise, I'll send > those patches at Jens. Thanks, I'll queue them up. -- Jens Axboe