LINUX_VERSION-3.13 = .7
LINUX_VERSION-3.14 = .32
LINUX_VERSION-3.18 = .6
-LINUX_VERSION-3.19 = -rc5
+LINUX_VERSION-3.19 =
LINUX_KERNEL_MD5SUM-3.8.13 = 2af19d06cd47ec459519159cdd10542d
LINUX_KERNEL_MD5SUM-3.10.58 = 3ff3478b6351143cef22d4b81cf48b01
LINUX_KERNEL_MD5SUM-3.13.7 = 370adced5e5c1cb1d0d621c2dae2723f
LINUX_KERNEL_MD5SUM-3.14.32 = 3178fb8f6f1eafcffdd730fec68754f8
LINUX_KERNEL_MD5SUM-3.18.6 = 997c8492ebfdc9bb9e6ed8d4945539dd
+LINUX_KERNEL_MD5SUM-3.19 = d3fc8316d4d4d04b65cbc2d70799e763
ifdef KERNEL_PATCHVER
LINUX_VERSION:=$(KERNEL_PATCHVER)$(strip $(LINUX_VERSION-$(KERNEL_PATCHVER)))
# CONFIG_MAC80211 is not set
# CONFIG_MAC80211_MESSAGE_TRACING is not set
# CONFIG_MACB is not set
+# CONFIG_MACH_ASM9260 is not set
# CONFIG_MACH_DECSTATION is not set
# CONFIG_MACH_JAZZ is not set
# CONFIG_MACH_JZ4740 is not set
# CONFIG_MMC_SDRICOH_CS is not set
# CONFIG_MMC_SPI is not set
# CONFIG_MMC_TEST is not set
+# CONFIG_MMC_TOSHIBA_PCI is not set
# CONFIG_MMC_UNSAFE_RESUME is not set
# CONFIG_MMC_USDHI6ROL0 is not set
# CONFIG_MMC_USHC is not set
+++ /dev/null
---- a/arch/mips/kernel/irq_cpu.c
-+++ b/arch/mips/kernel/irq_cpu.c
-@@ -57,6 +57,8 @@ static struct irq_chip mips_cpu_irq_cont
- .irq_mask_ack = mask_mips_irq,
- .irq_unmask = unmask_mips_irq,
- .irq_eoi = unmask_mips_irq,
-+ .irq_disable = mask_mips_irq,
-+ .irq_enable = unmask_mips_irq,
- };
-
- /*
-@@ -93,6 +95,8 @@ static struct irq_chip mips_mt_cpu_irq_c
- .irq_mask_ack = mips_mt_cpu_irq_ack,
- .irq_unmask = unmask_mips_irq,
- .irq_eoi = unmask_mips_irq,
-+ .irq_disable = mask_mips_irq,
-+ .irq_enable = unmask_mips_irq,
- };
-
- asmlinkage void __weak plat_irq_dispatch(void)
config INIT_ALL_POSSIBLE
--- a/kernel/module.c
+++ b/kernel/module.c
-@@ -2641,6 +2641,7 @@ static struct module *setup_load_info(st
+@@ -2655,6 +2655,7 @@ static struct module *setup_load_info(st
static int check_modinfo(struct module *mod, struct load_info *info, int flags)
{
const char *modmagic = get_modinfo(info, "vermagic");
int err;
-@@ -2666,6 +2667,7 @@ static int check_modinfo(struct module *
+@@ -2680,6 +2681,7 @@ static int check_modinfo(struct module *
pr_warn("%s: module is from the staging directory, the quality "
"is unknown, you have been warned.\n", mod->name);
}
-From: Manuel Lauss <manuel.lauss@gmail.com>\r
-Subject: [RFC PATCH v4 2/2] MIPS: make FPU emulator optional\r
-Date: Mon, 7 Apr 2014 12:57:04 +0200\r
-Message-Id: <1396868224-252888-2-git-send-email-manuel.lauss@gmail.com>\r
-\r
-This small patch makes the MIPS FPU emulator optional. The kernel\r
-kills float-users on systems without a hardware FPU by sending a SIGILL.\r
-\r
-Disabling the emulator shrinks vmlinux by about 54kBytes (32bit,\r
-optimizing for size).\r
-\r
-Signed-off-by: Manuel Lauss <manuel.lauss@gmail.com>\r
----\r
-v4: rediffed because of patch 1/2, should now work with micromips as well\r
-v3: updated patch description with size savings.\r
-v2: incorporated changes suggested by Jonas Gorski\r
- force the fpu emulator on for micromips: relocating the parts\r
- of the mmips code in the emulator to other areas would be a\r
- much larger change; I went the cheap route instead with this.\r
-\r
- arch/mips/Kbuild | 2 +-\r
- arch/mips/Kconfig | 14 ++++++++++++++\r
- arch/mips/include/asm/fpu.h | 5 +++--\r
- arch/mips/include/asm/fpu_emulator.h | 15 +++++++++++++++\r
- 4 files changed, 33 insertions(+), 3 deletions(-)\r
-\r
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -2521,6 +2521,20 @@ config MIPS_O32_FP64_SUPPORT
core-y += arch/mips/
--- a/arch/mips/include/asm/fpu.h
+++ b/arch/mips/include/asm/fpu.h
-@@ -201,8 +201,10 @@ static inline int init_fpu(void)
- write_c0_config5(config5);
- enable_fpu_hazard();
- }
+@@ -210,8 +210,10 @@ static inline int init_fpu(void)
+ /* Restore FRE */
+ write_c0_config5(config5);
+ enable_fpu_hazard();
- } else
-+ } else if (IS_ENABLED(CONFIG_MIPS_FPU_EMULATOR))
++ } else (IS_ENABLED(CONFIG_MIPS_FPU_EMULATOR))
fpu_emulator_init_fpu();
+ else
+ ret = SIGILL;
--- a/net/netlink/af_netlink.c
+++ b/net/netlink/af_netlink.c
-@@ -1702,27 +1702,7 @@ void netlink_detachskb(struct sock *sk,
+@@ -1712,27 +1712,7 @@ void netlink_detachskb(struct sock *sk,
static struct sk_buff *netlink_trim(struct sk_buff *skb, gfp_t allocation)
{
{
--- a/include/net/sch_generic.h
+++ b/include/net/sch_generic.h
-@@ -343,6 +343,7 @@ extern struct Qdisc noop_qdisc;
+@@ -340,6 +340,7 @@ extern struct Qdisc noop_qdisc;
extern struct Qdisc_ops noop_qdisc_ops;
extern struct Qdisc_ops pfifo_fast_ops;
extern struct Qdisc_ops mq_qdisc_ops;
static const struct rt6_info ip6_blk_hole_entry_template = {
.dst = {
.__refcnt = ATOMIC_INIT(1),
-@@ -1593,6 +1610,11 @@ int ip6_route_add(struct fib6_config *cf
+@@ -1594,6 +1611,11 @@ int ip6_route_add(struct fib6_config *cf
rt->dst.output = ip6_pkt_prohibit_out;
rt->dst.input = ip6_pkt_prohibit;
break;
case RTN_THROW:
default:
rt->dst.error = (cfg->fc_type == RTN_THROW) ? -EAGAIN
-@@ -2154,6 +2176,17 @@ static int ip6_pkt_prohibit_out(struct s
+@@ -2155,6 +2177,17 @@ static int ip6_pkt_prohibit_out(struct s
return ip6_pkt_drop(skb, ICMPV6_ADM_PROHIBITED, IPSTATS_MIB_OUTNOROUTES);
}
/*
* Allocate a dst for local (unicast / anycast) address.
*/
-@@ -2377,7 +2410,8 @@ static int rtm_to_fib6_config(struct sk_
+@@ -2378,7 +2411,8 @@ static int rtm_to_fib6_config(struct sk_
if (rtm->rtm_type == RTN_UNREACHABLE ||
rtm->rtm_type == RTN_BLACKHOLE ||
rtm->rtm_type == RTN_PROHIBIT ||
cfg->fc_flags |= RTF_REJECT;
if (rtm->rtm_type == RTN_LOCAL)
-@@ -2579,6 +2613,9 @@ static int rt6_fill_node(struct net *net
+@@ -2580,6 +2614,9 @@ static int rt6_fill_node(struct net *net
case -EACCES:
rtm->rtm_type = RTN_PROHIBIT;
break;
case -EAGAIN:
rtm->rtm_type = RTN_THROW;
break;
-@@ -2832,6 +2869,8 @@ static int ip6_route_dev_notify(struct n
+@@ -2833,6 +2870,8 @@ static int ip6_route_dev_notify(struct n
#ifdef CONFIG_IPV6_MULTIPLE_TABLES
net->ipv6.ip6_prohibit_entry->dst.dev = dev;
net->ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(dev);
net->ipv6.ip6_blk_hole_entry->dst.dev = dev;
net->ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(dev);
#endif
-@@ -3048,6 +3087,17 @@ static int __net_init ip6_route_net_init
+@@ -3049,6 +3088,17 @@ static int __net_init ip6_route_net_init
net->ipv6.ip6_blk_hole_entry->dst.ops = &net->ipv6.ip6_dst_ops;
dst_init_metrics(&net->ipv6.ip6_blk_hole_entry->dst,
ip6_template_metrics, true);
#endif
net->ipv6.sysctl.flush_delay = 0;
-@@ -3066,6 +3116,8 @@ out:
+@@ -3067,6 +3117,8 @@ out:
return ret;
#ifdef CONFIG_IPV6_MULTIPLE_TABLES
out_ip6_prohibit_entry:
kfree(net->ipv6.ip6_prohibit_entry);
out_ip6_null_entry:
-@@ -3083,6 +3135,7 @@ static void __net_exit ip6_route_net_exi
+@@ -3084,6 +3136,7 @@ static void __net_exit ip6_route_net_exi
#ifdef CONFIG_IPV6_MULTIPLE_TABLES
kfree(net->ipv6.ip6_prohibit_entry);
kfree(net->ipv6.ip6_blk_hole_entry);
#endif
dst_entries_destroy(&net->ipv6.ip6_dst_ops);
}
-@@ -3179,6 +3232,9 @@ int __init ip6_route_init(void)
+@@ -3180,6 +3233,9 @@ int __init ip6_route_init(void)
init_net.ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev);
init_net.ipv6.ip6_blk_hole_entry->dst.dev = init_net.loopback_dev;
init_net.ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev);
help
--- a/net/core/dev.c
+++ b/net/core/dev.c
-@@ -2620,10 +2620,20 @@ static int xmit_one(struct sk_buff *skb,
+@@ -2591,10 +2591,20 @@ static int xmit_one(struct sk_buff *skb,
if (!list_empty(&ptype_all))
dev_queue_xmit_nit(skb, dev);
+++ /dev/null
-From d5b4e70e8c205a67e2e246908b259367ab9ccecf Mon Sep 17 00:00:00 2001
-From: Hauke Mehrtens <hauke@hauke-m.de>
-Date: Mon, 8 Dec 2014 08:27:23 +0100
-Subject: [PATCH 2/4] bgmac: register napi before the device
-
-napi should get registered before the netdev and not after.
-
-Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
----
- drivers/net/ethernet/broadcom/bgmac.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
---- a/drivers/net/ethernet/broadcom/bgmac.c
-+++ b/drivers/net/ethernet/broadcom/bgmac.c
-@@ -1515,6 +1515,8 @@ static int bgmac_probe(struct bcma_devic
- if (core->bus->sprom.boardflags_lo & BGMAC_BFL_ENETADM)
- bgmac_warn(bgmac, "Support for ADMtek ethernet switch not implemented\n");
-
-+ netif_napi_add(net_dev, &bgmac->napi, bgmac_poll, BGMAC_WEIGHT);
-+
- err = bgmac_mii_register(bgmac);
- if (err) {
- bgmac_err(bgmac, "Cannot register MDIO\n");
-@@ -1529,8 +1531,6 @@ static int bgmac_probe(struct bcma_devic
-
- netif_carrier_off(net_dev);
-
-- netif_napi_add(net_dev, &bgmac->napi, bgmac_poll, BGMAC_WEIGHT);
--
- return 0;
-
- err_mii_unregister:
-@@ -1549,9 +1549,9 @@ static void bgmac_remove(struct bcma_dev
- {
- struct bgmac *bgmac = bcma_get_drvdata(core);
-
-- netif_napi_del(&bgmac->napi);
- unregister_netdev(bgmac->net_dev);
- bgmac_mii_unregister(bgmac);
-+ netif_napi_del(&bgmac->napi);
- bgmac_dma_free(bgmac);
- bcma_set_drvdata(core, NULL);
- free_netdev(bgmac->net_dev);
+++ /dev/null
-From fbd3b188fbaa861165a074c454d8f8dcf15343a0 Mon Sep 17 00:00:00 2001
-From: Hauke Mehrtens <hauke@hauke-m.de>
-Date: Mon, 8 Dec 2014 08:47:10 +0100
-Subject: [PATCH 3/4] bgmac: activate irqs only if there is nothing to poll
-
-IRQs should only get activated when there is nothing to poll in the
-queue any more and to after every poll.
-
-Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
----
- drivers/net/ethernet/broadcom/bgmac.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
---- a/drivers/net/ethernet/broadcom/bgmac.c
-+++ b/drivers/net/ethernet/broadcom/bgmac.c
-@@ -1167,10 +1167,10 @@ static int bgmac_poll(struct napi_struct
- bgmac->int_status = 0;
- }
-
-- if (handled < weight)
-+ if (handled < weight) {
- napi_complete(napi);
--
-- bgmac_chip_intrs_on(bgmac);
-+ bgmac_chip_intrs_on(bgmac);
-+ }
-
- return handled;
- }
/* The Mellanox Tavor device gives false positive parity errors
* Mark this device with a broken_parity_status, to allow
* PCI scanning code to "skip" this now blacklisted device.
-@@ -2891,6 +2892,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I
+@@ -2925,6 +2926,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x65f9, quirk_intel_mc_errata);
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x65fa, quirk_intel_mc_errata);
/*
* Ivytown NTB BAR sizes are misreported by the hardware due to an erratum. To
-@@ -2947,6 +2949,8 @@ static void fixup_debug_report(struct pc
+@@ -2981,6 +2983,8 @@ static void fixup_debug_report(struct pc
}
}
/*
* Some BIOS implementations leave the Intel GPU interrupts enabled,
* even though no one is handling them (f.e. i915 driver is never loaded).
-@@ -2981,6 +2985,8 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_IN
+@@ -3015,6 +3019,8 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_IN
DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x010a, disable_igfx_irq);
DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x0152, disable_igfx_irq);
/**
* ata_build_rw_tf - Build ATA taskfile for given read/write request
* @tf: Target ATA taskfile
-@@ -4761,6 +4774,9 @@ static struct ata_queued_cmd *ata_qc_new
+@@ -4787,6 +4800,9 @@ static struct ata_queued_cmd *ata_qc_new
break;
}
}
return qc;
}
-@@ -5671,6 +5687,9 @@ struct ata_port *ata_port_alloc(struct a
+@@ -5697,6 +5713,9 @@ struct ata_port *ata_port_alloc(struct a
ap->stats.unhandled_irq = 1;
ap->stats.idle_irq = 1;
#endif
ata_sff_port_init(ap);
return ap;
-@@ -5692,6 +5711,12 @@ static void ata_host_release(struct devi
+@@ -5718,6 +5737,12 @@ static void ata_host_release(struct devi
kfree(ap->pmp_link);
kfree(ap->slave_link);
kfree(ap);
host->ports[i] = NULL;
}
-@@ -6138,7 +6163,23 @@ int ata_host_register(struct ata_host *h
+@@ -6164,7 +6189,23 @@ int ata_host_register(struct ata_host *h
host->ports[i]->print_id = atomic_inc_return(&ata_print_id);
host->ports[i]->local_port_no = i + 1;
}
/*
* Define if arch has non-standard setup. This is a _PCI_ standard
-@@ -862,6 +865,12 @@ struct ata_port {
+@@ -864,6 +867,12 @@ struct ata_port {
#ifdef CONFIG_ATA_ACPI
struct ata_acpi_gtm __acpi_init_gtm; /* use ata_acpi_init_gtm() */
#endif
+be done automatically.
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -4388,6 +4388,11 @@ T: git git://linuxtv.org/anttip/media_tr
+@@ -4393,6 +4393,11 @@ T: git git://linuxtv.org/anttip/media_tr
S: Maintained
F: drivers/media/usb/hackrf/
depends on GPIOLIB
--- a/drivers/hwmon/Makefile
+++ b/drivers/hwmon/Makefile
-@@ -154,6 +154,7 @@ obj-$(CONFIG_SENSORS_W83L785TS) += w83l7
+@@ -155,6 +155,7 @@ obj-$(CONFIG_SENSORS_W83L785TS) += w83l7
obj-$(CONFIG_SENSORS_W83L786NG) += w83l786ng.o
obj-$(CONFIG_SENSORS_WM831X) += wm831x-hwmon.o
obj-$(CONFIG_SENSORS_WM8350) += wm8350-hwmon.o
projects / openwrt.git / commitdiff