From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Alasdair G Kergon <agk@redhat.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Philipp Reisner <philipp.reisner@linbit.com>,
Jiri Slaby <jirislaby@gmail.com>
Subject: linux-next: manual merge of the device-mapper tree with Linus' tree
Date: Mon, 5 Oct 2009 14:41:02 +1100 [thread overview]
Message-ID: <20091005144102.8c012c56.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 573 bytes --]
Hi Alasdair,
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.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
next reply other threads:[~2009-10-05 3:41 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-10-05 3:41 Stephen Rothwell [this message]
2009-10-05 15:40 ` linux-next: manual merge of the device-mapper tree with Linus' tree Jiri Slaby
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=20091005144102.8c012c56.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=agk@redhat.com \
--cc=jirislaby@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=philipp.reisner@linbit.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).