diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-05-24 07:53:18 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-05-24 07:53:18 +0200 |
| commit | 3d1f9b96026f06f1d6130a975ad9988c33dc3b0d (patch) | |
| tree | 2a785b0cc414418e76274b39ad21a5a64fc5ae9f /kernel.spec | |
| parent | a7a0c90031acf1cd1e7bd777bda70e1738c805c9 (diff) | |
| parent | cfaea7dc727cbea3f1150d2f8e9749a167519e32 (diff) | |
| download | kernel-3d1f9b96026f06f1d6130a975ad9988c33dc3b0d.tar.gz kernel-3d1f9b96026f06f1d6130a975ad9988c33dc3b0d.tar.xz kernel-3d1f9b96026f06f1d6130a975ad9988c33dc3b0d.zip | |
Merge remote-tracking branch 'origin/master'kernel-4.7.0-0.rc0.git6.1.vanilla.knurd.1.fc24kernel-4.7.0-0.rc0.git6.1.vanilla.knurd.1.fc23kernel-4.7.0-0.rc0.git6.1.vanilla.knurd.1.fc22
Diffstat (limited to 'kernel.spec')
| -rw-r--r-- | kernel.spec | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/kernel.spec b/kernel.spec index aa273c948..1739bf88b 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 5 +%define gitrev 6 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -520,7 +520,8 @@ Patch420: arm64-avoid-needing-console-to-enable-serial-console.patch Patch422: geekbox-v4-device-tree-support.patch # http://www.spinics.net/lists/arm-kernel/msg483898.html -Patch423: Initial-AllWinner-A64-and-PINE64-support.patch +# This has major conflicts and needs to be rebased +# Patch423: Initial-AllWinner-A64-and-PINE64-support.patch # http://www.spinics.net/lists/linux-tegra/msg26029.html Patch426: usb-phy-tegra-Add-38.4MHz-clock-table-entry.patch @@ -623,9 +624,6 @@ Patch641: disable-CONFIG_EXPERT-for-ZONE_DMA.patch #CVE-2016-3134 rhbz 1317383 1317384 Patch665: netfilter-x_tables-deal-with-bogus-nextoffset-values.patch -#CVE-2016-4482 rhbz 1332931 1332932 -Patch706: USB-usbfs-fix-potential-infoleak-in-devio.patch - #CVE-2016-4440 rhbz 1337806 1337807 Patch719: kvm-vmx-more-complete-state-update-on-APICv-on-off.patch @@ -2157,6 +2155,11 @@ fi # # %changelog +* Mon May 23 2016 Laura Abbott <labbott@redhat.com> - 4.7.0-0.rc0.git6.1 +- Linux v4.6-8907-g7639dad +- trace, f2fs, btrfs, rtc, mailbox, akpm, staging, driver core, char, usb, + tty, clk, net, devicetree, rdma, mfd, iio, powerpc, arm merges + * Fri May 20 2016 Laura Abbott <labbott@redhat.com> - 4.7.0-0.rc0.git5.1 - Linux v4.6-6148-g03b979d - Docs, i2c, md, iommu, sound, pci, pinctrl, dmaengine, kvm, security merges |