Return-Path: Received: from shadbolt.e.decadent.org.uk ([88.96.1.126]:32810 "EHLO shadbolt.e.decadent.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754555AbbJHMtw (ORCPT ); Thu, 8 Oct 2015 08:49:52 -0400 Message-ID: <1444308572.2956.254.camel@decadent.org.uk> Subject: Re: Build errors in v3.10-stable-queue From: Ben Hutchings To: Guenter Roeck , stable , Greg Kroah-Hartman Cc: dingtianhong Date: Thu, 08 Oct 2015 13:49:32 +0100 In-Reply-To: <56071A11.5000800@roeck-us.net> References: <56071A11.5000800@roeck-us.net> Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-ubV5ghGs620/Fyl0L3ZJ" Mime-Version: 1.0 Sender: stable-owner@vger.kernel.org List-ID: --=-ubV5ghGs620/Fyl0L3ZJ Content-Type: multipart/mixed; boundary="=-m1ZhZE8Z7bxLTov3yi6V" --=-m1ZhZE8Z7bxLTov3yi6V Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Sat, 2015-09-26 at 15:20 -0700, Guenter Roeck wrote: > drivers/net/bonding/bond_main.c: In function =E2=80=98bond_get_old_active= =E2=80=99: > drivers/net/bonding/bond_main.c:884:33: error: macro "bond_for_each_slave= " requires 3 arguments, but only 2 given > drivers/net/bonding/bond_main.c:884:2: error: =E2=80=98bond_for_each_slav= e=E2=80=99 undeclared (first use in this function) > drivers/net/bonding/bond_main.c:884:2: note: each undeclared identifier i= s reported only once for each function it appears in > drivers/net/bonding/bond_main.c:884:35: error: expected =E2=80=98;=E2=80= =99 before =E2=80=98{=E2=80=99 token >=20 > This affects a large number of builds. >=20 > Culprit is 'bonding: correct the MAC address for "follow" > fail_over_mac policy', which may need a backport. bond_for_each_slave() needs an int parameter for a counter. Untested backport attached, based on what I did for 3.2. Ben. --=20 Ben Hutchings Once a job is fouled up, anything done to improve it makes it worse. --=-m1ZhZE8Z7bxLTov3yi6V Content-Disposition: attachment; filename*0=bonding-correct-the-mac-address-for-follow-fail_over_mac-poli; filename*1=cy.patch Content-Type: text/x-patch; name*0=bonding-correct-the-mac-address-for-follow-fail_over_mac-policy.p; name*1=atch; charset="UTF-8" Content-Transfer-Encoding: base64 RnJvbTogZGluZ3RpYW5ob25nIDxkaW5ndGlhbmhvbmdAaHVhd2VpLmNvbT4KRGF0ZTogVGh1LCAx NiBKdWwgMjAxNSAxNjozMDowMiArMDgwMApTdWJqZWN0OiBib25kaW5nOiBjb3JyZWN0IHRoZSBN QUMgYWRkcmVzcyBmb3IgImZvbGxvdyIgIGZhaWxfb3Zlcl9tYWMgcG9saWN5CgpbIFVwc3RyZWFt IGNvbW1pdCBhOTUxYmMxZTZiYTU4ZjExZGY1ZWQ1ZGRjNDEzMTFlMTBmNWZkMjBiIF0KClRoZSAi Zm9sbG93IiBmYWlsX292ZXJfbWFjIHBvbGljeSBpcyB1c2VmdWwgZm9yIG11bHRpcG9ydCBkZXZp Y2VzIHRoYXQKZWl0aGVyIGJlY29tZSBjb25mdXNlZCBvciBpbmN1ciBhIHBlcmZvcm1hbmNlIHBl bmFsdHkgd2hlbiBtdWx0aXBsZQpwb3J0cyBhcmUgcHJvZ3JhbW1lZCB3aXRoIHRoZSBzYW1lIE1B QyBhZGRyZXNzLCBidXQgdGhlIHNhbWUgTUFDCmFkZHJlc3Mgc3RpbGwgbWF5IGhhcHBlbmVkIGJ5 IHRoaXMgc3RlcHMgZm9yIHRoaXMgcG9saWN5OgoKMSkgZWNobyArZXRoMCA+IC9zeXMvY2xhc3Mv bmV0L2JvbmQwL2JvbmRpbmcvc2xhdmVzCiAgIGJvbmQwIGhhcyB0aGUgc2FtZSBtYWMgYWRkcmVz cyB3aXRoIGV0aDAsIGl0IGlzIE1BQzEuCgoyKSBlY2hvICtldGgxID4gL3N5cy9jbGFzcy9uZXQv Ym9uZDAvYm9uZGluZy9zbGF2ZXMKICAgZXRoMSBpcyBiYWNrdXAsIGV0aDEgaGFzIE1BQzIuCgoz KSBpZmNvbmZpZyBldGgwIGRvd24KICAgZXRoMSBiZWNhbWUgYWN0aXZlIHNsYXZlLCBib25kIHdp bGwgc3dhcCBNQUMgZm9yIGV0aDAgYW5kIGV0aDEsCiAgIHNvIGV0aDEgaGFzIE1BQzEsIGFuZCBl dGgwIGhhcyBNQUMyLgoKNCkgaWZjb25maWcgZXRoMSBkb3duCiAgIHRoZXJlIGlzIG5vIGFjdGl2 ZSBzbGF2ZSwgYW5kIGV0aDEgc3RpbGwgaGFzIE1BQzEsIGV0aDIgaGFzIE1BQzIuCgo1KSBpZmNv bmZpZyBldGgwIHVwCiAgIHRoZSBldGgwIGJlY2FtZSBhY3RpdmUgc2xhdmUgYWdhaW4sIHRoZSBi b25kIHNldCBldGgwIHRvIE1BQzEuCgpTb21ldGhpbmcgd3JvbmcgaGVyZSwgdGhlbiBpZiB5b3Ug c2V0IGV0aDEgdXAsIHRoZSBldGgwIGFuZCBldGgxIHdpbGwgaGF2ZSB0aGUgc2FtZQpNQUMgYWRk cmVzcywgaXQgd2lsbCBicmVhayB0aGlzIHBvbGljeSBmb3IgQUNUSVZFX0JBQ0tVUCBtb2RlLgoK VGhpcyBwYXRjaCB3aWxsIGZpeCB0aGlzIHByb2JsZW0gYnkgZmluZGluZyB0aGUgb2xkIGFjdGl2 ZSBzbGF2ZSBhbmQKc3dhcCB0aGVtIE1BQyBhZGRyZXNzIGJlZm9yZSBjaGFuZ2UgYWN0aXZlIHNs YXZlLgoKU2lnbmVkLW9mZi1ieTogRGluZyBUaWFuaG9uZyA8ZGluZ3RpYW5ob25nQGh1YXdlaS5j b20+ClRlc3RlZC1ieTogTmlrb2xheSBBbGVrc2FuZHJvdiA8bmlrb2xheUBjdW11bHVzbmV0d29y a3MuY29tPgpTaWduZWQtb2ZmLWJ5OiBEYXZpZCBTLiBNaWxsZXIgPGRhdmVtQGRhdmVtbG9mdC5u ZXQ+Cltid2g6IEJhY2twb3J0ZWQgdG8gMy4xMDogYm9uZF9mb3JfZWFjaF9zbGF2ZSgpIHRha2Vz IGFuIGV4dHJhIGludCBwYXJhbXRlcl0KU2lnbmVkLW9mZi1ieTogQmVuIEh1dGNoaW5ncyA8YmVu QGRlY2FkZW50Lm9yZy51az4KLS0tCi0tLSBhL2RyaXZlcnMvbmV0L2JvbmRpbmcvYm9uZF9tYWlu LmMKKysrIGIvZHJpdmVycy9uZXQvYm9uZGluZy9ib25kX21haW4uYwpAQCAtODYxLDYgKzg2MSwy MyBAQCBzdGF0aWMgdm9pZCBib25kX21jX3N3YXAoc3RydWN0IGJvbmRpbmcKIAl9CiB9CiAKK3N0 YXRpYyBzdHJ1Y3Qgc2xhdmUgKmJvbmRfZ2V0X29sZF9hY3RpdmUoc3RydWN0IGJvbmRpbmcgKmJv bmQsCisJCQkJCSBzdHJ1Y3Qgc2xhdmUgKm5ld19hY3RpdmUpCit7CisJc3RydWN0IHNsYXZlICpz bGF2ZTsKKwlpbnQgaTsKKworCWJvbmRfZm9yX2VhY2hfc2xhdmUoYm9uZCwgc2xhdmUsIGkpIHsK KwkJaWYgKHNsYXZlID09IG5ld19hY3RpdmUpCisJCQljb250aW51ZTsKKworCQlpZiAoZXRoZXJf YWRkcl9lcXVhbChib25kLT5kZXYtPmRldl9hZGRyLCBzbGF2ZS0+ZGV2LT5kZXZfYWRkcikpCisJ CQlyZXR1cm4gc2xhdmU7CisJfQorCisJcmV0dXJuIE5VTEw7Cit9CisKIC8qCiAgKiBib25kX2Rv X2ZhaWxfb3Zlcl9tYWMKICAqCkBAIC04OTgsNiArOTE1LDkgQEAgc3RhdGljIHZvaWQgYm9uZF9k b19mYWlsX292ZXJfbWFjKHN0cnVjdAogCQl3cml0ZV91bmxvY2tfYmgoJmJvbmQtPmN1cnJfc2xh dmVfbG9jayk7CiAJCXJlYWRfdW5sb2NrKCZib25kLT5sb2NrKTsKIAorCQlpZiAoIW9sZF9hY3Rp dmUpCisJCQlvbGRfYWN0aXZlID0gYm9uZF9nZXRfb2xkX2FjdGl2ZShib25kLCBuZXdfYWN0aXZl KTsKKwogCQlpZiAob2xkX2FjdGl2ZSkgewogCQkJbWVtY3B5KHRtcF9tYWMsIG5ld19hY3RpdmUt PmRldi0+ZGV2X2FkZHIsIEVUSF9BTEVOKTsKIAkJCW1lbWNweShzYWRkci5zYV9kYXRhLCBvbGRf YWN0aXZlLT5kZXYtPmRldl9hZGRyLAo= --=-m1ZhZE8Z7bxLTov3yi6V-- --=-ubV5ghGs620/Fyl0L3ZJ Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIVAwUAVhZmXee/yOyVhhEJAQp6Ow//VNJagZ104rwbgagwLj/uzFJwB0X44gTw 576C9Ujfsk2T3bTbNCWGgyAhsxqM/PiMVAUe9XF9pQJ+ULt/rZdyGzi5mAlgf8OM dgC9TDNNJbipuz5fhfjXSsNQL9e2O7AH0zNDPH3I+Atcygcmkle0zv0Bx5NfEtMF w282H1PNrXsxe9aNc2WnUehJ7vHBium+8sQtUSXEwpXL32XrFvSDMAAMxw7edJbq 5gtAoDuMuUnizGxuZGcVCaA7tQWjuTXdGParAYO4RJ57BIOIxkydIjEor0PrJCin ajZrr4Cdx09Y+xMkPtTVS8EYuVLiyCHXc+sJ0RBzmf+g+pzRfYYcOcx2eQH3HUnf /NZiReYkdTQWJDvm0iQSnQi5t3GtIwf9mWWplfKnwNmI1UopMldRXH5S1qtLarxJ FSS6BjyNyoT/KQShv/HDw4bYwRYUaNXV0eENjZT74r7/WF0PI4AvIpbEtaA/QwS9 i1SIs3PcWUKv+HmOtg5Q8RRi6HcdqZilPIvORol07u0Ii3ZNNsY9Sh9RdZoDQYiF EbWxzWtmZBPLw5S0F+WwVglgBQPxrFPTvyUNRriPp0UKcdG48iRw9GBSllE8tnaB AEJeLzEF7T1NgGUtEYvzXqI3BFGm2zgv5NxG2ubCa3oji4Vc2hE/LklaEgxgTs0M L+dBRCGpeUM= =98X/ -----END PGP SIGNATURE----- --=-ubV5ghGs620/Fyl0L3ZJ--