From: Stephen Rothwell <sfr@canb•auug.org.au>
To: "Nicholas A. Bellinger" <nab@linux-iscsi•org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Christoph Hellwig <hch@lst•de>, Andy Grover <agrover@redhat•com>
Subject: linux-next: manual merge of the target-updates tree with the tree
Date: Mon, 1 Jun 2015 21:22:20 +1000 [thread overview]
Message-ID: <20150601212220.7374cc23@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 260 bytes --]
Hi Nicholas,
Today's linux-next merge of the target-updates tree got so many
conflicts against Linus' tree that I just gave up and dropped it
completely. Please fix up this mess.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2015-06-01 11:22 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-01 11:22 Stephen Rothwell [this message]
2015-06-01 11:35 ` linux-next: manual merge of the target-updates tree with the tree Nicholas A. Bellinger
2015-06-01 11:56 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2014-05-23 9:07 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=20150601212220.7374cc23@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=agrover@redhat$(echo .)com \
--cc=hch@lst$(echo .)de \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=nab@linux-iscsi$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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