From: Jiri Slaby <jirislaby@gmail.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Alasdair G Kergon <agk@redhat.com>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Philipp Reisner <philipp.reisner@linbit.com>
Subject: Re: linux-next: manual merge of the device-mapper tree with Linus' tree
Date: Mon, 05 Oct 2009 17:40:04 +0200 [thread overview]
Message-ID: <4ACA1354.1000403@gmail.com> (raw)
In-Reply-To: <20091005144102.8c012c56.sfr@canb.auug.org.au>
On 10/05/2009 05:41 AM, Stephen Rothwell wrote:
> Today's linux-next merge of the device-mapper tree got a conflict in
> drivers/md/dm-log-userspace-transfer.c between commit
> 18366b05a00349c1606269ba7422bf9b3a357ff2 ("connector/dm: Fixed a
> compilation warning") from Linus' tree and commit
> 584ac98acfc033dfda338641e736b0100fd31909
> ("dm-log-fix-cn_ulog_callback-declaration") from the device-mapper tree.
>
> The former commit (already in Linus' tree) supersedes the latter, so I
> used the former.
Hmm, great! I sent it month and a half earlier with proper changelog and
meaningful subject. akpm sent it twice with davem in Cc. davem merged
that one instead.
/me demotivated to post such fixes again.
next prev parent reply other threads:[~2009-10-05 15:40 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-10-05 3:41 linux-next: manual merge of the device-mapper tree with Linus' tree Stephen Rothwell
2009-10-05 15:40 ` Jiri Slaby [this message]
-- strict thread matches above, loose matches on Subject: below --
2013-03-04 0:36 Stephen Rothwell
2020-12-21 22:50 Stephen Rothwell
2020-12-22 13:15 ` Christoph Hellwig
2022-03-29 22: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=4ACA1354.1000403@gmail.com \
--to=jirislaby@gmail.com \
--cc=agk@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=philipp.reisner@linbit.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.