From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org,
Maciej Sosnowski <maciej.sosnowski@intel.com>
Subject: Re: linux-next: manual merge of the driver-core.current tree
Date: Thu, 24 Jul 2008 08:09:18 -0700 [thread overview]
Message-ID: <20080724150918.GE10549@kroah.com> (raw)
In-Reply-To: <20080724105753.3eb6ed07.sfr@canb.auug.org.au>
On Thu, Jul 24, 2008 at 10:57:53AM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the driver-core.current tree got a conflict
> in drivers/dca/dca-sysfs.c between commit
> 7f1b358a236ee9c19657a619ac6f2dcabcaa0924 ("I/OAT: I/OAT version 3.0
> support") from Linus' tree and commit
> 25070eca3d7d3a04e45ceeb37c15ef73800817b0 ("device create: misc: convert
> device_create_drvdata to device_create") from the driver-core.current
> tree.
>
> The former changed the last parameter to device_create_drvdata(). I did
> the obvious fixup.
Thanks, I'll do the same when I rebase today.
greg k-h
next prev parent reply other threads:[~2008-07-24 15:11 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-24 0:57 linux-next: manual merge of the driver-core.current tree Stephen Rothwell
2008-07-24 15:09 ` Greg KH [this message]
-- strict thread matches above, loose matches on Subject: below --
2008-10-20 0:48 Stephen Rothwell
2008-10-20 3:47 ` Greg KH
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=20080724150918.GE10549@kroah.com \
--to=greg@kroah.com \
--cc=linux-next@vger.kernel.org \
--cc=maciej.sosnowski@intel.com \
--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.