linux-kernel - linux-next: manual merge of the driver-core tree with the arm tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20120106175227.07a7240920f3ccd95c27b9a7@canb.auug.org.au>
Date:	Fri, 6 Jan 2012 17:52:27 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Greg KH <greg@...ah.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Nicolas Pitre <nicolas.pitre@...aro.org>,
	Russell King <rmk@....linux.org.uk>,
	Kay Sievers <kay.sievers@...y.org>
Subject: linux-next: manual merge of the driver-core tree with the arm tree

Hi Greg,

Today's linux-next merge of the driver-core tree got a conflict in
arch/arm/mach-s5pc100/common.c between commit 109ac862f737 ("ARM:
mach-s5pc100: use standard arch_idle()") from the arm tree and commit
4a858cfc9af8 ("arm: convert sysdev_class to a regular subsystem") from
the driver-core tree.

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

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

diff --cc arch/arm/mach-s5pc100/common.c
index 4659fb9,af52c09..0000000
--- a/arch/arm/mach-s5pc100/common.c
+++ b/arch/arm/mach-s5pc100/common.c
@@@ -194,27 -154,17 +195,27 @@@ static struct device s5pc100_dev = 
  
  static int __init s5pc100_core_init(void)
  {
- 	return sysdev_class_register(&s5pc100_sysclass);
+ 	return subsys_system_register(&s5pc100_subsys, NULL);
  }
 -
  core_initcall(s5pc100_core_init);
  
  int __init s5pc100_init(void)
  {
  	printk(KERN_INFO "S5PC100: Initializing architecture\n");
- 	return sysdev_register(&s5pc100_sysdev);
++	return device_register(&s5pc100_sys);
 +}
  
 -	/* set idle function */
 -	pm_idle = s5pc100_idle;
 +/* uart registration process */
  
 -	return device_register(&s5pc100_sys);
 +void __init s5pc100_init_uarts(struct s3c2410_uartcfg *cfg, int no)
 +{
 +	s3c24xx_init_uartdevs("s3c6400-uart", s5p_uart_resources, cfg, no);
 +}
 +
 +void s5pc100_restart(char mode, const char *cmd)
 +{
 +	if (mode != 's')
 +		arch_wdt_reset();
 +
 +	soft_restart(0);
  }

Content of type "application/pgp-signature" skipped