summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2016-05-20 07:21:56 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2016-05-20 07:21:56 +0200
commit89f8c3ffa504e07b9ce529acf90c4bfd22a440a4 (patch)
tree7f0ff4c0d7320deaf3d9f6c9b31e1871a7fee46f /kernel.spec
parent02b716391553f41a42053d8c26aa54050f261d83 (diff)
parent39bfc7e6a160dcc72813b7996b41682b5e680393 (diff)
downloadkernel-89f8c3ffa504e07b9ce529acf90c4bfd22a440a4.tar.gz
kernel-89f8c3ffa504e07b9ce529acf90c4bfd22a440a4.tar.xz
kernel-89f8c3ffa504e07b9ce529acf90c4bfd22a440a4.zip
Merge remote-tracking branch 'origin/master'kernel-4.7.0-0.rc0.git4.1.vanilla.knurd.1.fc24
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec9
1 files changed, 5 insertions, 4 deletions
diff --git a/kernel.spec b/kernel.spec
index 98f655f14..0e508fdb5 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -77,7 +77,7 @@ Summary: The Linux kernel
# The rc snapshot level
%define rcrev 0
# The git snapshot level
-%define gitrev 3
+%define gitrev 4
# Set rpm version accordingly
%define rpmversion 4.%{upstream_sublevel}.0
%endif
@@ -528,9 +528,6 @@ Patch426: usb-phy-tegra-Add-38.4MHz-clock-table-entry.patch
# http://patchwork.ozlabs.org/patch/587554/
Patch430: ARM-tegra-usb-no-reset.patch
-# http://www.spinics.net/lists/linux-tegra/msg25152.html
-Patch431: Fix-tegra-to-use-stdout-path-for-serial-console.patch
-
Patch432: arm-i.MX6-Utilite-device-dtb.patch
# mvebu DSA switch fixes
@@ -2162,6 +2159,10 @@ fi
#
#
%changelog
+* Thu May 19 2016 Laura Abbott <labbott@redhat.com> - 4.7.0-0.rc0.git4.1
+- Linux v4.6-5028-g2600a46
+- trace, audit, input, media, scsi, armsoc merges
+
* Wed May 18 2016 Laura Abbott <labbott@redhat.com> - 4.7.0-0.rc0.git3.1
- Linux v4.6-3623-g0b7962a
- ata, regulator, gpio, HID, livepatching, networking, dm, block, vfs, fs,