From owner-svn-src-all@FreeBSD.ORG Sat May 30 04:15:10 2015 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 59326899; Sat, 30 May 2015 04:15:10 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-qk0-x236.google.com (mail-qk0-x236.google.com [IPv6:2607:f8b0:400d:c09::236]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 1477718AF; Sat, 30 May 2015 04:15:10 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: by qkhq76 with SMTP id q76so27330995qkh.2; Fri, 29 May 2015 21:15:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=mOlimapsK0GV6DRg2N/VfDwIYQQiVods9dEZi5OLkEk=; b=oAjffUVn5oU5Xx+6RTbS2nvicQas2ZtOUWWUdLBsEhEn39Ydxzrik4OUDeBlPiOy+F rEFaY1UFTIQshWpiBHd4e2Ns/fS+fJNso/g2l6HywH7S0uyd2V6m/xYsuVQ28Fn1Jh+D QmmFGyIJwk9HkAoJxe+/vitSTqNgGG9l+ROtPGy5iptR/ORteXKU5kqnDIV0oGheZQJv +6l1zil4bBBFbmyTA7yeUYXAdIZFDX5eFj/n4OqW9TgyFo2Agc3ZmzAnvcy+vGogj0U8 NsjyozEUfDRTnRl6sILwMq/w+bhdVQGg/Q6gCcfnPUNHH2gS/1tPX1EgoQbIfUxYk9+v 79ow== MIME-Version: 1.0 X-Received: by 10.140.90.99 with SMTP id w90mr13106907qgd.57.1432959308932; Fri, 29 May 2015 21:15:08 -0700 (PDT) Received: by 10.140.98.73 with HTTP; Fri, 29 May 2015 21:15:08 -0700 (PDT) In-Reply-To: References: <201505271744.t4RHiC04024525@svn.freebsd.org> <16669147.Y9s9XdOlga@ralph.baldwin.cx> Date: Fri, 29 May 2015 21:15:08 -0700 Message-ID: Subject: Re: svn commit: r283620 - in stable/10/sys: amd64/conf conf dev/ixgbe modules modules/ix modules/ixv From: NGie Cooper To: John Baldwin Cc: Eric Joyner , Jack F Vogel , "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-stable@freebsd.org" , "svn-src-stable-10@freebsd.org" Content-Type: text/plain; charset=UTF-8 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 May 2015 04:15:10 -0000 On Wed, May 27, 2015 at 12:30 PM, NGie Cooper wrote: > On Wed, May 27, 2015 at 12:09 PM, John Baldwin wrote: >> On Wednesday, May 27, 2015 05:44:12 PM Eric Joyner wrote: >>> Author: erj >>> Date: Wed May 27 17:44:11 2015 >>> New Revision: 283620 >>> URL: https://svnweb.freebsd.org/changeset/base/283620 >>> >>> Log: >>> MFC ixgbe commits for 10.2: >>> >>> - r280182 - Split the driver into independent pf/vf loadables >>> - r280197 - Resolve build issues >>> - r280204 - Fix multiple same-name devclasses >>> - r280228 - Fix i386 LINT build issues / remove unused variable >>> - r280252 - Fix building ixgbe with gcc >>> - r280962 - Make changes to busdma code similar to r257541 >>> - r281772 & r281773 - Remove unused variable >>> - partial r282280 - stats counter update (ix-only) >>> - r282289 - Add X550 support >>> - r282290 - Add X550 makefile updates >>> - r282293 - Add ixgbe_x550.c to conf/files >>> - r282299 - Fix gcc compile (extraneous extern declaration) >>> >>> Finally, add ix_txrx.c to conf/files because it's required for compile in stable/10. >>> >>> Approved by: jfv (mentor) >> >> It would be better to not break existing kernel configs for 10. You could >> hack the lines in sys/conf/files to allow either 'device ix' or 'device ixgbe' >> to work by using 'optional ixgbe ix', etc. You wouldn't need to document it >> in NOTES and you could leave your existing changes in GENERIC, but this would >> avoid surprises for folks who were using custom kernel configs. >> >> Similarly, you probably want to allow 'kldload ixgbe' or 'ixgbe_load="YES"' >> in loader.conf to still work. You can try just installing an 'ixgbe.ko' >> symlink via the module's Makefile, though I'm not sure that will work >> correctly for the loader.conf case. If it doesn't, then the other route is >> to create a stub ixgbe.c file that MODULE_DEPEND()'s on the ix and ixv driver >> modules so that it autoloads if_ix.ko and if_ixv.ko as dependencies when it >> is loaded. > > +100 This change also makes things slightly annoying if you used `MODULES_OVERRIDE+=ixgbe` previously in src.conf or $KERNCONF stable/9 and stable/10. I'll see if I can implement a backwards compatibility shim for stable/9 and stable/10 at least, because I've been bitten by this once today with a dumbed down kernel config.. Thanks, -NGie