netdev - linux-next: manual merge of the akpm tree with the net 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 for Android: free password hash cracker in your pocket

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20170210182714.0a186a25@canb.auug.org.au>
Date:   Fri, 10 Feb 2017 18:27:14 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Andrew Morton <akpm@...ux-foundation.org>,
        David Miller <davem@...emloft.net>,
        Networking <netdev@...r.kernel.org>
Cc:     linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
        Alexey Dobriyan <adobriyan@...il.com>,
        Stefan Brüns <stefan.bruens@...h-aachen.de>
Subject: linux-next: manual merge of the akpm tree with the net tree

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in:

  drivers/net/usb/sierra_net.c

between commit:

  5a70348e1187 ("sierra_net: Add support for IPv6 and Dual-Stack Link Sense Indications")

from the net tree and patch:

  "lib/vsprintf.c: remove %Z support"

from the akpm tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/net/usb/sierra_net.c
index d9440bc022f2,88ace5024306..000000000000
--- a/drivers/net/usb/sierra_net.c
+++ b/drivers/net/usb/sierra_net.c
@@@ -376,11 -349,11 +376,11 @@@ static inline int sierra_net_is_valid_a
  static int sierra_net_parse_lsi(struct usbnet *dev, char *data, int datalen)
  {
  	struct lsi_umts *lsi = (struct lsi_umts *)data;
 +	u32 expected_length;
  
 -	if (datalen < sizeof(struct lsi_umts)) {
 -		netdev_err(dev->net, "%s: Data length %d, exp %zu\n",
 -				__func__, datalen,
 -				sizeof(struct lsi_umts));
 +	if (datalen < sizeof(struct lsi_umts_single)) {
- 		netdev_err(dev->net, "%s: Data length %d, exp >= %Zu\n",
++		netdev_err(dev->net, "%s: Data length %d, exp >= %zu\n",
 +			   __func__, datalen, sizeof(struct lsi_umts_single));
  		return -1;
  	}