linux-kernel - linux-next: manual merge of the workqueues tree with the lost-spurious-irq 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]

Date:	Thu, 29 Jul 2010 13:19:53 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Tejun Heo <tj@...nel.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: linux-next: manual merge of the workqueues tree with the
 lost-spurious-irq tree

Hi Tejun,

Today's linux-next merge of the workqueues tree got a conflict in
include/linux/libata.h between commit
fa7cd37f808c487f722d7a2ce9c0923a323922df ("libata: use IRQ expecting")
from the lost-spurious-irq tree and commit
ad72cf9885c536e3adae03f8337557ac9dd1e4bb ("libata: take advantage of cmwq
and remove concurrency limitations") from the workqueues tree.

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

diff --cc include/linux/libata.h
index 3f5f159,f010f18..0000000
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@@ -751,8 -751,7 +751,9 @@@ struct ata_port 
  	struct ata_host		*host;
  	struct device 		*dev;
  
 +	struct irq_expect	*irq_expect;	/* for irq expecting */
 +
+ 	struct mutex		scsi_scan_mutex;
  	struct delayed_work	hotplug_task;
  	struct work_struct	scsi_rescan_task;
  
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/