From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Greg KH <greg@kroah•com>
Cc: linux-next@vger•kernel.org,
Maciej Sosnowski <maciej.sosnowski@intel•com>
Subject: linux-next: manual merge of the driver-core.current tree
Date: Thu, 24 Jul 2008 10:57:53 +1000 [thread overview]
Message-ID: <20080724105753.3eb6ed07.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 592 bytes --]
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.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
next reply other threads:[~2008-07-24 0:57 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-24 0:57 Stephen Rothwell [this message]
2008-07-24 15:09 ` linux-next: manual merge of the driver-core.current tree Greg KH
-- 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=20080724105753.3eb6ed07.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=greg@kroah$(echo .)com \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=maciej.sosnowski@intel$(echo .)com \
/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