aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
Diffstat (limited to 'target')
-rw-r--r--target/linux/generic/config-3.81
-rw-r--r--target/linux/generic/patches-3.8/100-overlayfs.patch2
-rw-r--r--target/linux/generic/patches-3.8/102-ehci_hcd_ignore_oc.patch2
-rw-r--r--target/linux/generic/patches-3.8/630-packet_socket_type.patch6
-rw-r--r--target/linux/generic/patches-3.8/643-bridge_remove_ipv6_dependency.patch4
-rw-r--r--target/linux/generic/patches-3.8/644-bridge_optimize_netfilter_hooks.patch2
-rw-r--r--target/linux/generic/patches-3.8/811-pci_disable_usb_common_quirks.patch2
-rw-r--r--target/linux/generic/patches-3.8/820-usb_add_usb_find_device_by_name.patch2
-rw-r--r--target/linux/mvebu/Makefile2
9 files changed, 12 insertions, 11 deletions
diff --git a/target/linux/generic/config-3.8 b/target/linux/generic/config-3.8
index e63eb9b6e1..32efefd96f 100644
--- a/target/linux/generic/config-3.8
+++ b/target/linux/generic/config-3.8
@@ -2299,6 +2299,7 @@ CONFIG_PCI_SYSCALL=y
# CONFIG_PID_IN_CONTEXTIDR is not set
# CONFIG_PID_NS is not set
# CONFIG_PINCTRL is not set
+# CONFIG_PINCTRL_EXYNOS is not set
# CONFIG_PINCTRL_EXYNOS5440 is not set
# CONFIG_PLAT_SPEAR is not set
# CONFIG_PLIP is not set
diff --git a/target/linux/generic/patches-3.8/100-overlayfs.patch b/target/linux/generic/patches-3.8/100-overlayfs.patch
index 04a058ff1f..5d481174c3 100644
--- a/target/linux/generic/patches-3.8/100-overlayfs.patch
+++ b/target/linux/generic/patches-3.8/100-overlayfs.patch
@@ -3175,7 +3175,7 @@
int flags, const char *name,
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -5667,6 +5667,13 @@ F: drivers/scsi/osd/
+@@ -5666,6 +5666,13 @@ F: drivers/scsi/osd/
F: include/scsi/osd_*
F: fs/exofs/
diff --git a/target/linux/generic/patches-3.8/102-ehci_hcd_ignore_oc.patch b/target/linux/generic/patches-3.8/102-ehci_hcd_ignore_oc.patch
index 63d1156364..92f897f9f2 100644
--- a/target/linux/generic/patches-3.8/102-ehci_hcd_ignore_oc.patch
+++ b/target/linux/generic/patches-3.8/102-ehci_hcd_ignore_oc.patch
@@ -40,7 +40,7 @@ Signed-off-by: Florian Fainelli <florian@openwrt.org>
mask = PORT_CSC | PORT_PEC | PORT_OCC;
else
mask = PORT_CSC | PORT_PEC;
-@@ -825,7 +825,7 @@ static int ehci_hub_control (
+@@ -829,7 +829,7 @@ static int ehci_hub_control (
if (temp & PORT_PEC)
status |= USB_PORT_STAT_C_ENABLE << 16;
diff --git a/target/linux/generic/patches-3.8/630-packet_socket_type.patch b/target/linux/generic/patches-3.8/630-packet_socket_type.patch
index 921c810f0e..0671a28e9b 100644
--- a/target/linux/generic/patches-3.8/630-packet_socket_type.patch
+++ b/target/linux/generic/patches-3.8/630-packet_socket_type.patch
@@ -83,7 +83,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
if (!net_eq(dev_net(dev), sock_net(sk)))
goto drop;
-@@ -2537,6 +2539,7 @@ static int packet_create(struct net *net
+@@ -2539,6 +2541,7 @@ static int packet_create(struct net *net
spin_lock_init(&po->bind_lock);
mutex_init(&po->pg_vec_lock);
po->prot_hook.func = packet_rcv;
@@ -91,7 +91,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
if (sock->type == SOCK_PACKET)
po->prot_hook.func = packet_rcv_spkt;
-@@ -3150,6 +3153,16 @@ packet_setsockopt(struct socket *sock, i
+@@ -3152,6 +3155,16 @@ packet_setsockopt(struct socket *sock, i
po->tp_tx_has_off = !!val;
return 0;
}
@@ -108,7 +108,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
default:
return -ENOPROTOOPT;
}
-@@ -3204,6 +3217,13 @@ static int packet_getsockopt(struct sock
+@@ -3206,6 +3219,13 @@ static int packet_getsockopt(struct sock
case PACKET_VNET_HDR:
val = po->has_vnet_hdr;
break;
diff --git a/target/linux/generic/patches-3.8/643-bridge_remove_ipv6_dependency.patch b/target/linux/generic/patches-3.8/643-bridge_remove_ipv6_dependency.patch
index b3746978d3..0a963342c9 100644
--- a/target/linux/generic/patches-3.8/643-bridge_remove_ipv6_dependency.patch
+++ b/target/linux/generic/patches-3.8/643-bridge_remove_ipv6_dependency.patch
@@ -49,7 +49,7 @@
int ipv6_get_lladdr(struct net_device *dev, struct in6_addr *addr,
unsigned char banned_flags)
-@@ -4946,6 +4945,9 @@ int __init addrconf_init(void)
+@@ -4947,6 +4946,9 @@ int __init addrconf_init(void)
ipv6_addr_label_rtnl_register();
@@ -59,7 +59,7 @@
return 0;
errout:
rtnl_af_unregister(&inet6_ops);
-@@ -4964,6 +4966,9 @@ void addrconf_cleanup(void)
+@@ -4965,6 +4967,9 @@ void addrconf_cleanup(void)
struct net_device *dev;
int i;
diff --git a/target/linux/generic/patches-3.8/644-bridge_optimize_netfilter_hooks.patch b/target/linux/generic/patches-3.8/644-bridge_optimize_netfilter_hooks.patch
index 4d8161eb1d..8eb8560a55 100644
--- a/target/linux/generic/patches-3.8/644-bridge_optimize_netfilter_hooks.patch
+++ b/target/linux/generic/patches-3.8/644-bridge_optimize_netfilter_hooks.patch
@@ -119,7 +119,7 @@
extern struct net_bridge_port *br_get_port(struct net_bridge *br,
--- a/net/bridge/br_stp_bpdu.c
+++ b/net/bridge/br_stp_bpdu.c
-@@ -52,7 +52,7 @@ static void br_send_bpdu(struct net_brid
+@@ -54,7 +54,7 @@ static void br_send_bpdu(struct net_brid
skb_reset_mac_header(skb);
diff --git a/target/linux/generic/patches-3.8/811-pci_disable_usb_common_quirks.patch b/target/linux/generic/patches-3.8/811-pci_disable_usb_common_quirks.patch
index a2e2239077..1486e0df46 100644
--- a/target/linux/generic/patches-3.8/811-pci_disable_usb_common_quirks.patch
+++ b/target/linux/generic/patches-3.8/811-pci_disable_usb_common_quirks.patch
@@ -39,7 +39,7 @@
static inline int io_type_enabled(struct pci_dev *pdev, unsigned int mask)
{
u16 cmd;
-@@ -973,3 +988,4 @@ static void quirk_usb_early_handoff(stru
+@@ -974,3 +989,4 @@ static void quirk_usb_early_handoff(stru
}
DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_ANY_ID, PCI_ANY_ID,
PCI_CLASS_SERIAL_USB, 8, quirk_usb_early_handoff);
diff --git a/target/linux/generic/patches-3.8/820-usb_add_usb_find_device_by_name.patch b/target/linux/generic/patches-3.8/820-usb_add_usb_find_device_by_name.patch
index 72b2237898..5ffd451a6d 100644
--- a/target/linux/generic/patches-3.8/820-usb_add_usb_find_device_by_name.patch
+++ b/target/linux/generic/patches-3.8/820-usb_add_usb_find_device_by_name.patch
@@ -74,7 +74,7 @@
* @dev: device the buffer will be used with
--- a/include/linux/usb.h
+++ b/include/linux/usb.h
-@@ -675,6 +675,7 @@ static inline bool usb_device_supports_l
+@@ -677,6 +677,7 @@ static inline bool usb_device_supports_l
return udev->bos->ss_cap->bmAttributes & USB_LTM_SUPPORT;
}
diff --git a/target/linux/mvebu/Makefile b/target/linux/mvebu/Makefile
index 3c22c8fc11..1c36ad79b4 100644
--- a/target/linux/mvebu/Makefile
+++ b/target/linux/mvebu/Makefile
@@ -13,7 +13,7 @@ FEATURES:=targz usb jffs2 pci pcie gpio
CFLAGS:=-Os -pipe -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=softfp
MAINTAINER:=Florian Fainelli <florian@openwrt.org>
-LINUX_VERSION:=3.8-rc6
+LINUX_VERSION:=3.8
include $(INCLUDE_DIR)/target.mk