From: "Nicholas A. Bellinger" <nab@linux-iscsi•org>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Christoph Hellwig <hch@lst•de>, Andy Grover <agrover@redhat•com>
Subject: Re: linux-next: manual merge of the target-updates tree with the tree
Date: Mon, 01 Jun 2015 04:35:52 -0700 [thread overview]
Message-ID: <1433158552.3170.36.camel@haakon3.risingtidesystems.com> (raw)
In-Reply-To: <20150601212220.7374cc23@canb.auug.org.au>
On Mon, 2015-06-01 at 21:22 +1000, Stephen Rothwell wrote:
> 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.
>
Apologies for the conflicts vs. mainline in today's linux-next
The latest in target-pending/for-next from this morning should address
these conflicts vs. mainline.
Thank you,
--nab
next prev parent reply other threads:[~2015-06-01 11:35 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-01 11:22 linux-next: manual merge of the target-updates tree with the tree Stephen Rothwell
2015-06-01 11:35 ` Nicholas A. Bellinger [this message]
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=1433158552.3170.36.camel@haakon3.risingtidesystems.com \
--to=nab@linux-iscsi$(echo .)org \
--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=sfr@canb$(echo .)auug.org.au \
/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