Changeset 35100


Ignore:
Timestamp:
2013-01-12T12:43:08+01:00 (5 years ago)
Author:
juhosg
Message:

kernel: update linux 3.7 to 3.7.2

Signed-off-by: Gabor Juhos <juhosg@…>

Location:
trunk
Files:
12 edited

Legend:

Unmodified
Added
Removed
  • trunk/include/kernel-version.mk

    r34760 r35100  
    99  LINUX_KERNEL_MD5SUM:=3d602ad7f7984509c3e923a5ae90bc54 
    1010endif 
    11 ifeq ($(LINUX_VERSION),3.7.1) 
    12   LINUX_KERNEL_MD5SUM:=b3f99fb945b270b503b2a0996b8b29e7 
     11ifeq ($(LINUX_VERSION),3.7.2) 
     12  LINUX_KERNEL_MD5SUM:=a6bad0280df3bfec8f91c9aa375826a5 
    1313endif 
    1414 
  • trunk/target/linux/adm5120/patches-3.7/007-adm5120_pci.patch

    r34954 r35100  
    1111--- a/include/linux/pci_ids.h 
    1212+++ b/include/linux/pci_ids.h 
    13 @@ -1806,6 +1806,9 @@ 
     13@@ -1807,6 +1807,9 @@ 
    1414 #define PCI_VENDOR_ID_ESDGMBH          0x12fe 
    1515 #define PCI_DEVICE_ID_ESDGMBH_CPCIASIO4 0x0111 
  • trunk/target/linux/generic/patches-3.7/025-bcma_backport.patch

    r35080 r35100  
    13581358--- a/drivers/net/wireless/b43/main.c 
    13591359+++ b/drivers/net/wireless/b43/main.c 
    1360 @@ -4652,7 +4652,7 @@ static int b43_wireless_core_init(struct 
     1360@@ -4656,7 +4656,7 @@ static int b43_wireless_core_init(struct 
    13611361        switch (dev->dev->bus_type) { 
    13621362 #ifdef CONFIG_B43_BCMA 
  • trunk/target/linux/generic/patches-3.7/100-overlayfs.patch

    r34601 r35100  
    31033103--- a/fs/splice.c 
    31043104+++ b/fs/splice.c 
    3105 @@ -1308,6 +1308,7 @@ long do_splice_direct(struct file *in, l 
     3105@@ -1310,6 +1310,7 @@ long do_splice_direct(struct file *in, l 
    31063106  
    31073107        return ret; 
  • trunk/target/linux/generic/patches-3.7/131-atm-fixes.patch

    r34443 r35100  
    453453 } 
    454454  
    455 @@ -1011,9 +989,12 @@ static uint32_t fpga_tx(struct solos_car 
     455@@ -1012,9 +990,12 @@ static uint32_t fpga_tx(struct solos_car 
    456456                        if (vcc) { 
    457457                                atomic_inc(&vcc->stats->tx); 
     
    468468        } 
    469469        /* For non-DMA TX, write the 'TX start' bit for all four ports simultaneously */ 
    470 @@ -1248,7 +1229,7 @@ static int atm_init(struct solos_card *c 
     470@@ -1249,7 +1230,7 @@ static int atm_init(struct solos_card *c 
    471471                card->atmdev[i]->phy_data = (void *)(unsigned long)i; 
    472472                atm_dev_signal_change(card->atmdev[i], ATM_PHY_SIG_FOUND); 
     
    477477                        dev_warn(&card->dev->dev, "Failed to allocate sk_buff in atm_init()\n"); 
    478478                        continue; 
    479 @@ -1345,6 +1326,8 @@ static struct pci_driver fpga_driver = { 
     479@@ -1346,6 +1327,8 @@ static struct pci_driver fpga_driver = { 
    480480  
    481481 static int __init solos_pci_init(void) 
  • trunk/target/linux/generic/patches-3.7/132-solos-dma.patch

    r34806 r35100  
    4343    Signed-off-by: Nathan Williams <nathan@traverse.com.au> 
    4444    Signed-off-by: David Woodhouse <David.Woodhouse@intel.com> 
    45     Signed-off-by: David S. Miller <davem@davemloft.net> 
    46  
    47 commit cae49ede00ec3d0cda290b03fee55b72b49efc11 
    48 Author: David Woodhouse <dwmw2@infradead.org> 
    49 Date:   Tue Dec 11 14:57:14 2012 +0000 
    50  
    51     solos-pci: fix double-free of TX skb in DMA mode 
    52      
    53     We weren't clearing card->tx_skb[port] when processing the TX done interrupt. 
    54     If there wasn't another skb ready to transmit immediately, this led to a 
    55     double-free because we'd free it *again* next time we did have a packet to 
    56     send. 
    57      
    58     Signed-off-by: David Woodhouse <David.Woodhouse@intel.com> 
    59     Cc: stable@kernel.org 
    6045    Signed-off-by: David S. Miller <davem@davemloft.net> 
    6146 
     
    315300                                iowrite32(word, FLASH_BUF + i); 
    316301                        else 
    317 @@ -945,10 +1069,11 @@ static uint32_t fpga_tx(struct solos_car 
    318         for (port = 0; tx_pending; tx_pending >>= 1, port++) { 
    319                 if (tx_pending & 1) { 
    320                         struct sk_buff *oldskb = card->tx_skb[port]; 
    321 -                       if (oldskb) 
    322 +                       if (oldskb) { 
    323                                 pci_unmap_single(card->dev, SKB_CB(oldskb)->dma_addr, 
    324                                                  oldskb->len, PCI_DMA_TODEVICE); 
    325 - 
    326 +                               card->tx_skb[port] = NULL; 
    327 +                       } 
    328                         spin_lock(&card->tx_queue_lock); 
    329                         skb = skb_dequeue(&card->tx_queue[port]); 
    330                         if (!skb) 
    331 @@ -960,7 +1085,12 @@ static uint32_t fpga_tx(struct solos_car 
     302@@ -961,7 +1085,12 @@ static uint32_t fpga_tx(struct solos_car 
    332303                                tx_started |= 1 << port; 
    333304                                oldskb = skb; /* We're done with this skb already */ 
     
    343314                                card->tx_skb[port] = skb; 
    344315                                iowrite32(SKB_CB(skb)->dma_addr, 
    345 @@ -1134,18 +1264,33 @@ static int fpga_probe(struct pci_dev *de 
     316@@ -1135,18 +1264,33 @@ static int fpga_probe(struct pci_dev *de 
    346317                db_fpga_upgrade = db_firmware_upgrade = 0; 
    347318        } 
     
    380351  
    381352        tasklet_init(&card->tlet, solos_bh, (unsigned long)card); 
    382 @@ -1180,6 +1325,10 @@ static int fpga_probe(struct pci_dev *de 
     353@@ -1181,6 +1325,10 @@ static int fpga_probe(struct pci_dev *de 
    383354        if (err) 
    384355                goto out_free_irq; 
     
    391362  
    392363  out_free_irq: 
    393 @@ -1188,6 +1337,7 @@ static int fpga_probe(struct pci_dev *de 
     364@@ -1189,6 +1337,7 @@ static int fpga_probe(struct pci_dev *de 
    394365        tasklet_kill(&card->tlet); 
    395366         
     
    399370        pci_iounmap(dev, card->buffers); 
    400371  out_unmap_config: 
    401 @@ -1290,11 +1440,16 @@ static void fpga_remove(struct pci_dev * 
     372@@ -1291,11 +1440,16 @@ static void fpga_remove(struct pci_dev * 
    402373        iowrite32(1, card->config_regs + FPGA_MODE); 
    403374        (void)ioread32(card->config_regs + FPGA_MODE);  
  • trunk/target/linux/generic/patches-3.7/810-pci_disable_common_quirks.patch

    r34467 r35100  
    2424  * Mark this device with a broken_parity_status, to allow 
    2525  * PCI scanning code to "skip" this now blacklisted device. 
    26 @@ -2844,6 +2845,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I 
     26@@ -2847,6 +2848,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I 
    2727 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x65f9, quirk_intel_mc_errata); 
    2828 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x65fa, quirk_intel_mc_errata); 
     
    3232 static ktime_t fixup_debug_start(struct pci_dev *dev, 
    3333                                 void (*fn)(struct pci_dev *dev)) 
    34 @@ -2875,6 +2877,8 @@ static void fixup_debug_report(struct pc 
     34@@ -2878,6 +2880,8 @@ static void fixup_debug_report(struct pc 
    3535        } 
    3636 } 
     
    4141  * Some BIOS implementations leave the Intel GPU interrupts enabled, 
    4242  * even though no one is handling them (f.e. i915 driver is never loaded). 
    43 @@ -2909,6 +2913,8 @@ static void __devinit disable_igfx_irq(s 
     43@@ -2912,6 +2916,8 @@ static void __devinit disable_igfx_irq(s 
    4444 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x0102, disable_igfx_irq); 
    4545 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x010a, disable_igfx_irq); 
  • trunk/target/linux/generic/patches-3.7/811-pci_disable_usb_common_quirks.patch

    r34675 r35100  
    4040 { 
    4141        u16 cmd; 
    42 @@ -971,3 +986,4 @@ static void __devinit quirk_usb_early_ha 
     42@@ -973,3 +988,4 @@ static void __devinit quirk_usb_early_ha 
    4343 } 
    4444 DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_ANY_ID, PCI_ANY_ID, 
  • trunk/target/linux/generic/patches-3.7/950-vm_exports.patch

    r34651 r35100  
    7070--- a/mm/memory.c 
    7171+++ b/mm/memory.c 
    72 @@ -1415,6 +1415,7 @@ void zap_page_range(struct vm_area_struc 
     72@@ -1420,6 +1420,7 @@ void zap_page_range(struct vm_area_struc 
    7373        mmu_notifier_invalidate_range_end(mm, start, end); 
    7474        tlb_finish_mmu(&tlb, start, end); 
  • trunk/target/linux/lantiq/Makefile

    r34909 r35100  
    1212SUBTARGETS=xway ase falcon 
    1313 
    14 LINUX_VERSION:=3.7.1 
     14LINUX_VERSION:=3.7.2 
    1515 
    1616CFLAGS=-Os -pipe -mips32r2 -mtune=mips32r2 -fno-caller-saves -mno-branch-likely 
  • trunk/target/linux/malta/Makefile

    r35045 r35100  
    1414MAINTAINER:=Florian Fainelli <florian@openwrt.org> 
    1515 
    16 LINUX_VERSION:=3.7.1 
     16LINUX_VERSION:=3.7.2 
    1717 
    1818DEVICE_TYPE:=developerboard 
  • trunk/target/linux/x86/geos/target.mk

    r34760 r35100  
    2222            soloscli linux-atm br2684ctl ppp-mod-pppoa pppdump pppstats \ 
    2323            hwclock wpad flashrom tc 
    24 LINUX_VERSION:=3.7.1 
     24LINUX_VERSION:=3.7.2 
    2525CS5535_MASK:=0x0E000048 
    2626 
Note: See TracChangeset for help on using the changeset viewer.