linux-kernel - linux-next: manual merge of the irqdomain tree with the 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: <20130618154515.828365d615bbe6b93169e706@canb.auug.org.au>
Date:	Tue, 18 Jun 2013 15:45:15 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Grant Likely <grant.likely@...retlab.ca>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Ralf Baechle <ralf@...ux-mips.org>,
	Kefeng Wang <wangkefeng.wang@...wei.com>
Subject: linux-next: manual merge of the irqdomain tree with the  tree

Hi Grant,

Today's linux-next merge of the irqdomain tree got a conflict in
kernel/irq/irqdomain.c between commit c5cdc67a58a2 ("irqdomain: Remove
temporary MIPS workaround code") from the mips tree and commit
bd4641e31e90 ("irq: fix checkpatch error") from the irqdomain 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 kernel/irq/irqdomain.c
index a341b3d,13f2654..0000000
--- a/kernel/irq/irqdomain.c
+++ b/kernel/irq/irqdomain.c
@@@ -665,8 -475,20 +475,8 @@@ unsigned int irq_create_of_mapping(stru
  
  	domain = controller ? irq_find_host(controller) : irq_default_domain;
  	if (!domain) {
- 		pr_warning("no irq domain found for %s !\n",
- 			   of_node_full_name(controller));
 -#ifdef CONFIG_MIPS
 -		/*
 -		 * Workaround to avoid breaking interrupt controller drivers
 -		 * that don't yet register an irq_domain.  This is temporary
 -		 * code. ~~~gcl, Feb 24, 2012
 -		 *
 -		 * Scheduled for removal in Linux v3.6.  That should be enough
 -		 * time.
 -		 */
 -		if (intsize > 0)
 -			return intspec[0];
 -#endif
+ 		pr_warn("no irq domain found for %s !\n",
+ 			of_node_full_name(controller));
  		return 0;
  	}
  

Content of type "application/pgp-signature" skipped