linux-next: manual merge of the akpm tree with the powerpc tree

[Stephen Rothwell]

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@xxxxxxxxxxxxxxxx

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);

Attachment: pgp00000.pgp
Description: PGP signature