From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
From: Sven Eckelmann <sven@narfation.org>
To: Ben Hutchings <ben@decadent.org.uk>
Cc: linux-kernel@vger.kernel.org, stable@vger.kernel.org,
	akpm@linux-foundation.org,
	Marek Lindner <mareklindner@neomailbox.ch>,
	Linus =?ISO-8859-1?Q?L=FCssing?= <linus.luessing@c0d3.blue>,
	Antonio Quartulli <a@unstable.cc>
Subject: Re: [PATCH 3.16 046/114] batman-adv: Fix broadcast/ogm queue limit on a removed interface
Date: Mon, 13 Jun 2016 21:33:50 +0200
Message-ID: <4657746.cKVj6RgzQ6@sven-edge>
In-Reply-To: <lsq.1465842997.536267398@decadent.org.uk>
References: <lsq.1465842997.536267398@decadent.org.uk>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="nextPart1544326.YHMznhYrIW"; micalg="pgp-sha512"; protocol="application/pgp-signature"
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <stable.vger.kernel.org>

--nextPart1544326.YHMznhYrIW
Content-Transfer-Encoding: 7Bit
Content-Type: text/plain; charset="us-ascii"

Hi,

looks like the patch is broken (at least it does something different than the 
non-stable patch does).

On Monday 13 June 2016 19:36:37 Ben Hutchings wrote:
> 3.16.36-rc1 review patch.  If anyone has any objections, please let me know.
[...]
> --- a/net/batman-adv/send.c
> +++ b/net/batman-adv/send.c
> @@ -638,6 +638,12 @@ batadv_purge_outstanding_packets(struct
> 
>  		if (pending) {
>  			hlist_del(&forw_packet->list);
> +			if (!forw_packet->own)
> +				atomic_inc(&bat_priv->bcast_queue_left);
> +
> +			if (!forw_packet->own)
> +				atomic_inc(&bat_priv->batman_queue_left);
> +
>  			batadv_forw_packet_free(forw_packet);
>  		}
>  	}

It seems to be a problem with the way GNU patch solved the conflicts with the 
slightly different orig file (moved the hunks together when it shouldn't 
have). GregKH also had this problem [1]

Kind regards,
	Sven

[1] http://mid.gmane.org/20160507195405.GA4376@kroah.com
--nextPart1544326.YHMznhYrIW
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: This is a digitally signed message part.
Content-Transfer-Encoding: 7Bit

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iQIcBAABCgAGBQJXXwqeAAoJEF2HCgfBJntGqQEP/3/xjvaJp5jSnb+Cwjmq/E0l
GO6Zm1WRz61ozjNu3Q67BtOvv+tPuXm/WxRvFYMM2CoXBz9zKIYiLuPB4SO7tykF
SHqCu+MlIXiLCATnzYS1YuDfb3bGkPPZvbSXuh9cj/Gd55Sgv7f7oBMAwWRX8Q9r
+iGHhnYzfaFbF693X0H8beilRksdgMQz54BfakpzSg/rB4h9BBL5hMQOm2eERDOA
CI5y2lMLydWMi9Y5eLCPLuv/mOkF/bL5vkvqCpBRIdQKBqcpQui58JhMnpcBaUsC
mg3aqVRE+cXj96kIiHuUyBnOLX8cJcMUJ0U1lYCpri7Vofyi87+OuAc7KsyQLNRw
M54+3aiTDV31rT086LfhpbIceJvvvb0MgLuiz0Ex11x/EKwwb2NLUlzq9dYoaSdc
jSQoTXLMpNWEH0u+vcAGEbxQU6ze7+Ozk2GAi+foiKw8JCnRL7+OUEjI5z8/Nn7Y
3UA+CyF8rqvJ/ZZNM0mjVF9wERdljaKYzlJpWoCcXUQvN4ssguau/1/lukLCMHFJ
BfTvTTcvSmPclopuT4Ya3HACt2XtKInm/ZDJReVEsU/L6zieUTPcAEjMEaKgpo3X
pU+2++fD8xCFxRvCq+emV+2mQM+KuI4pI+th35yn6za+TW1WfRlHs+aLpXcHMTXi
MgsVWmos4pXoZkrFd3de
=1Ajp
-----END PGP SIGNATURE-----

--nextPart1544326.YHMznhYrIW--