From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761081AbdJQK15 (ORCPT ); Tue, 17 Oct 2017 06:27:57 -0400 Received: from heliosphere.sirena.org.uk ([172.104.155.198]:38098 "EHLO heliosphere.sirena.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757290AbdJQK1z (ORCPT ); Tue, 17 Oct 2017 06:27:55 -0400 Date: Tue, 17 Oct 2017 11:27:51 +0100 From: Mark Brown To: Jiri Pirko Cc: David Miller , Networking , Or Gerlitz , Roi Dayan , Jiri Pirko , Linux-Next Mailing List , Linux Kernel Mailing List Subject: Re: linux-next: net/sched/cls_flower.c Message-ID: <20171017102751.wpwiyh72daobyicj@sirena.co.uk> References: <20171017101509.soy55d4ipx3dusbo@sirena.co.uk> <20171017102107.GF2112@nanopsycho> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="zfplr4y6xiwnwtyq" Content-Disposition: inline In-Reply-To: <20171017102107.GF2112@nanopsycho> X-Cookie: Whatever became of eternal truth? User-Agent: NeoMutt/20170609 (1.8.3) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --zfplr4y6xiwnwtyq Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Tue, Oct 17, 2017 at 12:21:07PM +0200, Jiri Pirko wrote: > Tue, Oct 17, 2017 at 12:15:09PM CEST, broonie@kernel.org wrote: > >/home/broonie/tmpfs/next/net/sched/cls_flower.c:270:27: error: 'struct cls_fl_filter' has no member named 'hw_dev' > > cls_flower.egress_dev = f->hw_dev != tp->q->dev_queue->dev; > This fix ("net/sched: cls_flower: Set egress_dev mark when calling into the HW driver") > went to -net tree, should not go to -next. Apparently there is some mixup. > DaveM? The issue is that: > > 7578d7b45ed870b1 ("net: sched: remove unused tcf_exts_get_dev helper and cls_flower->egress_dev") > >both in the net-next tree. Falling back to previous net-next trees > >introduced other issues so I reverted that commit for today. the removal happened in the net-next tree, breaking the commit that was previously introduced in the net tree (sorry, didn't notice that the immediate commit was in there not net-next). --zfplr4y6xiwnwtyq Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAABCAAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAlnl2yYACgkQJNaLcl1U h9BCpwf/bQ3tV8Z9pFFXIhXKWnPDGYYS2WmW0dBJOVWexIHWdacBSSZVZFdCPt2l Zh3K3Ij0qUGrAWTAxgH74+98b/dTi88YAEGsx5KCoayvljrN4ycI27bAinOdamQ/ rxuW4XliRU4XVRTPa5p1b9H8oxtGAYp1t/e+/iRQPHL8BiPnYFtXfLpXBJY5uZeI KWTGKQYpSVctMWh2nFTuAEbcK4xfNxCzMc+Xccv0jsT2PT/V1u8Zt6kGDdGYFCXI zn48+SyyMJI93KuxwBw8bI0T1CUEjCZ74R2SjTANkBw5G/doQoEe71kQp70/aiF4 YESMDI/jpjsVUFOFo1/733ThhXbobw== =asou -----END PGP SIGNATURE----- --zfplr4y6xiwnwtyq--