From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Greg KH <greg@kroah.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Nathan Fontenot <nfont@linux.vnet.ibm.com>,
"Rafael J. Wysocki" <rjw@sisk.pl>
Subject: linux-next: manual merge of the driver-core tree with the pm tree
Date: Fri, 7 Jun 2013 14:49:36 +1000 [thread overview]
Message-ID: <20130607144936.6ea0c2d9a7fcf321e59cc6d6@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1845 bytes --]
Hi Greg,
Today's linux-next merge of the driver-core tree got a conflict in
drivers/base/memory.c between commit 4960e05e2260 ("Driver core:
Introduce offline/online callbacks for memory blocks") from the pm tree
and commit 96b2c0fc8e74 ("drivers/base: Use attribute groups to create
sysfs memory files") from the driver-core tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/base/memory.c
index 4ebf97f,e315051..0000000
--- a/drivers/base/memory.c
+++ b/drivers/base/memory.c
@@@ -595,6 -493,41 +541,42 @@@ struct memory_block *find_memory_block(
return find_memory_block_hinted(section, NULL);
}
+ static struct attribute *memory_memblk_attrs[] = {
+ &dev_attr_phys_index.attr,
+ &dev_attr_end_phys_index.attr,
+ &dev_attr_state.attr,
+ &dev_attr_phys_device.attr,
+ &dev_attr_removable.attr,
+ NULL
+ };
+
+ static struct attribute_group memory_memblk_attr_group = {
+ .attrs = memory_memblk_attrs,
+ };
+
+ static const struct attribute_group *memory_memblk_attr_groups[] = {
+ &memory_memblk_attr_group,
+ NULL,
+ };
+
+ /*
+ * register_memory - Setup a sysfs device for a memory block
+ */
+ static
+ int register_memory(struct memory_block *memory)
+ {
+ int error;
+
+ memory->dev.bus = &memory_subsys;
+ memory->dev.id = memory->start_section_nr / sections_per_block;
+ memory->dev.release = memory_block_release;
+ memory->dev.groups = memory_memblk_attr_groups;
++ memory->dev.offline = memory->state == MEM_OFFLINE;
+
+ error = device_register(&memory->dev);
+ return error;
+ }
+
static int init_memory_block(struct memory_block **memory,
struct mem_section *section, unsigned long state)
{
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2013-06-07 4:49 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-07 4:49 Stephen Rothwell [this message]
2013-06-07 17:38 ` linux-next: manual merge of the driver-core tree with the pm tree Greg KH
-- strict thread matches above, loose matches on Subject: below --
2019-07-01 8:32 Stephen Rothwell
2019-07-03 13:04 ` Andy Shevchenko
2018-12-10 5:14 Stephen Rothwell
2018-12-10 8:58 ` Rafael J. Wysocki
2018-12-10 9:02 ` Andy Shevchenko
2016-11-14 2:09 Stephen Rothwell
2016-11-14 21:07 ` Rafael J. Wysocki
2014-11-11 4:41 Stephen Rothwell
2014-12-02 18:10 ` Greg KH
2014-11-10 4:18 Stephen Rothwell
2014-11-10 4:40 ` Greg KH
2013-08-30 5:26 Stephen Rothwell
2013-08-30 6:02 ` Greg KH
2013-06-27 7:14 Stephen Rothwell
2013-06-27 15:36 ` Greg KH
2013-05-22 3:47 Stephen Rothwell
2013-05-22 4:02 ` Stephen Rothwell
2013-05-22 11:26 ` Rafael J. Wysocki
2013-02-11 4:42 Stephen Rothwell
2013-02-11 12:10 ` Rafael J. Wysocki
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=20130607144936.6ea0c2d9a7fcf321e59cc6d6@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=nfont@linux.vnet.ibm.com \
--cc=rjw@sisk.pl \
/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).