From: Mike Miller <mike.miller@hp.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Andrew Morton <akpm@linux-foundation.org>,
"linux-next@vger.kernel.org" <linux-next@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
Jens Axboe <axboe@kernel.dk>
Subject: Re: linux-next: manual merge of the akpm tree with the block tree
Date: Tue, 25 Oct 2011 13:20:29 -0500 [thread overview]
Message-ID: <4EA6FDED.8060602@hp.com> (raw)
In-Reply-To: <20111025200708.204caa3cb5d92d6f2ce35037@canb.auug.org.au>
On 10/25/2011 04:07 AM, Stephen Rothwell wrote:
> Hi James,
>
> Today's linux-next merge of the akpm tree got a conflict in
> drivers/block/cciss.c between commit ab5dbebe33e0 ("cciss: add small
> delay when using PCI Power Management to reset for kump") from the block
> tree and commit c9e69629e873 ("cciss: add half second delay to PCI PM
> reset code") from the akpm tree.
>
> These are essentially the same patch, so I dropped the akpm tree one.
That was my fault. I made multiple submissions. One because I had the
wrong code base and the patch had an offset. Then another because I
didn't hear from anyone.
-- mikem
next prev parent reply other threads:[~2011-10-25 18:27 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-25 9:07 linux-next: manual merge of the akpm tree with the block tree Stephen Rothwell
2011-10-25 18:20 ` Mike Miller [this message]
-- strict thread matches above, loose matches on Subject: below --
2012-11-12 4:15 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
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
2013-01-15 3:10 Stephen Rothwell
2013-03-26 5:11 Stephen Rothwell
2013-03-26 5:25 Stephen Rothwell
2013-03-26 5:33 Stephen Rothwell
2013-04-30 6:02 Stephen Rothwell
2015-01-21 7:46 Stephen Rothwell
2017-02-03 4:53 Stephen Rothwell
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=4EA6FDED.8060602@hp.com \
--to=mike.miller@hp.com \
--cc=akpm@linux-foundation.org \
--cc=axboe@kernel.dk \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--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.