linux-kernel - linux-next: manual merge of the akpm tree with the powerpc 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: <20120313201030.c4730c816be21a7d053ffb90@canb.auug.org.au>
Date:	Tue, 13 Mar 2012 20:10:30 +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,
	Oleg Nesterov <oleg@...hat.com>,
	Benjamin Herrenschmidt <benh@...nel.crashing.org>,
	Paul Mackerras <paulus@...ba.org>,
	<linuxppc-dev@...ts.ozlabs.org>,
	Gavin Shan <shangw@...ux.vnet.ibm.com>
Subject: linux-next: manual merge of the akpm tree with the powerpc tree

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
arch/powerpc/platforms/pseries/eeh_event.c between commit 29f8bf1b7f79
("powerpc/pseries: Cleanup comments in EEH aux components") from the
powerpc tree and commit "powerpc/eeh: remove eeh_event_handler()
->daemonize()" from the akpm 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/powerpc/platforms/pseries/eeh_event.c
index 4a47525,a6d33c8..0000000
--- a/arch/powerpc/platforms/pseries/eeh_event.c
+++ b/arch/powerpc/platforms/pseries/eeh_event.c
@@@ -56,10 -58,10 +56,10 @@@ DEFINE_MUTEX(eeh_event_mutex)
  static int eeh_event_handler(void * dummy)
  {
  	unsigned long flags;
 -	struct eeh_event	*event;
 -	struct pci_dn *pdn;
 +	struct eeh_event *event;
 +	struct eeh_dev *edev;
  
- 	daemonize("eehd");
+ 	set_task_comm(current, "eehd");
  	set_current_state(TASK_INTERRUPTIBLE);
  
  	spin_lock_irqsave(&eeh_eventlist_lock, flags);

Content of type "application/pgp-signature" skipped