From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Christoph Hellwig <hch@infradead.org>,
Jens Axboe <jaxboe@fusionio.com>,
Jerome Marchand <jmarchan@redhat.com>
Subject: Re: linux-next: manual merge of the staging tree with the block tree
Date: Tue, 4 Oct 2011 08:25:43 -0700 [thread overview]
Message-ID: <20111004152543.GB29994@kroah.com> (raw)
In-Reply-To: <20111004171415.db52e4eb5c913afeba0a3bee@canb.auug.org.au>
On Tue, Oct 04, 2011 at 05:14:15PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/zram/zram_drv.c between commit 5a7bbad27a41 ("block:
> remove support for bio remapping from ->make_request") from the block
> tree and commit 0900beae178a ("staging: zram: fix zram locking") from the
> staging tree.
>
> I fixed it up (I think - see below) and can carry the fix as necessary.
That looks correct to me, thanks for doing this.
greg k-h
next prev parent reply other threads:[~2011-10-04 15:25 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-04 6:14 linux-next: manual merge of the staging tree with the block tree Stephen Rothwell
2011-10-04 15:25 ` Greg KH [this message]
-- strict thread matches above, loose matches on Subject: below --
2013-11-05 5:09 Stephen Rothwell
2013-11-05 5:20 ` Greg KH
2013-11-05 9:49 ` Christoph Hellwig
2013-11-05 13:08 ` Greg KH
2016-06-14 5:07 Stephen Rothwell
2016-07-25 6:32 ` Stephen Rothwell
2019-05-01 7:05 Stephen Rothwell
2019-05-01 8:09 ` Gao Xiang
2019-05-08 3:44 ` Stephen Rothwell
2019-05-08 6:02 ` Gao Xiang
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=20111004152543.GB29994@kroah.com \
--to=greg@kroah.com \
--cc=hch@infradead.org \
--cc=jaxboe@fusionio.com \
--cc=jmarchan@redhat.com \
--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 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).