diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-08-04 07:44:53 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-08-04 07:44:53 +0200 |
commit | fdb006477def1c5781de44ebec621c44cd7ac9e3 (patch) | |
tree | 4657218121403cea8ff68ae7b042a76e48bebeb3 | |
parent | bfef79dfcbd183cd2722f4f424213f3d8f03ae1f (diff) | |
parent | 3fcce5f7f68eddb9dfb42b4a244896aa8638e388 (diff) | |
download | kernel-fdb006477def1c5781de44ebec621c44cd7ac9e3.tar.gz kernel-fdb006477def1c5781de44ebec621c44cd7ac9e3.tar.xz kernel-fdb006477def1c5781de44ebec621c44cd7ac9e3.zip |
Merge remote-tracking branch 'origin/master'kernel-4.13.0-0.rc3.git3.1.vanilla.knurd.1.fc26kernel-4.13.0-0.rc3.git3.1.vanilla.knurd.1.fc25
-rwxr-xr-x | filter-modules.sh | 2 | ||||
-rw-r--r-- | gitrev | 2 | ||||
-rw-r--r-- | kernel.spec | 8 | ||||
-rw-r--r-- | sources | 2 |
4 files changed, 10 insertions, 4 deletions
diff --git a/filter-modules.sh b/filter-modules.sh index 686f8ccf6..972372411 100755 --- a/filter-modules.sh +++ b/filter-modules.sh @@ -28,7 +28,7 @@ scsidrvs="aacraid aic7xxx aic94xx be2iscsi bfa bnx2i bnx2fc csiostor cxgbi esas2 usbdrvs="atm image misc serial wusbcore" -fsdrvs="affs befs coda cramfs dlm ecryptfs hfs hfsplus jfs minix ncpfs nilfs2 ocfs2 reiserfs romfs squashfs sysv ubifs udf ufs" +fsdrvs="affs befs coda cramfs dlm ecryptfs hfs hfsplus jfs minix ncpfs nilfs2 ocfs2 reiserfs romfs squashfs sysv ubifs ufs" netprots="6lowpan appletalk atm ax25 batman-adv bluetooth can dccp dsa ieee802154 irda l2tp mac80211 mac802154 mpls netrom nfc rds rfkill rose sctp wireless" @@ -1 +1 @@ -26c5cebfdb6ca799186f1e56be7d6f2480c5012c +19ec50a438c2ea3e370f6d453bf2f2e6e45ef72b diff --git a/kernel.spec b/kernel.spec index 3d6011276..f959981b0 100644 --- a/kernel.spec +++ b/kernel.spec @@ -77,7 +77,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 3 # The git snapshot level -%define gitrev 2 +%define gitrev 3 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -2216,6 +2216,12 @@ fi # # %changelog +* Thu Aug 03 2017 Laura Abbott <labbott@redhat.com> +- Keep UDF in the main kernel package (rhbz 1471314) + +* Thu Aug 03 2017 Laura Abbott <labbott@fedoraproject.org> - 4.13.0-0.rc3.git3.1 +- Linux v4.13-rc3-118-g19ec50a438c2 + * Wed Aug 02 2017 Laura Abbott <labbott@fedoraproject.org> - 4.13.0-0.rc3.git2.1 - Linux v4.13-rc3-102-g26c5cebfdb6c @@ -1,4 +1,4 @@ SHA512 (perf-man-4.12.tar.gz) = 4d3bbda1f520dba0007c351af46f45085fe4842074eb2e01aee736fd369df595f8f72ed6c1192715f1120bf3353279777f9dca1178fe93bffe5be2de700d409c SHA512 (linux-4.12.tar.xz) = 8e81b41b253e63233e92948941f44c6482acb52aa3a3fd172f03a38a86f2c35b2ad4fd407acd1bc3964673eba344fe104d3a03e3ff4bf9cd1f22bd44263bd728 SHA512 (patch-4.13-rc3.xz) = ac0e314aaf166ea27cc1dac23b00f816983f1b0d97d1cd72f86544ac1f2d01f6583c14eab88076bec619a49df94f27cb2b4ec054ff5f5bddbead6ce05c42d17d -SHA512 (patch-4.13-rc3-git2.xz) = 8e8bbd82d3cb29c0ce6dd240fb1709882e48042ac6a5506f76c6407edfda2fd7c81265b67d3adff42c576f9d2fa864f35939686ae240a1e7b779375506d2fe0e +SHA512 (patch-4.13-rc3-git3.xz) = 9fc821dd57c730b8739f14603aeecb3bd21c1b1b1002d1d531b1967dbc79a5d341041b76b293483bf3cd22f0310d87756fdbbf0b2d125a9912038dee262f38d5 |