From: Jens Axboe <axboe@kernel.dk>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Maxim Levitsky <maximlevitsky@gmail.com>,
Dan Carpenter <dan.carpenter@oracle.com>
Subject: Re: linux-next: manual merge of the akpm tree with the block tree
Date: Mon, 12 Nov 2012 14:30:38 -0700 [thread overview]
Message-ID: <50A16A7E.5030207@kernel.dk> (raw)
In-Reply-To: <20121112132901.4bd52e6f.akpm@linux-foundation.org>
On 2012-11-12 14:29, Andrew Morton wrote:
> On Mon, 12 Nov 2012 14:20:17 -0700
> Jens Axboe <axboe@kernel.dk> wrote:
>
>> On 2012-11-12 14:07, Andrew Morton wrote:
>>> On Mon, 12 Nov 2012 15:15:40 +1100
>>> Stephen Rothwell <sfr@canb.auug.org.au> 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.
>
> But linux-next is the candidate 3.8 tree, so the memstick patches
> should be in there. Or did you mean "3.8"?
Agree, and it is holding 3.8 stuff, memstick just wasn't added back
yet...
--
Jens Axboe
next prev parent reply other threads:[~2012-11-12 21:30 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-12 4:15 linux-next: manual merge of the akpm tree with the block tree Stephen Rothwell
2012-11-12 21:07 ` Andrew Morton
2012-11-12 21:20 ` Jens Axboe
2012-11-12 21:29 ` Andrew Morton
2012-11-12 21:30 ` Jens Axboe [this message]
-- strict thread matches above, loose matches on Subject: below --
2017-02-03 4:53 Stephen Rothwell
2015-01-21 7:46 Stephen Rothwell
2013-04-30 6:02 Stephen Rothwell
2013-03-26 5:33 Stephen Rothwell
2013-03-26 5:25 Stephen Rothwell
2013-03-26 5:11 Stephen Rothwell
2013-01-15 3:10 Stephen Rothwell
2013-01-14 3:58 Stephen Rothwell
2013-01-15 14:33 ` Asai Thambi S P
2013-01-15 14:33 ` Asai Thambi S P
2011-10-25 9:07 Stephen Rothwell
2011-10-25 18:20 ` Mike Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=50A16A7E.5030207@kernel.dk \
--to=axboe@kernel.dk \
--cc=akpm@linux-foundation.org \
--cc=dan.carpenter@oracle.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=maximlevitsky@gmail.com \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.