diff options
| author | Silvino Silva <silvino@bk.ru> | 2018-04-06 17:43:58 +0100 |
|---|---|---|
| committer | Silvino Silva <silvino@bk.ru> | 2018-04-06 17:43:58 +0100 |
| commit | 6ee060f04bdd91b66b8dfaa21f29758ae450348f (patch) | |
| tree | 0ce231727fdbe28bc1ed64546be93f1ee988d7b6 /core/ports/linux-libre/port-libre-grsecurity.patch | |
| parent | 746c2f76a305d4251f58f3327f8147f60a1be38f (diff) | |
| parent | 152177eeca633a26a1228cfded025b5a7d861c66 (diff) | |
| download | doc-6ee060f04bdd91b66b8dfaa21f29758ae450348f.tar.gz | |
Merge branch 'r-0.3.3' into develop
Diffstat (limited to 'core/ports/linux-libre/port-libre-grsecurity.patch')
| -rw-r--r-- | core/ports/linux-libre/port-libre-grsecurity.patch | 76 |
1 files changed, 0 insertions, 76 deletions
diff --git a/core/ports/linux-libre/port-libre-grsecurity.patch b/core/ports/linux-libre/port-libre-grsecurity.patch deleted file mode 100644 index 981257a..0000000 --- a/core/ports/linux-libre/port-libre-grsecurity.patch +++ /dev/null @@ -1,76 +0,0 @@ ---- grsecurity-3.1-4.9.12-201702231830.patch 2017-02-18 05:14:08.682388834 +0000 -+++ grsecurity-3.1-4.9.12-201702231830.patch 2017-02-18 05:15:45.579051680 +0000 -@@ -90805,59 +90805,6 @@ - if (!file->private_data) - return -ENOMEM; - return 0; --diff --git a/firmware/Makefile b/firmware/Makefile --index e297e1b..aeb0982 100644 ----- a/firmware/Makefile --+++ b/firmware/Makefile --@@ -35,9 +35,11 @@ fw-shipped-$(CONFIG_BNX2X) += bnx2x/bnx2x-e1-6.2.9.0.fw \ -- bnx2x/bnx2x-e1h-6.2.9.0.fw \ -- bnx2x/bnx2x-e2-6.2.9.0.fw -- fw-shipped-$(CONFIG_BNX2) += bnx2/bnx2-mips-09-6.2.1a.fw \ --+ bnx2/bnx2-mips-09-6.2.1b.fw \ -- bnx2/bnx2-rv2p-09-6.0.17.fw \ -- bnx2/bnx2-rv2p-09ax-6.0.17.fw \ -- bnx2/bnx2-mips-06-6.2.1.fw \ --+ bnx2/bnx2-mips-06-6.2.3.fw \ -- bnx2/bnx2-rv2p-06-6.0.15.fw -- fw-shipped-$(CONFIG_CASSINI) += sun/cassini.bin -- fw-shipped-$(CONFIG_CHELSIO_T3) += cxgb3/t3b_psram-1.1.0.bin \ --diff --git a/firmware/WHENCE b/firmware/WHENCE --index de6f22e..51fbae7 100644 ----- a/firmware/WHENCE --+++ b/firmware/WHENCE --@@ -653,21 +653,23 @@ Found in hex form in kernel source. -- Driver: BNX2 - Broadcom NetXtremeII -- -- File: bnx2/bnx2-mips-06-6.2.1.fw --+File: bnx2/bnx2-mips-06-6.2.3.fw -- File: bnx2/bnx2-rv2p-06-6.0.15.fw -- File: bnx2/bnx2-mips-09-6.2.1a.fw --+File: bnx2/bnx2-mips-09-6.2.1b.fw -- File: bnx2/bnx2-rv2p-09-6.0.17.fw -- File: bnx2/bnx2-rv2p-09ax-6.0.17.fw -- -- Licence: --- --- This file contains firmware data derived from proprietary unpublished --- source code, Copyright (c) 2004 - 2010 Broadcom Corporation. --- --- Permission is hereby granted for the distribution of this firmware data --- in hexadecimal or equivalent format, provided this copyright notice is --- accompanying it. --- ---Found in hex form in kernel source. --+ --+ This file contains firmware data derived from proprietary unpublished --+ source code, Copyright (c) 2004 - 2010 Broadcom Corporation. --+ --+ Permission is hereby granted for the distribution of this firmware data --+ in hexadecimal or equivalent format, provided this copyright notice is --+ accompanying it. --+ --+Found in hex form in kernel source. -- -- -------------------------------------------------------------------------- -- - diff --git a/firmware/bnx2/bnx2-mips-06-6.2.3.fw.ihex b/firmware/bnx2/bnx2-mips-06-6.2.3.fw.ihex - new file mode 100644 - index 0000000..da72bf1 -@@ -156547,13 +156494,6 @@ - break; - } - --diff --git a/localversion-grsec b/localversion-grsec --new file mode 100644 --index 0000000..7cd6065 ----- /dev/null --+++ b/localversion-grsec --@@ -0,0 +1 @@ --+-grsec - diff --git a/mm/Kconfig b/mm/Kconfig - index 86e3e0e..ab679cf 100644 - --- a/mm/Kconfig |