linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Jens Axboe <axboe@kernel.dk>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Alan Stern <stern@rowland.harvard.edu>,
	James Bottomley <James.Bottomley@HansenPartnership.com>,
	Tejun Heo <tj@kernel.org>
Subject: linux-next: manual merge of the block tree with the  tree
Date: Fri, 17 Dec 2010 12:28:31 +1100	[thread overview]
Message-ID: <20101217122831.39300d94.sfr@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 653 bytes --]

Hi Jens,

Today's linux-next merge of the block tree got a conflict in
drivers/scsi/sd.c between commit e765221e4b44b2141704a0ab201632446235712b
("[SCSI] sd: improve logic and efficiecy of media-change detection") from
the  tree and commit c8d2e937355d02db3055c2fc203e5f017297ee1f ("sd:
implement sd_check_events()") from the block tree.

The changes here are a bit extensive for me to figure out, so I used
the block tree version of the conflicting code (there are other changes
in the scsi tree as well).  I probably needs checking.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

             reply	other threads:[~2010-12-17  1:28 UTC|newest]

Thread overview: 51+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-12-17  1:28 Stephen Rothwell [this message]
2010-12-17 14:53 ` linux-next: manual merge of the block tree with the tree James Bottomley
2010-12-18  7:15   ` Tejun Heo
2010-12-18 17:42   ` [PATCH scsi-misc-2.6] sd: implement sd_check_events() Tejun Heo
2010-12-20 16:20     ` James Bottomley
2010-12-21 18:09       ` James Bottomley
2010-12-21 19:19         ` Jens Axboe
2010-12-21 20:24           ` James Bottomley
2010-12-22  8:49             ` Jens Axboe
  -- strict thread matches above, loose matches on Subject: below --
2013-11-01  3:20 linux-next: manual merge of the block tree with the tree Stephen Rothwell
2013-11-01 15:10 ` Jens Axboe
2013-11-01 20:22   ` Stephen Rothwell
2013-11-01 20:27     ` Jens Axboe
2013-11-01 20:41       ` Dave Kleikamp
2013-11-01 20:53         ` Jens Axboe
2013-11-01 21:07           ` Dave Kleikamp
2013-11-02 20:50           ` Dave Kleikamp
2013-11-07 19:17             ` Olof Johansson
2013-11-07 19:20               ` Kent Overstreet
2013-11-07 19:20             ` Dave Kleikamp
2013-11-07 19:25               ` Kent Overstreet
2013-11-07 19:38                 ` Dave Kleikamp
2013-11-08  0:04                 ` Dave Kleikamp
2013-11-08  1:53                   ` Stephen Rothwell
2013-11-08  2:08                     ` Kent Overstreet
2013-11-08  2:32                       ` Dave Kleikamp
2013-11-08  7:33                         ` Christoph Hellwig
2013-11-08  7:39                           ` Kent Overstreet
2013-11-08  7:44                             ` Christoph Hellwig
2013-11-08  7:56                               ` Kent Overstreet
2013-11-08  8:02                                 ` Christoph Hellwig
2013-11-08  8:17                                   ` Kent Overstreet
2013-11-08  8:32                                     ` Christoph Hellwig
2013-11-08  9:21                                       ` Kent Overstreet
2013-11-08 17:56                                         ` Zach Brown
2013-11-08 15:10                           ` Dave Kleikamp
2013-11-08 15:29                           ` Jens Axboe
2013-11-08 16:15                             ` Jens Axboe
2013-11-10 21:32                               ` Stephen Rothwell
2013-11-08  2:39                     ` Jens Axboe
2009-09-10  4:48 Stephen Rothwell
2009-09-10  7:24 ` Jens Axboe
2009-09-10  7:40   ` Stephen Rothwell
2009-09-10  7:43     ` Jens Axboe
2009-07-01  5:37 Stephen Rothwell
2009-07-01  6:59 ` Jens Axboe
2009-05-18  4:53 Stephen Rothwell
2009-05-18  6:27 ` Jens Axboe
2009-05-18 12:34   ` Rusty Russell
2009-05-18 12:42     ` Jens Axboe
2009-05-19  0:11       ` 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=20101217122831.39300d94.sfr@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=James.Bottomley@HansenPartnership.com \
    --cc=axboe@kernel.dk \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=stern@rowland.harvard.edu \
    --cc=tj@kernel.org \
    /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).