linux-next: manual merge of the net-next tree with the net tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the net-next tree got a conflict in
drivers/net/netconsole.c between commit c7c6effdeffc ("netconsole: fix
multiple race conditions") from the net tree and commit 22ded57729e6
("netconsole: Convert to pr_<level>") from the net-next tree.

(Thanks for removing that spare blank line :-))

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

-- 
Cheers,
Stephen Rothwell                    s...@canb.auug.org.au

diff --cc drivers/net/netconsole.c
index c9a15925a1f7,a8ef4c4b94be..000000000000
--- a/drivers/net/netconsole.c
+++ b/drivers/net/netconsole.c
@@@ -333,18 -336,14 +335,18 @@@ static ssize_t store_enabled(struct net
                netpoll_print_options(&nt->np);
  
                err = netpoll_setup(&nt->np);
 -              if (err) {
 -                      mutex_unlock(&nt->mutex);
 +              if (err)
                        return err;
 -              }
  
-               printk(KERN_INFO "netconsole: network logging started\n");
+               pr_info("network logging started\n");
 -
        } else {        /* 0 */
 +              /* We need to disable the netconsole before cleaning it up
 +               * otherwise we might end up in write_msg() with
 +               * nt->np.dev == NULL and nt->enabled == 1
 +               */
 +              spin_lock_irqsave(&target_list_lock, flags);
 +              nt->enabled = 0;
 +              spin_unlock_irqrestore(&target_list_lock, flags);
                netpoll_cleanup(&nt->np);
        }
  

pgpit2RDByXvR.pgp
Description: PGP signature