All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jens Axboe <jens.axboe@oracle.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Alasdair G Kergon <agk@redhat.com>,
	linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Christoph Hellwig <hch@lst.de>, Al Viro <viro@zeniv.linux.org.uk>
Subject: Re: linux-next: manual merge of the block tree with Linus' tree
Date: Thu, 25 Jun 2009 09:42:41 +0200	[thread overview]
Message-ID: <20090625074241.GD31415@kernel.dk> (raw)
In-Reply-To: <20090625063806.GC31415@kernel.dk>

On Thu, Jun 25 2009, Jens Axboe wrote:
> On Thu, Jun 25 2009, Stephen Rothwell wrote:
> > On Thu, 25 Jun 2009 13:15:17 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > >
> > > I can't see how to easily fix this up, so I have dropped the block tree
> > > for today (since it only contained 2.6.32 material, right?).
> > 
> > I also dropped the device-mapper tree for today as it was based on the
> > block tree (and dragged in what I had just dropped) and, in any case, all
> > its patches have been merged upstream.
> 
> OK to both, I'm fixing up the writeback conflicts right now.

Should be good to go again.

-- 
Jens Axboe

  reply	other threads:[~2009-06-25  7:42 UTC|newest]

Thread overview: 122+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-06-25  3:15 linux-next: manual merge of the block tree with Linus' tree Stephen Rothwell
2009-06-25  3:30 ` Stephen Rothwell
2009-06-25  6:38   ` Jens Axboe
2009-06-25  7:42     ` Jens Axboe [this message]
  -- strict thread matches above, loose matches on Subject: below --
2010-02-25  3:10 Stephen Rothwell
2010-02-25  7:47 ` Jens Axboe
2010-02-25 23:11   ` Stephen Rothwell
2010-03-17  1:52 Stephen Rothwell
2010-03-17  2:03 ` Li Zefan
2010-04-29  3:52 Stephen Rothwell
2010-04-29  7:33 ` Jens Axboe
2010-09-16  2:04 Stephen Rothwell
2011-03-07  2:19 Stephen Rothwell
2011-03-07  6:36 ` Tejun Heo
2011-03-07  8:42   ` Jens Axboe
2011-03-07 10:41     ` Sedat Dilek
2011-03-07 10:47       ` Tejun Heo
2011-03-07 11:14         ` Sedat Dilek
2011-03-07 11:16           ` Jens Axboe
2011-03-07 11:25             ` Sedat Dilek
2011-03-07 11:26               ` Jens Axboe
2011-03-07 11:35                 ` Sedat Dilek
2011-03-07 11:46                   ` Jens Axboe
2011-03-07 12:26                     ` Sedat Dilek
2011-03-07 11:42               ` Stephen Rothwell
2011-03-07 11:38             ` Stephen Rothwell
2011-03-21  0:43 Stephen Rothwell
2011-03-21  9:48 ` Jens Axboe
2011-05-19  1:34 Stephen Rothwell
2011-11-01  5:15 Stephen Rothwell
2011-11-01  8:09 ` Jens Axboe
2011-11-01  9:03   ` Stephen Rothwell
2012-10-31  2:04 Stephen Rothwell
2012-10-31 13:55 ` Ben Hutchings
2012-10-31 13:57   ` Jens Axboe
2012-11-01 10:04   ` Herton Ronaldo Krzesinski
2012-12-07  2:44 Stephen Rothwell
2013-03-26  2:05 Stephen Rothwell
2013-05-01  5:17 Stephen Rothwell
2013-09-25  3:11 Stephen Rothwell
2013-11-01  3:25 Stephen Rothwell
2014-03-10 15:39 Mark Brown
2014-03-17  3:55 Stephen Rothwell
2015-01-27  4:03 Stephen Rothwell
2015-04-13  4:58 Stephen Rothwell
2015-06-01  4:56 Stephen Rothwell
2015-06-01 14:31 ` Mike Snitzer
2015-06-03  3:28 Stephen Rothwell
2015-06-03  3:33 Stephen Rothwell
2015-06-04  4:36 Stephen Rothwell
2015-06-04  4:51 Stephen Rothwell
2015-08-17  4:04 Stephen Rothwell
2015-08-27  2:36 Stephen Rothwell
2015-10-06  1:33 Stephen Rothwell
2015-12-07  4:16 Stephen Rothwell
2015-12-07  4:27 Stephen Rothwell
2015-12-14  1:36 Stephen Rothwell
2015-12-31  3:34 Stephen Rothwell
2016-01-21 22:46 ` Stephen Rothwell
2016-01-21 22:48   ` Jens Axboe
2016-01-13  2:07 Stephen Rothwell
2016-02-18  2:10 Stephen Rothwell
2016-03-01  0:25 Stephen Rothwell
2016-03-07  3:08 Stephen Rothwell
2016-03-07  3:12 Stephen Rothwell
2016-05-03  4:25 Stephen Rothwell
2016-05-03 20:03 ` Jens Axboe
2016-06-14  2:44 Stephen Rothwell
2016-07-08  3:07 Stephen Rothwell
2016-07-08  4:14 ` Stephen Rothwell
2016-07-08 14:11   ` Konrad Rzeszutek Wilk
2016-07-21  3:08 Stephen Rothwell
2017-06-23  3:06 Stephen Rothwell
2017-06-23  3:09 ` Jens Axboe
2017-06-23  3:24   ` Stephen Rothwell
2017-06-23  3:27     ` Jens Axboe
2017-06-23  3:33       ` Stephen Rothwell
2017-06-23  3:56         ` Jens Axboe
2017-06-23  3:29     ` Jens Axboe
2017-06-26  2:28 Stephen Rothwell
2017-06-26  2:44 Stephen Rothwell
2017-06-30  2:08 Stephen Rothwell
2017-09-04  3:09 Stephen Rothwell
2018-11-16  2:19 Stephen Rothwell
2018-11-16  2:21 ` Jens Axboe
2019-03-05  1:48 Stephen Rothwell
2019-04-15  3:00 Stephen Rothwell
2019-04-15  3:06 Stephen Rothwell
2019-04-15 14:15 ` Jens Axboe
2020-01-28  0:38 Stephen Rothwell
2020-01-28  0:40 ` Jens Axboe
2020-09-23  4:05 Stephen Rothwell
2020-12-14  3:56 Stephen Rothwell
2021-08-09  4:29 Stephen Rothwell
2021-08-09 14:05 ` Jens Axboe
2021-08-17  5:25 Stephen Rothwell
2021-08-17 16:40 ` Tejun Heo
2021-08-17 16:50   ` Christoph Hellwig
2021-08-17 16:52     ` Tejun Heo
2021-10-25  2:26 Stephen Rothwell
2021-11-01  1:36 Stephen Rothwell
2021-11-25 23:38 Stephen Rothwell
2021-11-26  5:30 ` Christoph Hellwig
2022-03-21  1:22 Stephen Rothwell
2022-04-20  2:31 Stephen Rothwell
2022-11-21  2:46 Stephen Rothwell
2022-11-21 14:47 ` Jens Axboe
2023-04-03  2:36 Stephen Rothwell
2023-06-26  3:04 Stephen Rothwell
2023-10-23  1:42 Stephen Rothwell
2024-05-13  2:23 Stephen Rothwell
2024-05-13 23:50 ` Jens Axboe
2024-05-22 23:50 Stephen Rothwell
2024-05-23 13:04 ` Jens Axboe
2024-10-21  1:06 Stephen Rothwell
2024-10-21 16:52 ` Jens Axboe
2024-11-11  3:10 Stephen Rothwell
2024-11-11 15:14 ` Jens Axboe
2025-01-09  1:46 Stephen Rothwell
2025-01-10 15:02 ` Jens Axboe
2025-05-05  3:25 Stephen Rothwell
2025-05-05 13:15 ` Jens Axboe

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=20090625074241.GD31415@kernel.dk \
    --to=jens.axboe@oracle.com \
    --cc=agk@redhat.com \
    --cc=hch@lst.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    --cc=viro@zeniv.linux.org.uk \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.