public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed

From: Kukjin Kim <kgene.kim@samsung•com>
To: 'Stephen Rothwell' <sfr@canb•auug.org.au>, 'Greg KH' <greg@kroah•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
	'Russell King' <rmk@arm•linux.org.uk>,
	'Kay Sievers' <kay.sievers@vrfy•org>
Subject: RE: linux-next: manual merge of the driver-core tree with the arm tree
Date: Fri, 06 Jan 2012 16:13:53 +0900	[thread overview]
Message-ID: <031901cccc42$bf84a1b0$3e8de510$%kim@samsung.com> (raw)
In-Reply-To: <20120106175717.5c39c7f62d73889e29e9b764@canb.auug.org.au>

Stephen Rothwell wrote:
> 
> Hi Greg,
> 
> Today's linux-next merge of the driver-core tree got a conflict in
> arch/arm/mach-s5pv210/common.c between commit 1f34f0e2fb86 ("ARM: 7252/1:
> restart: S5PV210: use new restart hook") 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@canb•auug.org.au
> 
> diff --cc arch/arm/mach-s5pv210/common.c
> index 2622b8a,28e71ef..0000000
> --- a/arch/arm/mach-s5pv210/common.c
> +++ b/arch/arm/mach-s5pv210/common.c
> @@@ -231,38 -185,20 +232,38 @@@ static struct device s5pv210_dev =
> 
>   static int __init s5pv210_core_init(void)
>   {
> - 	return sysdev_class_register(&s5pv210_sysclass);
> + 	return subsys_system_register(&s5pv210_subsys, NULL);
>   }
>  -
>   core_initcall(s5pv210_core_init);
> 
>   int __init s5pv210_init(void)
>   {
>   	printk(KERN_INFO "S5PV210: Initializing architecture\n");
> - 	return sysdev_register(&s5pv210_sysdev);
> ++	return device_register(&s5pv210_dev);
>  +}
> 
>  -	/* set idle function */
>  -	pm_idle = s5pv210_idle;
>  +static struct s3c24xx_uart_clksrc s5pv210_serial_clocks[] = {
>  +	[0] = {
>  +		.name		= "pclk",
>  +		.divisor	= 1,
>  +		.min_baud	= 0,
>  +		.max_baud	= 0,
>  +	},
>  +};
> 
Hi,

Well, above is removed by commit afba7f91 ("ARM: SAMSUNG: remove struct
's3c24xx_uart_clksrc' and all uses of it"). But I'm not sure we don't need
to add it for current conflicts between driver-core and arm tree because the
commit afba7f91 is in arm-soc tree.

>  -	/* set sw_reset function */
>  -	s5p_reset_hook = s5pv210_sw_reset;
>  +/* uart registration process */
> 
>  -	return device_register(&s5pv210_dev);
>  +void __init s5pv210_init_uarts(struct s3c2410_uartcfg *cfg, int no)
>  +{
>  +	struct s3c2410_uartcfg *tcfg = cfg;
>  +	u32 ucnt;
>  +
>  +	for (ucnt = 0; ucnt < no; ucnt++, tcfg++) {
>  +		if (!tcfg->clocks) {
>  +			tcfg->clocks = s5pv210_serial_clocks;
>  +			tcfg->clocks_size =
ARRAY_SIZE(s5pv210_serial_clocks);
>  +		}
>  +	}
>  +

Same as above.

>  +	s3c24xx_init_uartdevs("s5pv210-uart", s5p_uart_resources, cfg, no);
>   }

Thanks.

Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung•com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.

next prev parent reply	other threads:[~2012-01-06  7:13 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-01-06  6:57 linux-next: manual merge of the driver-core tree with the arm tree Stephen Rothwell
2012-01-06  7:13 ` Kukjin Kim [this message]
  -- strict thread matches above, loose matches on Subject: below --
2012-01-06  6:52 Stephen Rothwell
2012-01-06  7:08 ` Kukjin Kim
2012-01-06 19:20   ` 'Greg KH'
2011-12-28  5:40 Stephen Rothwell
2012-01-04 23:08 ` Greg KH
2011-12-28  5:35 Stephen Rothwell
2012-01-04 23:08 ` Greg KH
2011-12-28  5:12 Stephen Rothwell
2011-12-28  5:24 ` Stephen Rothwell
2012-01-04 23:09   ` Greg KH

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='031901cccc42$bf84a1b0$3e8de510$%kim@samsung.com' \
    --to=kgene.kim@samsung$(echo .)com \
    --cc=greg@kroah$(echo .)com \
    --cc=kay.sievers@vrfy$(echo .)org \
    --cc=linux-kernel@vger$(echo .)kernel.org \
    --cc=linux-next@vger$(echo .)kernel.org \
    --cc=rmk@arm$(echo .)linux.org.uk \
    --cc=sfr@canb$(echo .)auug.org.au \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox