- 3.18.48 [EOL]

diff --git a/kernel-imq.patch b/kernel-imq.patch
index a51430bb2aefb8fef99ceaf9d5398196286dd348..3516f103291af0bd9dbae463bac71bcdd4323717 100644 (file)
--- a/kernel-imq.patch
+++ b/kernel-imq.patch
@@ -1403,9 +1403,9 @@ index c28c7fe..a5f1888 100644
 --- a/net/core/skbuff.c
 +++ b/net/core/skbuff.c
 @@ -73,6 +73,84 @@
- 
- struct kmem_cache *skbuff_head_cache __read_mostly;
  static struct kmem_cache *skbuff_fclone_cache __read_mostly;
+ int sysctl_max_skb_frags __read_mostly = MAX_SKB_FRAGS;
+ EXPORT_SYMBOL(sysctl_max_skb_frags);
 +#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
 +static struct kmem_cache *skbuff_cb_store_cache __read_mostly;
 +

diff --git a/kernel-small_fixes.patch b/kernel-small_fixes.patch
index a5580ddff3043a21a1f5b5e252e6ab73497ebf03..c57403daafb9bc476dfb93ec7c45709c30f73e8d 100644 (file)
--- a/kernel-small_fixes.patch
+++ b/kernel-small_fixes.patch
@@ -38,30 +38,6 @@
  # use the deterministic mode of AR if available
  KBUILD_ARFLAGS := $(call ar-option,D)
  
---- a/crypto/algif_hash.c      2016-11-13 12:56:59.904864440 +0100
-+++ b/crypto/algif_hash.c      2016-11-13 11:32:37.810493530 +0100
-@@ -283,8 +283,8 @@
-       return err;
- }
- 
--static int hash_sendmsg_nokey(struct socket *sock, struct msghdr *msg,
--                            size_t size)
-+static int hash_sendmsg_nokey(struct kiocb *unused, struct socket *sock,
-+                      struct msghdr *msg, size_t size)
- {
-       int err;
- 
-@@ -307,8 +307,8 @@
-       return hash_sendpage(sock, page, offset, size, flags);
- }
- 
--static int hash_recvmsg_nokey(struct socket *sock, struct msghdr *msg,
--                            size_t ignored, int flags)
-+static int hash_recvmsg_nokey(struct kiocb *unused, struct socket *sock,
-+                            struct msghdr *msg, size_t ignored, int flags)
- {
-       int err;
- 
 --- a/include/linux/mod_devicetable.h  2014-12-07 23:21:05.000000000 +0100
 +++ b/include/linux/mod_devicetable.h  2016-05-17 19:13:57.872493187 +0200
 @@ -398,6 +398,7 @@ struct virtio_device_id {

diff --git a/kernel.spec b/kernel.spec
index 95580f00ac2b60370de05921354a44b61a138670..b248aad0f9c36024472a3afbbb1b72030fba3a60 100644 (file)
--- a/kernel.spec
+++ b/kernel.spec
@@ -70,9 +70,9 @@
 %define                have_pcmcia     0
 %endif
 
-%define                rel             2
+%define                rel             1
 %define                basever         3.18
-%define                postver         .47
+%define                postver         .48
 
 # define this to '-%{basever}' for longterm branch
 %define                versuffix       -%{basever}
@@ -121,7 +121,7 @@ Source0:    http://www.kernel.org/pub/linux/kernel/v3.x/linux-%{basever}.tar.xz
 # Source0-md5: 9e854df51ca3fef8bfe566dbd7b89241
 %if "%{postver}" != ".0"
 Patch0:                http://www.kernel.org/pub/linux/kernel/v3.x/patch-%{version}.xz
-# Patch0-md5:  55938cf52059083b0c060384974e5235
+# Patch0-md5:  a69580d890a748c36f392a04b743518f
 %endif
 Source1:       kernel.sysconfig