From: Lucas De Marchi <lucas.demarchi@profusion.mobi>
Date: Mon, 19 Mar 2012 11:23:14 +0000 (-0300)
Subject: kmod 7
X-Git-Tag: v7^0
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8885ced062131214448fae056ef453f094303805;p=thirdparty%2Fkmod.git

kmod 7
---

diff --git a/Makefile.am b/Makefile.am
index 68d2bd1f..0a0ad2a3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -34,7 +34,7 @@ SED_PROCESS = \
 	$(SED_PROCESS)
 
 LIBKMOD_CURRENT=3
-LIBKMOD_REVISION=0
+LIBKMOD_REVISION=1
 LIBKMOD_AGE=1
 
 noinst_LTLIBRARIES = libkmod/libkmod-util.la
diff --git a/NEWS b/NEWS
index 809cfaf9..d7e7cb57 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,24 @@
+kmod 7
+======
+
+- Re-order dirs for configuration files to match the change in systemd and
+  udev: now the priority is:
+	1. /etc/modprobe.d
+	2. /run/modprobe.d
+	3. /lib/modprobe.d
+
+- Fix setting CFLAGS/LDFLAGS in build system. This prevents us from not
+  allowing user to set his preference
+
+- Bug fixes:
+	- Return same error codes of module-init-tools when removing modules
+	  with modprobe
+	- Fix builtin output in "--show-depends" when target kernel is not the
+	  same of the running kernel
+	- 'modprobe -r' always look at all command line arguments
+	- Fix '-q' usage in modprobe
+	-
+
 kmod 6
 ======
 
diff --git a/configure.ac b/configure.ac
index 21d7f228..ad1c28f9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 AC_PREREQ(2.60)
 AC_INIT([kmod],
-	[6],
+	[7],
 	[linux-modules@vger.kernel.org],
 	[kmod],
 	[http://git.kernel.org/?p=utils/kernel/kmod/kmod.git])