From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, Andrew Morton <akpm@linux-foundation.org>
Subject: Re: linux-next: manual merge of the driver-core tree
Date: Mon, 13 Oct 2008 20:51:35 -0700 [thread overview]
Message-ID: <20081014035135.GA31535@kroah.com> (raw)
In-Reply-To: <20081014135018.fbdfcff6.sfr@canb.auug.org.au>
On Tue, Oct 14, 2008 at 01:50:18PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the driver-core tree got a conflict in
> arch/x86/kernel/traps.c, arch/x86/kernel/traps_32.c and
> arch/x86/kernel/traps_64.c between various commits from Linus' tree and
> commit 9f3c643d0d55424a469a28d463a2ae74a16ba721 ("sysfs: crash
> debugging") from the driver-core tree.
>
> The two traps_{64,32}.c files have been merged into the traps.c file but
> the code modified by the driver-core patch has been moved to dumpstack_
> {64,32}.c anyway.
>
> I applied the following patch.
>
> Time to update.
Yes, I need to resync, thanks for this, and the other patches.
greg k-h
next prev parent reply other threads:[~2008-10-14 3:53 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-10-14 2:50 linux-next: manual merge of the driver-core tree Stephen Rothwell
2008-10-14 3:51 ` Greg KH [this message]
-- strict thread matches above, loose matches on Subject: below --
2013-10-01 11:03 linux-next: Tree for Oct 1 Thierry Reding
2013-10-01 11:07 ` linux-next: manual merge of the driver-core tree Thierry Reding
2013-10-01 13:54 ` Greg Kroah-Hartman
2008-12-03 23:44 Stephen Rothwell
2008-12-03 23:44 ` Stephen Rothwell
2008-12-04 4:21 ` Greg KH
2008-12-04 4:21 ` Greg KH
2008-12-04 10:42 ` Paul Mackerras
2008-12-04 10:42 ` Paul Mackerras
2008-12-04 18:00 ` Greg KH
2008-12-04 18:00 ` Greg KH
2009-01-04 23:28 ` Stephen Rothwell
2009-01-04 23:28 ` Stephen Rothwell
2009-01-05 4:36 ` Greg KH
2009-01-05 4:36 ` Greg KH
2009-01-05 5:57 ` Stephen Rothwell
2009-01-05 5:57 ` Stephen Rothwell
2008-12-01 0:15 Stephen Rothwell
2008-12-01 9:23 ` Russell King
2008-12-01 11:17 ` Catalin Marinas
2008-12-01 17:32 ` Catalin Marinas
2008-12-01 23:31 ` Stephen Rothwell
2008-10-14 3:09 Stephen Rothwell
2008-10-14 3:05 Stephen Rothwell
2008-10-14 3:02 Stephen Rothwell
2008-10-14 2:57 Stephen Rothwell
2008-07-23 1:31 Stephen Rothwell
2008-07-23 4:21 ` Greg KH
2008-07-23 8:09 ` Stephen Rothwell
2008-07-23 14:04 ` Greg KH
2008-07-22 0:56 Stephen Rothwell
2008-07-22 3:14 ` Greg KH
2008-07-18 1:02 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=20081014035135.GA31535@kroah.com \
--to=greg@kroah.com \
--cc=akpm@linux-foundation.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 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.