From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Andi Kleen <andi@firstfloor.org>,
Wu Fengguang <fengguang.wu@intel.com>,
Andrew Morton <akpm@linux-foundation.org>
Subject: Re: linux-next: manual merge of the driver-core tree with Linus' tree
Date: Tue, 19 Jan 2010 12:59:12 -0800 [thread overview]
Message-ID: <20100119205912.GA10928@kroah.com> (raw)
In-Reply-To: <20100118184956.ea783994.sfr@canb.auug.org.au>
On Mon, Jan 18, 2010 at 06:49:56PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the driver-core tree got a conflict in
> drivers/base/memory.c between commit
> 8ff410daa009c4b44be445ded5b0cec00abc0426 ("sysdev: fix prototype for
> memory_sysdev_class show/store functions") from Linus' tree and commits
> 95f4918fb2826dd7fc7be8a375ee0b71e8276a62 ("sysdev: Fix type of sysdev
> class attribute in memory driver") and
> 18a994bc1df640e77b853af5b6a175d6871b449f ("driver-core: Add attribute
> argument to class_attribute show/store") from the driver-core tree.
>
> Not a big suprise. I fixed it up by using the driver-core tree version
> (effectively reverting the version in Linus' tree).
I've fixed this up in my tree now.
thanks,
greg k-h
next prev parent reply other threads:[~2010-01-19 20:59 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-18 7:49 linux-next: manual merge of the driver-core tree with Linus' tree Stephen Rothwell
2010-01-19 20:59 ` Greg KH [this message]
2010-01-19 23:43 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2011-12-28 5:28 Stephen Rothwell
2012-01-04 23:08 ` Greg KH
2012-01-30 2:24 Stephen Rothwell
2012-01-30 2:35 ` Greg KH
2012-02-02 19:26 ` Greg KH
2012-05-01 5:01 Stephen Rothwell
2012-05-01 13:46 ` Greg KH
2012-05-04 23:19 ` Greg KH
2013-01-23 4:15 Stephen Rothwell
2013-01-23 4:42 ` Greg KH
2014-12-15 3:09 Stephen Rothwell
2015-08-07 5:26 Stephen Rothwell
2015-08-07 5:30 ` Viresh Kumar
2025-12-05 3:20 Stephen Rothwell
2025-12-05 3:26 ` Miguel Ojeda
2025-12-05 4:01 ` 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=20100119205912.GA10928@kroah.com \
--to=greg@kroah.com \
--cc=akpm@linux-foundation.org \
--cc=andi@firstfloor.org \
--cc=fengguang.wu@intel.com \
--cc=linux-kernel@vger.kernel.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).