linux-next: manual merge of the driver-core tree with Linus' tree

linux-next: manual merge of the driver-core tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 3139 bytes --]

Hi Greg,

Today's linux-next merge of the driver-core tree got a conflict in
drivers/acpi/processor_driver.c between commit 54d5dcc45af7 ("ACPI
processor hotplug: Split up acpi_processor_add") from Linus' tree and
commit 9061e0e16700 ("ACPI: Load acpi-cpufreq from processor driver
automatically") from the driver-core tree.

I fixed it up (I think- see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/acpi/processor_driver.c
index 2b805d7,e6920d0..0000000
--- a/drivers/acpi/processor_driver.c
+++ b/drivers/acpi/processor_driver.c
@@@ -459,71 -440,6 +459,72 @@@ static struct notifier_block acpi_cpu_n
  	    .notifier_call = acpi_cpu_soft_notify,
  };
  
 +/*
 + * acpi_processor_start() is called by the cpu_hotplug_notifier func:
 + * acpi_cpu_soft_notify(). Getting it __cpuinit{data} is difficult, the
 + * root cause seem to be that acpi_processor_uninstall_hotplug_notify()
 + * is in the module_exit (__exit) func. Allowing acpi_processor_start()
 + * to not be in __cpuinit section, but being called from __cpuinit funcs
 + * via __ref looks like the right thing to do here.
 + */
 +static __ref int acpi_processor_start(struct acpi_processor *pr)
 +{
 +	struct acpi_device *device = per_cpu(processor_device_array, pr->id);
 +	int result = 0;
 +
 +#ifdef CONFIG_CPU_FREQ
 +	acpi_processor_ppc_has_changed(pr, 0);
++	acpi_processor_load_module(pr);
 +#endif
 +	acpi_processor_get_throttling_info(pr);
 +	acpi_processor_get_limit_info(pr);
 +
 +	if (!cpuidle_get_driver() || cpuidle_get_driver() == &acpi_idle_driver)
 +		acpi_processor_power_init(pr, device);
 +
 +	pr->cdev = thermal_cooling_device_register("Processor", device,
 +						   &processor_cooling_ops);
 +	if (IS_ERR(pr->cdev)) {
 +		result = PTR_ERR(pr->cdev);
 +		goto err_power_exit;
 +	}
 +
 +	dev_dbg(&device->dev, "registered as cooling_device%d\n",
 +		pr->cdev->id);
 +
 +	result = sysfs_create_link(&device->dev.kobj,
 +				   &pr->cdev->device.kobj,
 +				   "thermal_cooling");
 +	if (result) {
 +		printk(KERN_ERR PREFIX "Create sysfs link\n");
 +		goto err_thermal_unregister;
 +	}
 +	result = sysfs_create_link(&pr->cdev->device.kobj,
 +				   &device->dev.kobj,
 +				   "device");
 +	if (result) {
 +		printk(KERN_ERR PREFIX "Create sysfs link\n");
 +		goto err_remove_sysfs_thermal;
 +	}
 +
 +	return 0;
 +
 +err_remove_sysfs_thermal:
 +	sysfs_remove_link(&device->dev.kobj, "thermal_cooling");
 +err_thermal_unregister:
 +	thermal_cooling_device_unregister(pr->cdev);
 +err_power_exit:
 +	acpi_processor_power_exit(pr, device);
 +
 +	return result;
 +}
 +
 +/*
 + * Do not put anything in here which needs the core to be online.
 + * For example MSR access or setting up things which check for cpuinfo_x86
 + * (cpu_data(cpu)) values, like CPU feature flags, family, model, etc.
 + * Such things have to be put in and set up above in acpi_processor_start()
 + */
  static int __cpuinit acpi_processor_add(struct acpi_device *device)
  {
  	struct acpi_processor *pr = NULL;

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: manual merge of the driver-core tree with Linus' tree

[Greg KH]

On Mon, Jan 30, 2012 at 01:24:51PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the driver-core tree got a conflict in
> drivers/acpi/processor_driver.c between commit 54d5dcc45af7 ("ACPI
> processor hotplug: Split up acpi_processor_add") from Linus' tree and
> commit 9061e0e16700 ("ACPI: Load acpi-cpufreq from processor driver
> automatically") from the driver-core tree.
> 
> I fixed it up (I think- see below) and can carry the fix as necessary.

Thanks, I'll merge the driver-core next tree when 3.3-rc2 is out to
resolve this problem.

greg k-h

Re: linux-next: manual merge of the driver-core tree with Linus' tree

[Greg KH]

On Sun, Jan 29, 2012 at 06:35:17PM -0800, Greg KH wrote:
> On Mon, Jan 30, 2012 at 01:24:51PM +1100, Stephen Rothwell wrote:
> > Hi Greg,
> > 
> > Today's linux-next merge of the driver-core tree got a conflict in
> > drivers/acpi/processor_driver.c between commit 54d5dcc45af7 ("ACPI
> > processor hotplug: Split up acpi_processor_add") from Linus' tree and
> > commit 9061e0e16700 ("ACPI: Load acpi-cpufreq from processor driver
> > automatically") from the driver-core tree.
> > 
> > I fixed it up (I think- see below) and can carry the fix as necessary.
> 
> Thanks, I'll merge the driver-core next tree when 3.3-rc2 is out to
> resolve this problem.

This should now be resolved.

thanks,

greg k-h

Re: linux-next: manual merge of the driver-core tree with Linus' tree

[Viresh Kumar]

On 07-08-15, 15:26, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the driver-core tree got a conflict in:
> 
>   drivers/cpufreq/cpufreq.c
> 
> between commit:
> 
>   559ed40752dc ("cpufreq: Avoid attempts to create duplicate symbolic links")
> 
> from Linus' tree and commit:
> 
>   71db87ba5700 ("bus: subsys: update return type of ->remove_dev() to void")
> 
> from the driver-core tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Looks fine. Thanks.

-- 
viresh

linux-next: manual merge of the driver-core tree with Linus' tree

[Stephen Rothwell]

Hi Greg,

Today's linux-next merge of the driver-core tree got a conflict in:

  drivers/cpufreq/cpufreq.c

between commit:

  559ed40752dc ("cpufreq: Avoid attempts to create duplicate symbolic links")

from Linus' tree and commit:

  71db87ba5700 ("bus: subsys: update return type of ->remove_dev() to void")

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/cpufreq/cpufreq.c
index 76a26609d96b,6da25c10bdfd..000000000000
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@@ -1464,44 -1518,43 +1464,42 @@@ static void cpufreq_offline_finish(unsi
   *
   * Removes the cpufreq interface for a CPU device.
   */
- static int cpufreq_remove_dev(struct device *dev, struct subsys_interface *sif)
+ static void cpufreq_remove_dev(struct device *dev, struct subsys_interface *sif)
  {
  	unsigned int cpu = dev->id;
 -	int ret;
 -
 -	/*
 -	 * Only possible if 'cpu' is getting physically removed now. A hotplug
 -	 * notifier should have already been called and we just need to remove
 -	 * link or free policy here.
 -	 */
 -	if (cpu_is_offline(cpu)) {
 -		struct cpufreq_policy *policy = per_cpu(cpufreq_cpu_data, cpu);
 -		struct cpumask mask;
 +	struct cpufreq_policy *policy = per_cpu(cpufreq_cpu_data, cpu);
  
 -		if (!policy)
 -			return;
 +	if (!policy)
- 		return 0;
++		return;
  
 -		cpumask_copy(&mask, policy->related_cpus);
 -		cpumask_clear_cpu(cpu, &mask);
 +	if (cpu_online(cpu)) {
 +		cpufreq_offline_prepare(cpu);
 +		cpufreq_offline_finish(cpu);
 +	}
  
 -		/*
 -		 * Free policy only if all policy->related_cpus are removed
 -		 * physically.
 -		 */
 -		if (cpumask_intersects(&mask, cpu_present_mask)) {
 -			remove_cpu_dev_symlink(policy, cpu);
 -			return;
 -		}
 +	cpumask_clear_cpu(cpu, policy->real_cpus);
  
 +	if (cpumask_empty(policy->real_cpus)) {
  		cpufreq_policy_free(policy, true);
- 		return 0;
+ 		return;
  	}
  
 -	ret = __cpufreq_remove_dev_prepare(dev, sif);
 +	if (cpu != policy->kobj_cpu) {
 +		remove_cpu_dev_symlink(policy, cpu);
 +	} else {
 +		/*
 +		 * The CPU owning the policy object is going away.  Move it to
 +		 * another suitable CPU.
 +		 */
 +		unsigned int new_cpu = cpumask_first(policy->real_cpus);
 +		struct device *new_dev = get_cpu_device(new_cpu);
  
 -	if (!ret)
 -		__cpufreq_remove_dev_finish(dev, sif);
 +		dev_dbg(dev, "%s: Moving policy object to CPU%u\n", __func__, new_cpu);
 +
 +		sysfs_remove_link(&new_dev->kobj, "cpufreq");
 +		policy->kobj_cpu = new_cpu;
 +		WARN_ON(kobject_move(&policy->kobj, &new_dev->kobj));
 +	}
- 
- 	return 0;
  }
  
  static void handle_update(struct work_struct *work)

linux-next: manual merge of the driver-core tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 936 bytes --]

Hi Greg,

Today's linux-next merge of the driver-core tree got a conflict in
drivers/rtc/rtc-snvs.c between commit 88221c32f985 ("rtc: snvs: fix
build with CONFIG_PM_SLEEP disabled") from Linus' tree and commit
0929ae376ef3 ("rtc: drop owner assignment from platform_drivers") 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/rtc/rtc-snvs.c
index 942b267c6271,f04c378b781a..000000000000
--- a/drivers/rtc/rtc-snvs.c
+++ b/drivers/rtc/rtc-snvs.c
@@@ -367,8 -327,7 +367,7 @@@ MODULE_DEVICE_TABLE(of, snvs_dt_ids)
  static struct platform_driver snvs_rtc_driver = {
  	.driver = {
  		.name	= "snvs_rtc",
- 		.owner	= THIS_MODULE,
 -		.pm	= &snvs_rtc_pm_ops,
 +		.pm	= SNVS_RTC_PM_OPS,
  		.of_match_table = snvs_dt_ids,
  	},
  	.probe		= snvs_rtc_probe,

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: linux-next: manual merge of the driver-core tree with Linus' tree

[Greg KH]

On Wed, Jan 23, 2013 at 03:15:52PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the driver-core tree got a conflict in
> drivers/gpio/gpio-mvebu.c between commit 11c0ceec073c ("gpio: mvebu:
> Don't free chip label memory") from Linus' tree and commit 641d03422a59
> ("gpio: Convert to devm_ioremap_resource()") from the driver-core tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Looks good, thanks.

greg k-h

linux-next: manual merge of the driver-core tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1609 bytes --]

Hi Greg,

Today's linux-next merge of the driver-core tree got a conflict in
drivers/gpio/gpio-mvebu.c between commit 11c0ceec073c ("gpio: mvebu:
Don't free chip label memory") from Linus' tree and commit 641d03422a59
("gpio: Convert to devm_ioremap_resource()") 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/gpio/gpio-mvebu.c
index 6819d63,bf6c7c9..0000000
--- a/drivers/gpio/gpio-mvebu.c
+++ b/drivers/gpio/gpio-mvebu.c
@@@ -544,10 -545,10 +545,9 @@@ static int mvebu_gpio_probe(struct plat
  	mvchip->chip.of_node = np;
  
  	spin_lock_init(&mvchip->lock);
- 	mvchip->membase = devm_request_and_ioremap(&pdev->dev, res);
- 	if (! mvchip->membase) {
- 		dev_err(&pdev->dev, "Cannot ioremap\n");
- 		return -ENOMEM;
+ 	mvchip->membase = devm_ioremap_resource(&pdev->dev, res);
+ 	if (IS_ERR(mvchip->membase)) {
 -		kfree(mvchip->chip.label);
+ 		return PTR_ERR(mvchip->membase);
  	}
  
  	/* The Armada XP has a second range of registers for the
@@@ -559,10 -560,12 +559,10 @@@
  			return -ENODEV;
  		}
  
- 		mvchip->percpu_membase = devm_request_and_ioremap(&pdev->dev, res);
- 		if (! mvchip->percpu_membase) {
- 			dev_err(&pdev->dev, "Cannot ioremap\n");
- 			return -ENOMEM;
+ 		mvchip->percpu_membase = devm_ioremap_resource(&pdev->dev,
+ 							       res);
+ 		if (IS_ERR(mvchip->percpu_membase)) {
 -			kfree(mvchip->chip.label);
+ 			return PTR_ERR(mvchip->percpu_membase);
  		}
  	}
  

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: manual merge of the driver-core tree with Linus' tree

[Greg KH]

On Tue, May 01, 2012 at 03:01:09PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the driver-core tree got a conflict in
> init/main.c between commit a99cd1125189 ("init: fix bug where environment
> vars can't be passed via boot args") from Linus' tree and commit
> 9fb48c744ba6 ("params: add 3rd arg to option handler callback signature")
> from the driver-core tree.
> 
> I fixed it up (see below) and can carry the fix as necessary.

Thanks, this should now be resolved in my tree.

greg k-h

Re: linux-next: manual merge of the driver-core tree with Linus' tree

[Greg KH]

On Tue, May 01, 2012 at 03:01:09PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the driver-core tree got a conflict in
> init/main.c between commit a99cd1125189 ("init: fix bug where environment
> vars can't be passed via boot args") from Linus' tree and commit
> 9fb48c744ba6 ("params: add 3rd arg to option handler callback signature")
> from the driver-core tree.
> 
> I fixed it up (see below) and can carry the fix as necessary.

Thanks, I was warned about this from Jim, but hadn't had the chance to
do the merge myself.  I'll work on this later today so you don't have to
carry the fix yourself.

greg k-h

linux-next: manual merge of the driver-core tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 2875 bytes --]

Hi Greg,

Today's linux-next merge of the driver-core tree got a conflict in
init/main.c between commit a99cd1125189 ("init: fix bug where environment
vars can't be passed via boot args") from Linus' tree and commit
9fb48c744ba6 ("params: add 3rd arg to option handler callback signature")
from the driver-core tree.

I fixed it up (see below) and can carry the fix as necessary.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc init/main.c
index 44b2433,11bc6f7..0000000
--- a/init/main.c
+++ b/init/main.c
@@@ -225,9 -225,14 +225,10 @@@ static int __init loglevel(char *str
  
  early_param("loglevel", loglevel);
  
 -/*
 - * Unknown boot options get handed to init, unless they look like
 - * unused parameters (modprobe will find them in /proc/cmdline).
 - */
 -static int __init unknown_bootoption(char *param, char *val,
 +/* Change NUL term back to "=", to make "param" the whole string. */
- static int __init repair_env_string(char *param, char *val)
++static int __init repair_env_string(char *param, char *val,
+ 				const char *unused)
  {
 -	/* Change NUL term back to "=", to make "param" the whole string. */
  	if (val) {
  		/* param=val or param="val"? */
  		if (val == param+strlen(param)+1)
@@@ -239,16 -244,6 +240,17 @@@
  		} else
  			BUG();
  	}
 +	return 0;
 +}
 +
 +/*
 + * Unknown boot options get handed to init, unless they look like
 + * unused parameters (modprobe will find them in /proc/cmdline).
 + */
- static int __init unknown_bootoption(char *param, char *val)
++static int __init unknown_bootoption(char *param, char *val,
++				const char *unused)
 +{
- 	repair_env_string(param, val);
++	repair_env_string(param, val, unused);
  
  	/* Handle obsolete-style parameters */
  	if (obsolete_checksetup(param))
@@@ -728,16 -723,22 +730,16 @@@ static initcall_t *initcall_levels[] __
  };
  
  static char *initcall_level_names[] __initdata = {
- 	"early parameters",
- 	"core parameters",
- 	"postcore parameters",
- 	"arch parameters",
- 	"subsys parameters",
- 	"fs parameters",
- 	"device parameters",
- 	"late parameters",
+ 	"early",
+ 	"core",
+ 	"postcore",
+ 	"arch",
+ 	"subsys",
+ 	"fs",
+ 	"device",
+ 	"late",
  };
  
 -static int __init ignore_unknown_bootoption(char *param, char *val,
 -					const char *doing)
 -{
 -	return 0;
 -}
 -
  static void __init do_initcall_level(int level)
  {
  	extern const struct kernel_param __start___param[], __stop___param[];
@@@ -748,7 -749,7 +750,7 @@@
  		   static_command_line, __start___param,
  		   __stop___param - __start___param,
  		   level, level,
- 		   repair_env_string);
 -		   &ignore_unknown_bootoption);
++		   &repair_env_string);
  
  	for (fn = initcall_levels[level]; fn < initcall_levels[level+1]; fn++)
  		do_one_initcall(*fn);

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: manual merge of the driver-core tree with Linus' tree

[Greg KH]

On Wed, Dec 28, 2011 at 04:28:59PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the driver-core tree got a conflict in
> arch/arm/mach-s3c64xx/s3c6400.c between commit 71b33a4f7c86 ("ARM:
> S3C64XX: Staticise s3c6400_sysclass") from Linus' tree and commit
> 4a858cfc9af8 ("arm: convert sysdev_class to a regular subsystem") from
> the driver-core tree.
> 
> The latter subsumed the change in the former, so I used that.

That sounds correct, thanks.

greg k-h

linux-next: manual merge of the driver-core tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 482 bytes --]

Hi Greg,

Today's linux-next merge of the driver-core tree got a conflict in
arch/arm/mach-s3c64xx/s3c6400.c between commit 71b33a4f7c86 ("ARM:
S3C64XX: Staticise s3c6400_sysclass") from Linus' tree and commit
4a858cfc9af8 ("arm: convert sysdev_class to a regular subsystem") from
the driver-core tree.

The latter subsumed the change in the former, so I used that.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: manual merge of the driver-core tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1003 bytes --]

Hi Greg,

On Tue, 19 Jan 2010 12:59:12 -0800 Greg KH <greg@kroah.com> wrote:
>
> On Mon, Jan 18, 2010 at 06:49:56PM +1100, Stephen Rothwell wrote:
> > 
> > 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.

Excellent, thanks.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]

Re: linux-next: manual merge of the driver-core tree with Linus' tree

[Greg KH]

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

linux-next: manual merge of the driver-core tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 749 bytes --]

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).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]