netdev - linux-next: manual merge of the staging tree with the net-next 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: <20130529141422.f0ce7703d21d02b9d2543930@canb.auug.org.au>
Date:	Wed, 29 May 2013 14:14:22 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Greg KH <greg@...ah.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Jiri Pirko <jiri@...nulli.us>,
	David Miller <davem@...emloft.net>, <netdev@...r.kernel.org>,
	"Tülin İzer" <tulinizer@...il.com>
Subject: linux-next: manual merge of the staging tree with the net-next tree

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/silicom/bpctl_mod.c between commit 351638e7deee ("net:
pass info struct via netdevice notifier") from the net-next tree and
commit f84b075178b4 ("Staging: silicom: Fixed error 'do not initialise
statics to 0 or NULL'") from the staging 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 drivers/staging/silicom/bpctl_mod.c
index c8ddb99,3082ba9..0000000
--- a/drivers/staging/silicom/bpctl_mod.c
+++ b/drivers/staging/silicom/bpctl_mod.c
@@@ -133,8 -133,8 +133,8 @@@ static unsigned long str_to_hex(char *p
  static int bp_device_event(struct notifier_block *unused,
  			   unsigned long event, void *ptr)
  {
 -	struct net_device *dev = ptr;
 +	struct net_device *dev = netdev_notifier_info_to_dev(ptr);
- 	static bpctl_dev_t *pbpctl_dev = NULL, *pbpctl_dev_m = NULL;
+ 	static bpctl_dev_t *pbpctl_dev, *pbpctl_dev_m;
  	int dev_num = 0, ret = 0, ret_d = 0, time_left = 0;
  	/* printk("BP_PROC_SUPPORT event =%d %s %d\n", event,dev->name, dev->ifindex ); */
  	/* return NOTIFY_DONE; */

Content of type "application/pgp-signature" skipped