diff options
author | Waldemar Brodkorb <wbrodkorb@conet.de> | 2014-12-07 05:00:48 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbrodkorb@conet.de> | 2014-12-07 05:00:48 +0100 |
commit | 444d0ea061cabd9851ba0e144a94a10271ca6c79 (patch) | |
tree | 515486402bd57f764af8fc97a86b59e94634bb2d /target/linux | |
parent | 36d63c60dbe2d074dff81a6af7dd77b62b5f23dc (diff) | |
parent | 4c9ab0d218fbf8f29ce4250f2b9941e6feae0651 (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target/linux')
-rw-r--r-- | target/linux/patches/3.16.6/disable-netfilter.patch | 160 | ||||
-rw-r--r-- | target/linux/patches/3.16.6/sparc-memset.patch | 50 | ||||
-rw-r--r-- | target/linux/patches/3.17.4/bsd-compatibility.patch (renamed from target/linux/patches/3.16.6/bsd-compatibility.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.17.4/cleankernel.patch (renamed from target/linux/patches/3.16.6/cleankernel.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.17.4/cris-header.patch (renamed from target/linux/patches/3.16.6/cris-header.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.17.4/defaults.patch (renamed from target/linux/patches/3.16.6/defaults.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.17.4/export-symbol-for-exmap.patch (renamed from target/linux/patches/3.16.6/export-symbol-for-exmap.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.17.4/gemalto.patch (renamed from target/linux/patches/3.16.6/gemalto.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.17.4/initramfs-nosizelimit.patch (renamed from target/linux/patches/3.16.6/initramfs-nosizelimit.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.17.4/lemote-rfkill.patch (renamed from target/linux/patches/3.16.6/lemote-rfkill.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.17.4/microblaze-axi.patch (renamed from target/linux/patches/3.16.6/microblaze-axi.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.17.4/microblaze-ethernet.patch (renamed from target/linux/patches/3.16.6/microblaze-ethernet.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.17.4/mkpiggy.patch (renamed from target/linux/patches/3.16.6/mkpiggy.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.17.4/mtd-rootfs.patch (renamed from target/linux/patches/3.16.6/mtd-rootfs.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.17.4/nfsv3-tcp.patch (renamed from target/linux/patches/3.16.6/nfsv3-tcp.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.17.4/non-static.patch (renamed from target/linux/patches/3.16.6/non-static.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.17.4/patch-fblogo (renamed from target/linux/patches/3.16.6/patch-fblogo) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.17.4/patch-yaffs2 (renamed from target/linux/patches/3.16.6/patch-yaffs2) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.17.4/ppc64-missing-zlib.patch (renamed from target/linux/patches/3.16.6/ppc64-missing-zlib.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.17.4/regmap-boolean.patch (renamed from target/linux/patches/3.16.6/regmap-boolean.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.17.4/relocs.patch (renamed from target/linux/patches/3.16.6/relocs.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.17.4/sgidefs.patch (renamed from target/linux/patches/3.16.6/sgidefs.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.17.4/sortext.patch (renamed from target/linux/patches/3.16.6/sortext.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.17.4/startup.patch (renamed from target/linux/patches/3.16.6/startup.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.17.4/wlan-cf.patch (renamed from target/linux/patches/3.16.6/wlan-cf.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.17.4/xargs.patch (renamed from target/linux/patches/3.16.6/xargs.patch) | 0 |
26 files changed, 0 insertions, 210 deletions
diff --git a/target/linux/patches/3.16.6/disable-netfilter.patch b/target/linux/patches/3.16.6/disable-netfilter.patch deleted file mode 100644 index 7b1ca013a..000000000 --- a/target/linux/patches/3.16.6/disable-netfilter.patch +++ /dev/null @@ -1,160 +0,0 @@ -diff -Nur linux-3.7.3.orig/net/Kconfig linux-3.7.3/net/Kconfig ---- linux-3.7.3.orig/net/Kconfig 2013-01-17 17:47:40.000000000 +0100 -+++ linux-3.7.3/net/Kconfig 2013-01-19 18:19:55.000000000 +0100 -@@ -163,7 +163,7 @@ - config NETFILTER_ADVANCED - bool "Advanced netfilter configuration" - depends on NETFILTER -- default y -+ default n - help - If you say Y here you can select between all the netfilter modules. - If you say N the more unusual ones will not be shown and the -@@ -175,7 +175,7 @@ - bool "Bridged IP/ARP packets filtering" - depends on BRIDGE && NETFILTER && INET - depends on NETFILTER_ADVANCED -- default y -+ default n - ---help--- - Enabling this option will let arptables resp. iptables see bridged - ARP resp. IP traffic. If you want a bridging firewall, you probably -diff -Nur linux-3.7.3.orig/net/netfilter/Kconfig linux-3.7.3/net/netfilter/Kconfig ---- linux-3.7.3.orig/net/netfilter/Kconfig 2013-01-17 17:47:40.000000000 +0100 -+++ linux-3.7.3/net/netfilter/Kconfig 2013-01-19 18:21:41.000000000 +0100 -@@ -22,7 +22,6 @@ - - config NETFILTER_NETLINK_LOG - tristate "Netfilter LOG over NFNETLINK interface" -- default m if NETFILTER_ADVANCED=n - select NETFILTER_NETLINK - help - If this option is enabled, the kernel will include support -@@ -34,7 +33,6 @@ - - config NF_CONNTRACK - tristate "Netfilter connection tracking support" -- default m if NETFILTER_ADVANCED=n - help - Connection tracking keeps a record of what packets have passed - through your machine, in order to figure out how they are related -@@ -60,7 +58,6 @@ - config NF_CONNTRACK_SECMARK - bool 'Connection tracking security mark support' - depends on NETWORK_SECMARK -- default m if NETFILTER_ADVANCED=n - help - This option enables security markings to be applied to - connections. Typically they are copied to connections from -@@ -177,7 +174,6 @@ - - config NF_CONNTRACK_FTP - tristate "FTP protocol support" -- default m if NETFILTER_ADVANCED=n - help - Tracking FTP connections is problematic: special helpers are - required for tracking them, and doing masquerading and other forms -@@ -211,7 +207,6 @@ - - config NF_CONNTRACK_IRC - tristate "IRC protocol support" -- default m if NETFILTER_ADVANCED=n - help - There is a commonly-used extension to IRC called - Direct Client-to-Client Protocol (DCC). This enables users to send -@@ -296,7 +291,6 @@ - - config NF_CONNTRACK_SIP - tristate "SIP protocol support" -- default m if NETFILTER_ADVANCED=n - help - SIP is an application-layer control protocol that can establish, - modify, and terminate multimedia sessions (conferences) such as -@@ -320,7 +314,6 @@ - config NF_CT_NETLINK - tristate 'Connection tracking netlink interface' - select NETFILTER_NETLINK -- default m if NETFILTER_ADVANCED=n - help - This option enables support for a netlink-based userspace interface - -@@ -424,7 +417,6 @@ - - config NETFILTER_XTABLES - tristate "Netfilter Xtables support (required for ip_tables)" -- default m if NETFILTER_ADVANCED=n - help - This is required if you intend to use any of ip_tables, - ip6_tables or arp_tables. -@@ -435,7 +427,6 @@ - - config NETFILTER_XT_MARK - tristate 'nfmark target and match support' -- default m if NETFILTER_ADVANCED=n - ---help--- - This option adds the "MARK" target and "mark" match. - -@@ -527,7 +518,6 @@ - config NETFILTER_XT_TARGET_CONNSECMARK - tristate '"CONNSECMARK" target support' - depends on NF_CONNTRACK && NF_CONNTRACK_SECMARK -- default m if NETFILTER_ADVANCED=n - help - The CONNSECMARK target copies security markings from packets - to connections, and restores security markings from connections -@@ -632,7 +622,6 @@ - - config NETFILTER_XT_TARGET_LOG - tristate "LOG target support" -- default m if NETFILTER_ADVANCED=n - help - This option adds a `LOG' target, which allows you to create rules in - any iptables table which records the packet header to the syslog. -@@ -660,7 +649,6 @@ - - config NETFILTER_XT_TARGET_NFLOG - tristate '"NFLOG" target support' -- default m if NETFILTER_ADVANCED=n - select NETFILTER_NETLINK_LOG - help - This option enables the NFLOG target, which allows to LOG -@@ -741,7 +729,6 @@ - config NETFILTER_XT_TARGET_SECMARK - tristate '"SECMARK" target support' - depends on NETWORK_SECMARK -- default m if NETFILTER_ADVANCED=n - help - The SECMARK target allows security marking of network - packets, for use with security subsystems. -@@ -751,7 +738,6 @@ - config NETFILTER_XT_TARGET_TCPMSS - tristate '"TCPMSS" target support' - depends on (IPV6 || IPV6=n) -- default m if NETFILTER_ADVANCED=n - ---help--- - This option adds a `TCPMSS' target, which allows you to alter the - MSS value of TCP SYN packets, to control the maximum size for that -@@ -856,7 +842,6 @@ - config NETFILTER_XT_MATCH_CONNTRACK - tristate '"conntrack" connection tracking match support' - depends on NF_CONNTRACK -- default m if NETFILTER_ADVANCED=n - help - This is a general conntrack match module, a superset of the state match. - -@@ -1063,7 +1048,6 @@ - config NETFILTER_XT_MATCH_POLICY - tristate 'IPsec "policy" match support' - depends on XFRM -- default m if NETFILTER_ADVANCED=n - help - Policy matching allows you to match packets based on the - IPsec policy that was used during decapsulation/will -@@ -1170,7 +1154,6 @@ - config NETFILTER_XT_MATCH_STATE - tristate '"state" match support' - depends on NF_CONNTRACK -- default m if NETFILTER_ADVANCED=n - help - Connection state matching allows you to match packets based on their - relationship to a tracked connection (ie. previous packets). This diff --git a/target/linux/patches/3.16.6/sparc-memset.patch b/target/linux/patches/3.16.6/sparc-memset.patch deleted file mode 100644 index 022c87b3a..000000000 --- a/target/linux/patches/3.16.6/sparc-memset.patch +++ /dev/null @@ -1,50 +0,0 @@ -This makes memset follow the standard (instead of returning 0 on success). This -is needed when certain versions of gcc optimizes around memset calls and assume -that the address argument is preserved in %o0. - -Signed-off-by: Andreas Larsson <andreas@gaisler.com> - -diff -Nur linux-3.16.2.orig/arch/sparc/lib/memset.S linux-3.16.2/arch/sparc/lib/memset.S ---- linux-3.16.2.orig/arch/sparc/lib/memset.S 2014-09-06 01:37:11.000000000 +0200 -+++ linux-3.16.2/arch/sparc/lib/memset.S 2014-09-18 09:53:49.563047773 +0200 -@@ -65,6 +65,8 @@ - .globl __memset_start, __memset_end - __memset_start: - memset: -+ mov %o0, %g1 -+ mov 1, %g4 - and %o1, 0xff, %g3 - sll %g3, 8, %g2 - or %g3, %g2, %g3 -@@ -89,6 +91,7 @@ - sub %o0, %o2, %o0 - - __bzero: -+ clr %g4 - mov %g0, %g3 - 1: - cmp %o1, 7 -@@ -151,8 +154,8 @@ - bne,a 8f - EX(stb %g3, [%o0], and %o1, 1) - 8: -- retl -- clr %o0 -+ b 0f -+ nop - 7: - be 13b - orcc %o1, 0, %g0 -@@ -164,6 +167,12 @@ - bne 8b - EX(stb %g3, [%o0 - 1], add %o1, 1) - 0: -+ andcc %g4, 1, %g0 -+ be 5f -+ nop -+ retl -+ mov %g1, %o0 -+5: - retl - clr %o0 - __memset_end: diff --git a/target/linux/patches/3.16.6/bsd-compatibility.patch b/target/linux/patches/3.17.4/bsd-compatibility.patch index b954b658f..b954b658f 100644 --- a/target/linux/patches/3.16.6/bsd-compatibility.patch +++ b/target/linux/patches/3.17.4/bsd-compatibility.patch diff --git a/target/linux/patches/3.16.6/cleankernel.patch b/target/linux/patches/3.17.4/cleankernel.patch index d8c055dc3..d8c055dc3 100644 --- a/target/linux/patches/3.16.6/cleankernel.patch +++ b/target/linux/patches/3.17.4/cleankernel.patch diff --git a/target/linux/patches/3.16.6/cris-header.patch b/target/linux/patches/3.17.4/cris-header.patch index 3db07e530..3db07e530 100644 --- a/target/linux/patches/3.16.6/cris-header.patch +++ b/target/linux/patches/3.17.4/cris-header.patch diff --git a/target/linux/patches/3.16.6/defaults.patch b/target/linux/patches/3.17.4/defaults.patch index 6cdca084e..6cdca084e 100644 --- a/target/linux/patches/3.16.6/defaults.patch +++ b/target/linux/patches/3.17.4/defaults.patch diff --git a/target/linux/patches/3.16.6/export-symbol-for-exmap.patch b/target/linux/patches/3.17.4/export-symbol-for-exmap.patch index 4f0fc8449..4f0fc8449 100644 --- a/target/linux/patches/3.16.6/export-symbol-for-exmap.patch +++ b/target/linux/patches/3.17.4/export-symbol-for-exmap.patch diff --git a/target/linux/patches/3.16.6/gemalto.patch b/target/linux/patches/3.17.4/gemalto.patch index 65f7af1d7..65f7af1d7 100644 --- a/target/linux/patches/3.16.6/gemalto.patch +++ b/target/linux/patches/3.17.4/gemalto.patch diff --git a/target/linux/patches/3.16.6/initramfs-nosizelimit.patch b/target/linux/patches/3.17.4/initramfs-nosizelimit.patch index 40d2f6bd8..40d2f6bd8 100644 --- a/target/linux/patches/3.16.6/initramfs-nosizelimit.patch +++ b/target/linux/patches/3.17.4/initramfs-nosizelimit.patch diff --git a/target/linux/patches/3.16.6/lemote-rfkill.patch b/target/linux/patches/3.17.4/lemote-rfkill.patch index a61488434..a61488434 100644 --- a/target/linux/patches/3.16.6/lemote-rfkill.patch +++ b/target/linux/patches/3.17.4/lemote-rfkill.patch diff --git a/target/linux/patches/3.16.6/microblaze-axi.patch b/target/linux/patches/3.17.4/microblaze-axi.patch index 1a4b17d8c..1a4b17d8c 100644 --- a/target/linux/patches/3.16.6/microblaze-axi.patch +++ b/target/linux/patches/3.17.4/microblaze-axi.patch diff --git a/target/linux/patches/3.16.6/microblaze-ethernet.patch b/target/linux/patches/3.17.4/microblaze-ethernet.patch index 742ab477e..742ab477e 100644 --- a/target/linux/patches/3.16.6/microblaze-ethernet.patch +++ b/target/linux/patches/3.17.4/microblaze-ethernet.patch diff --git a/target/linux/patches/3.16.6/mkpiggy.patch b/target/linux/patches/3.17.4/mkpiggy.patch index 751678b74..751678b74 100644 --- a/target/linux/patches/3.16.6/mkpiggy.patch +++ b/target/linux/patches/3.17.4/mkpiggy.patch diff --git a/target/linux/patches/3.16.6/mtd-rootfs.patch b/target/linux/patches/3.17.4/mtd-rootfs.patch index 775d5fc80..775d5fc80 100644 --- a/target/linux/patches/3.16.6/mtd-rootfs.patch +++ b/target/linux/patches/3.17.4/mtd-rootfs.patch diff --git a/target/linux/patches/3.16.6/nfsv3-tcp.patch b/target/linux/patches/3.17.4/nfsv3-tcp.patch index d5e07e1c2..d5e07e1c2 100644 --- a/target/linux/patches/3.16.6/nfsv3-tcp.patch +++ b/target/linux/patches/3.17.4/nfsv3-tcp.patch diff --git a/target/linux/patches/3.16.6/non-static.patch b/target/linux/patches/3.17.4/non-static.patch index a967703d0..a967703d0 100644 --- a/target/linux/patches/3.16.6/non-static.patch +++ b/target/linux/patches/3.17.4/non-static.patch diff --git a/target/linux/patches/3.16.6/patch-fblogo b/target/linux/patches/3.17.4/patch-fblogo index f1fad64c1..f1fad64c1 100644 --- a/target/linux/patches/3.16.6/patch-fblogo +++ b/target/linux/patches/3.17.4/patch-fblogo diff --git a/target/linux/patches/3.16.6/patch-yaffs2 b/target/linux/patches/3.17.4/patch-yaffs2 index bb244c7ca..bb244c7ca 100644 --- a/target/linux/patches/3.16.6/patch-yaffs2 +++ b/target/linux/patches/3.17.4/patch-yaffs2 diff --git a/target/linux/patches/3.16.6/ppc64-missing-zlib.patch b/target/linux/patches/3.17.4/ppc64-missing-zlib.patch index c6e0616be..c6e0616be 100644 --- a/target/linux/patches/3.16.6/ppc64-missing-zlib.patch +++ b/target/linux/patches/3.17.4/ppc64-missing-zlib.patch diff --git a/target/linux/patches/3.16.6/regmap-boolean.patch b/target/linux/patches/3.17.4/regmap-boolean.patch index b61c4792a..b61c4792a 100644 --- a/target/linux/patches/3.16.6/regmap-boolean.patch +++ b/target/linux/patches/3.17.4/regmap-boolean.patch diff --git a/target/linux/patches/3.16.6/relocs.patch b/target/linux/patches/3.17.4/relocs.patch index 69a7c88a9..69a7c88a9 100644 --- a/target/linux/patches/3.16.6/relocs.patch +++ b/target/linux/patches/3.17.4/relocs.patch diff --git a/target/linux/patches/3.16.6/sgidefs.patch b/target/linux/patches/3.17.4/sgidefs.patch index f00a284d9..f00a284d9 100644 --- a/target/linux/patches/3.16.6/sgidefs.patch +++ b/target/linux/patches/3.17.4/sgidefs.patch diff --git a/target/linux/patches/3.16.6/sortext.patch b/target/linux/patches/3.17.4/sortext.patch index 8fd4e1d6b..8fd4e1d6b 100644 --- a/target/linux/patches/3.16.6/sortext.patch +++ b/target/linux/patches/3.17.4/sortext.patch diff --git a/target/linux/patches/3.16.6/startup.patch b/target/linux/patches/3.17.4/startup.patch index d396b75e4..d396b75e4 100644 --- a/target/linux/patches/3.16.6/startup.patch +++ b/target/linux/patches/3.17.4/startup.patch diff --git a/target/linux/patches/3.16.6/wlan-cf.patch b/target/linux/patches/3.17.4/wlan-cf.patch index fc20759e2..fc20759e2 100644 --- a/target/linux/patches/3.16.6/wlan-cf.patch +++ b/target/linux/patches/3.17.4/wlan-cf.patch diff --git a/target/linux/patches/3.16.6/xargs.patch b/target/linux/patches/3.17.4/xargs.patch index 2c7b3df59..2c7b3df59 100644 --- a/target/linux/patches/3.16.6/xargs.patch +++ b/target/linux/patches/3.17.4/xargs.patch |