From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <git@ipfire.org>
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 3.x development tree branch, master, updated.
 0478b1e6e5445482dff6f55c822825117e8da640
Date: Mon, 07 Jan 2019 13:06:05 +0000
Message-ID: <20190107130605.BF4F384FDD4@people01.i.ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2495162592815628992=="
List-Id: <ipfire-scm.lists.ipfire.org>

--===============2495162592815628992==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".

The branch, master has been updated
       via  0478b1e6e5445482dff6f55c822825117e8da640 (commit)
       via  e7379adb942f53ca6ccbae65ebcdd7ef0045823a (commit)
      from  aeb87e9606c0db8ecb950d83264460d58d48800b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 0478b1e6e5445482dff6f55c822825117e8da640
Author: Peter M=C3=BCller <peter.mueller(a)link38.eu>
Date:   Sat Jan 5 11:30:40 2019 +0100

    tzdata: update to 2018i
   =20
    Signed-off-by: Peter M=C3=BCller <peter.mueller(a)ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit e7379adb942f53ca6ccbae65ebcdd7ef0045823a
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sun Jan 6 13:17:32 2019 +0000

    kernel: enable IWLWIFI module.
   =20
    IWLWIFI seems disabled by a mistake. Enable it.
   =20
    fixes #11867
   =20
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 kernel/config-generic | 14 +++++++++++++-
 kernel/kernel.nm      |  2 +-
 tzdata/tzdata.nm      |  8 ++++----
 3 files changed, 18 insertions(+), 6 deletions(-)

Difference in files:
diff --git a/kernel/config-generic b/kernel/config-generic
index 3c9d9bcc9..184cd4e47 100644
--- a/kernel/config-generic
+++ b/kernel/config-generic
@@ -2138,7 +2138,19 @@ CONFIG_IWL3945=3Dm
 # iwl3945 / iwl4965 Debugging Options
 #
 # CONFIG_IWLEGACY_DEBUG is not set
-# CONFIG_IWLWIFI is not set
+CONFIG_IWLWIFI=3Dm
+CONFIG_IWLWIFI_LEDS=3Dy
+CONFIG_IWLDVM=3Dm
+CONFIG_IWLMVM=3Dm
+CONFIG_IWLWIFI_OPMODE_MODULAR=3Dy
+# CONFIG_IWLWIFI_BCAST_FILTERING is not set
+# CONFIG_IWLWIFI_PCIE_RTPM is not set
+
+#
+# Debugging Options
+#
+# CONFIG_IWLWIFI_DEBUG is not set
+CONFIG_IWLWIFI_DEVICE_TRACING=3Dy
 CONFIG_WLAN_VENDOR_INTERSIL=3Dy
 CONFIG_HOSTAP=3Dm
 CONFIG_HOSTAP_FIRMWARE=3Dy
diff --git a/kernel/kernel.nm b/kernel/kernel.nm
index 2cf721044..4595e62ca 100644
--- a/kernel/kernel.nm
+++ b/kernel/kernel.nm
@@ -5,7 +5,7 @@
=20
 name       =3D kernel
 version    =3D 4.20
-release    =3D 11
+release    =3D 12
 thisapp    =3D linux-%{version}
=20
 maintainer =3D Arne Fitzenreiter <arne.fitzenreiter(a)ipfire.org>
diff --git a/tzdata/tzdata.nm b/tzdata/tzdata.nm
index d24bd2237..7238e8abb 100644
--- a/tzdata/tzdata.nm
+++ b/tzdata/tzdata.nm
@@ -3,8 +3,8 @@
 # Copyright (C) - IPFire Development Team <info(a)ipfire.org>               =
    #
 ############################################################################=
###
=20
-tzdata_version =3D 2018c
-tzcode_version =3D 2018c
+tzdata_version =3D 2018i
+tzcode_version =3D 2018i
=20
 name       =3D tzdata
 version    =3D %{tzdata_version}
@@ -12,7 +12,7 @@ release    =3D 1
 arch       =3D noarch
=20
 groups     =3D System/Base
-url        =3D http://www.iana.org/time-zones
+url        =3D https://www.iana.org/time-zones
 license    =3D Public Domain
 summary    =3D Timezone data.
=20
@@ -21,7 +21,7 @@ description
 	the world.
 end
=20
-source_dl +=3D http://www.iana.org/time-zones/repository/releases/
+source_dl +=3D https://www.iana.org/time-zones/repository/releases/
 sources    =3D tzdata%{tzdata_version}.tar.gz tzcode%{tzcode_version}.tar.gz
=20
 build


hooks/post-receive
--
IPFire 3.x development tree

--===============2495162592815628992==--