From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Ingo Molnar <mingo@elte.hu>
Cc: Stefan Richter <stefanr@s5r6.in-berlin.de>,
linux-next@vger.kernel.org, LKML <linux-kernel@vger.kernel.org>
Subject: Re: linux-next: Tree for April 9
Date: Thu, 10 Apr 2008 17:44:18 +1000 [thread overview]
Message-ID: <20080410174418.ebfe76c3.sfr@canb.auug.org.au> (raw)
In-Reply-To: <20080410065227.GB30066@elte.hu>
[-- Attachment #1: Type: text/plain, Size: 658 bytes --]
On Thu, 10 Apr 2008 08:52:27 +0200 Ingo Molnar <mingo@elte.hu> wrote:
>
> what type of conflict do you have there? If it's a new entry then you
> might be able to fix it by moving the new entry elsewhere in the file.
> Or if i introduced a new entry close to an existing entry you modify
> then i could move my new entry elsewhere.
Commit 523a65f1a7a339e528ca6d6d808516fe195fde03 ("firewire: fw-ohci: add
option for remote debugging") in the ieee1394 tree adds a new entry just
where the sched tree adds
source kernel/trace/Kconfig
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
next prev parent reply other threads:[~2008-04-10 7:44 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-04-09 8:53 Stephen Rothwell
[not found] ` <d711229d0804090400p1c92a158j381b86e207a6f38a@mail.gmail.com>
2008-04-09 11:09 ` Stephen Rothwell
2008-04-09 11:27 ` Stephen Rothwell
2008-04-09 11:26 ` Jacek Luczak
2008-04-09 11:34 ` Ingo Molnar
2008-04-09 11:55 ` Jacek Luczak
2008-04-09 12:01 ` Ingo Molnar
2008-04-09 11:31 ` Ingo Molnar
2008-04-09 14:50 ` Cyrill Gorcunov
2008-04-09 15:03 ` Ingo Molnar
2008-04-09 15:18 ` Cyrill Gorcunov
2008-04-09 16:55 ` Stefan Richter
2008-04-10 0:45 ` Stephen Rothwell
2008-04-10 6:52 ` Ingo Molnar
2008-04-10 7:44 ` Stephen Rothwell [this message]
2008-04-10 7:52 ` debug Kconfig option (was Re: linux-next: Tree for April 9) Stefan Richter
2008-04-10 9:51 ` Ingo Molnar
2008-04-10 19:05 ` [PATCH linux1394-2.6.git] firewire: fw-ohci: add option for remote debugging - amendment Stefan Richter
2008-04-10 22:08 ` Stefan Richter
2008-04-10 15:01 ` debug Kconfig option (was Re: linux-next: Tree for April 9) Randy Dunlap
2008-04-10 9:48 ` linux-next: Tree for April 9 Ingo Molnar
2008-04-10 19:02 ` Stefan Richter
2008-04-10 9:39 ` [BUG] linux-next: Tree for April 9 warning on CC_STACKPROTECTOR, followed by kernel panic Kamalesh Babulal
2008-04-10 10:14 ` Jacek Luczak
2008-04-10 10:51 ` Kamalesh Babulal
2008-04-10 10:58 ` Jacek Luczak
2008-04-10 11:47 ` Stephen Rothwell
2008-04-11 9:45 ` Ingo Molnar
2009-04-09 6:33 linux-next: Tree for April 9 Stephen Rothwell
2009-04-11 6:11 ` Andrew Morton
2009-04-11 11:09 ` Mauro Carvalho Chehab
2009-04-11 12:05 ` Stephen Rothwell
2010-04-09 3:34 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=20080410174418.ebfe76c3.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=stefanr@s5r6.in-berlin.de \
/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
all inboxes | Powered by JetHome®