linux-kernel - Re: linux-next: manual merge of the akpm tree with the block tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <50A16A7E.5030207@kernel.dk>
Date:	Mon, 12 Nov 2012 14:30:38 -0700
From:	Jens Axboe <axboe@...nel.dk>
To:	Andrew Morton <akpm@...ux-foundation.org>
CC:	Stephen Rothwell <sfr@...b.auug.org.au>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Maxim Levitsky <maximlevitsky@...il.com>,
	Dan Carpenter <dan.carpenter@...cle.com>
Subject: Re: linux-next: manual merge of the akpm tree with the block tree

On 2012-11-12 14:29, Andrew Morton wrote:
> On Mon, 12 Nov 2012 14:20:17 -0700
> Jens Axboe <axboe@...nel.dk> wrote:
> 
>> On 2012-11-12 14:07, Andrew Morton wrote:
>>> On Mon, 12 Nov 2012 15:15:40 +1100
>>> Stephen Rothwell <sfr@...b.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

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/