Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in
drivers/base/sys.c between commit ca22e56debc5 ("driver-core: implement
'sysdev' functionality for regular devices and buses") from the
driver-core tree and commit "tick-sched: add specific do_timer_cpu value
for nohz off mode" from the scsi-post-merge tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
diff --cc drivers/base/sys.c
index 409f5ce,67d81a2..0000000
--- a/drivers/base/sys.c
+++ b/drivers/base/sys.c
@@@ -331,8 -331,14 +331,6 @@@ void sysdev_unregister(struct sys_devic
EXPORT_SYMBOL_GPL(sysdev_register);
EXPORT_SYMBOL_GPL(sysdev_unregister);
- #define to_ext_attr(x) container_of(x, struct sysdev_ext_attribute, attr)
-
-int __init system_bus_init(void)
-{
- system_kset = kset_create_and_add("system", NULL, &devices_kset->kobj);
- if (!system_kset)
- return -ENOMEM;
- return 0;
-}
-
ssize_t sysdev_store_ulong(struct sys_device *sysdev,
struct sysdev_attribute *attr,
const char *buf, size_t size)
Attachment:
pgpvm9A8oC943.pgp
Description: PGP signature
