linux-kernel - linux-next: manual merge of the akpm tree with the driver-core.current 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>] [day] [month] [year] [list]

Message-Id: <20121224131023.e0433db6868d6234c7a8c195@canb.auug.org.au>
Date:	Mon, 24 Dec 2012 13:10:23 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Andrew Morton <akpm@...ux-foundation.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
	Bill Pemberton <wfp5p@...ginia.edu>
Subject: linux-next: manual merge of the akpm tree with the
 driver-core.current tree

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
drivers/rtc/rtc-tegra.c between commit 9889589ba308 ("Drivers: rtc:
remove __dev* attributes") from the driver-core.current tree and commit
"drivers/rtc/rtc-tegra.c: convert to DT driver" from the akpm tree.

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

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

diff --cc drivers/rtc/rtc-tegra.c
index 5ba2f75,fb62808..0000000
--- a/drivers/rtc/rtc-tegra.c
+++ b/drivers/rtc/rtc-tegra.c
@@@ -303,7 -303,13 +303,13 @@@ static struct rtc_class_ops tegra_rtc_o
  	.alarm_irq_enable = tegra_rtc_alarm_irq_enable,
  };
  
+ static const struct of_device_id tegra_rtc_dt_match[] = {
+ 	{ .compatible = "nvidia,tegra20-rtc", },
+ 	{}
+ };
+ MODULE_DEVICE_TABLE(of, tegra_rtc_dt_match);
+ 
 -static int __devinit tegra_rtc_probe(struct platform_device *pdev)
 +static int tegra_rtc_probe(struct platform_device *pdev)
  {
  	struct tegra_rtc_info *info;
  	struct resource *res;

Content of type "application/pgp-signature" skipped