public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Tony Lindgren <tony@atomide•com>
Cc: linux-omap@vger•kernel.org, linux-next@vger•kernel.org,
	linux-kernel@vger•kernel.org,
	Janusz Krzysztofik <jkrzyszt@tis•icnet.pl>,
	Alexander Shishkin <virtuoso@slind•org>,
	Ladislav Michl <ladis@linux-mips•org>
Subject: Re: linux-next: manual merge of the omap tree with Linus' tree
Date: Sat, 31 Oct 2009 15:30:04 +1100	[thread overview]
Message-ID: <20091031153004.3544e6df.sfr@canb.auug.org.au> (raw)
In-Reply-To: <20091030144517.GS7180@atomide.com>

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

Hi Tony,

On Fri, 30 Oct 2009 07:45:18 -0700 Tony Lindgren <tony@atomide•com> wrote:
>
> Thanks, will rebase omap for-next patches today.

Or you could just do a merge with Linus' tree (or the part of Linus' tree
that you clash with) ...

But thanks either way.
-- 
Cheers,
Stephen Rothwell                    sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/

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

  reply	other threads:[~2009-10-31  4:30 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-10-30  0:46 linux-next: manual merge of the omap tree with Linus' tree Stephen Rothwell
2009-10-30 14:45 ` Tony Lindgren
2009-10-31  4:30   ` Stephen Rothwell [this message]
  -- strict thread matches above, loose matches on Subject: below --
2009-10-30  0:46 Stephen Rothwell
2009-10-30 14:46 ` Tony Lindgren
2009-10-31  4:31   ` Stephen Rothwell
2019-09-17 11:52 Mark Brown
2025-11-05  0:54 Stephen Rothwell
2025-11-05  1:28 ` Kevin Hilman
2025-11-05  3:39   ` 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=20091031153004.3544e6df.sfr@canb.auug.org.au \
    --to=sfr@canb$(echo .)auug.org.au \
    --cc=jkrzyszt@tis$(echo .)icnet.pl \
    --cc=ladis@linux-mips$(echo .)org \
    --cc=linux-kernel@vger$(echo .)kernel.org \
    --cc=linux-next@vger$(echo .)kernel.org \
    --cc=linux-omap@vger$(echo .)kernel.org \
    --cc=tony@atomide$(echo .)com \
    --cc=virtuoso@slind$(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