1. 07 Jul, 2011 5 commits
  2. 06 Jul, 2011 15 commits
  3. 05 Jul, 2011 9 commits
  4. 04 Jul, 2011 9 commits
    • Linus Torvalds's avatar
      Linux 3.0-rc6 · fe0d4220
      Linus Torvalds authored
      fe0d4220
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6 · 532df6f3
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6: (277 commits)
        [SCSI] isci: fix checkpatch errors
        isci: Device reset should request sas_phy_reset(phy, true)
        isci: pare back error messsages
        isci: cleanup silicon revision detection
        isci: merge scu_unsolicited_frame.h into unsolicited_frame_control.h
        isci: merge sata.[ch] into request.c
        isci: kill 'get/set' macros
        isci: retire scic_sds_ and scic_ prefixes
        isci: unify isci_host and scic_sds_controller
        isci: unify isci_remote_device and scic_sds_remote_device
        isci: unify isci_port and scic_sds_port
        isci: fix scic_sds_remote_device_terminate_requests
        isci: unify isci_phy and scic_sds_phy
        isci: unify isci_request and scic_sds_request
        isci: rename / clean up scic_sds_stp_request
        isci: preallocate requests
        isci: combine request flags
        isci: unify can_queue tracking on the tci_pool, uplevel tag assignment
        isci: Terminate dev requests on FIS err bit rx in NCQ
        isci: fix frame received locking
        ...
      532df6f3
    • Linus Torvalds's avatar
      Merge branch 'at91/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-2.6-arm-soc · fc52693f
      Linus Torvalds authored
      * 'at91/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-2.6-arm-soc:
        AT91: Change nand buswidth logic to match hardware default configuration
        at91: Use "pclk" as con_id on at91cap9 and at91rm9200
        at91: fix udc, ehci and mmc clock device name for cap9/9g45/9rl
        atmel_serial: fix internal port num
        at91: fix at91_set_serial_console: use platform device id
      fc52693f
    • Linus Torvalds's avatar
      Merge branch 'fbdev-fixes-for-linus' of... · aababb97
      Linus Torvalds authored
      Merge branch 'fbdev-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-3.x
      
      * 'fbdev-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-3.x:
        vesafb: fix memory leak
        fbdev: amba: Link fb device to its parent
        fsl-diu-fb: remove check for pixel clock ranges
        udlfb: Correct sub-optimal resolution selection.
        hecubafb: add module_put on error path in hecubafb_probe()
        sm501fb: fix section mismatch warning
        gx1fb: Fix section mismatch warnings
        fbdev: sh_mobile_meram: Correct pointer check for YCbCr chroma plane
      aababb97
    • Goldwyn Rodrigues's avatar
      RDMA: Check for NULL mode in .devnode methods · b2bc4782
      Goldwyn Rodrigues authored
      Commits 71c29bd5 ("IB/uverbs: Add devnode method to set path/mode")
      and c3af0980 ("IB: Add devnode methods to cm_class and umad_class")
      added devnode methods that set the mode.
      
      However, these methods don't check for a NULL mode, and so we get a
      crash when unloading modules because devtmpfs_delete_node() calls
      device_get_devnode() with mode == NULL.
      
      Add the missing checks.
      Signed-off-by: default avatarGoldwyn Rodrigues <rgoldwyn@suse.de>
      [ Also fix cm.c.  - Roland ]
      Signed-off-by: default avatarRoland Dreier <roland@purestorage.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      b2bc4782
    • Nicolas Ferre's avatar
      AT91: Change nand buswidth logic to match hardware default configuration · 64393b3a
      Nicolas Ferre authored
      The recently modified nand buswitth configuration is not aligned with
      board reality: the double footprint on boards is always populated with 8bits
      buswidth nand flashes.
      So we have to consider that without particular configuration the 8bits
      buswidth is selected by default.
      Moreover, the previous logic was always using !board_have_nand_8bit(), we
      change it to a simpler: board_have_nand_16bit().
      Signed-off-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
      Tested-by: default avatarLudovic Desroches <ludovic.desroches@atmel.com>
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      64393b3a
    • Daniel J Blueman's avatar
      vesafb: fix memory leak · 3e86f1d8
      Daniel J Blueman authored
      When releasing framebuffer, free colourmap allocations.
      Signed-off-by: default avatarDaniel J Blueman <daniel.blueman@gmail.com>
      Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
      3e86f1d8
    • FUJITA Tomonori's avatar
      natsemi: silence dma-debug warnings · 2fb83cd6
      FUJITA Tomonori authored
      This silences dma-debug warnings:
      
      https://lkml.org/lkml/2011/6/30/341
      
      ------------[ cut here ]------------
      WARNING: at /home/jimc/projects/lx/linux-2.6/lib/dma-debug.c:820
      check_unmap+0x1fe/0x56a()
      natsemi 0000:00:06.0: DMA-API: device driver frees DMA memory with
      different size [device address=0x0000000006ef0040] [map size=1538
      bytes] [unmap size=1522 bytes]
      Modules linked in: pc8736x_gpio pc87360 hwmon_vid scx200_gpio nsc_gpio
      scx200_hrt scx200_acb i2c_core arc4 rtl8180 mac80211 eeprom_93cx6
      cfg80211 pcspkr rfkill scx200 ide_gd_mod ide_pci_generic ohci_hcd
      usbcore sc1200 ide_core
      Pid: 870, comm: collector Not tainted 3.0.0-rc5-sk-00080-gca56a95e #1
      Call Trace:
       [<c011a556>] warn_slowpath_common+0x4a/0x5f
       [<c02565cb>] ? check_unmap+0x1fe/0x56a
       [<c011a5cf>] warn_slowpath_fmt+0x26/0x2a
       [<c02565cb>] check_unmap+0x1fe/0x56a
       [<c0256aaa>] debug_dma_unmap_page+0x53/0x5b
       [<c029d6cd>] pci_unmap_single+0x4d/0x57
       [<c029ea0a>] natsemi_poll+0x343/0x5ca
       [<c0116f41>] ? try_to_wake_up+0xea/0xfc
       [<c0122416>] ? spin_unlock_irq.clone.28+0x18/0x23
       [<c02d4667>] net_rx_action+0x3f/0xe5
       [<c011e35e>] __do_softirq+0x5b/0xd1
       [<c011e303>] ? local_bh_enable+0xa/0xa
       <IRQ>  [<c011e54b>] ? irq_exit+0x34/0x75
       [<c01034b9>] ? do_IRQ+0x66/0x79
       [<c034e869>] ? common_interrupt+0x29/0x30
       [<c0115ed0>] ? finish_task_switch.clone.118+0x31/0x72
       [<c034cb92>] ? schedule+0x3b2/0x3f1
       [<c012f4b0>] ? hrtimer_start_range_ns+0x10/0x12
       [<c012f4ce>] ? hrtimer_start_expires+0x1c/0x24
       [<c034d5aa>] ? schedule_hrtimeout_range_clock+0x8e/0xb4
       [<c012ed27>] ? update_rmtp+0x68/0x68
       [<c034d5da>] ? schedule_hrtimeout_range+0xa/0xc
       [<c017a913>] ? poll_schedule_timeout+0x27/0x3e
       [<c017b051>] ? do_select+0x488/0x4cd
       [<c0115ee2>] ? finish_task_switch.clone.118+0x43/0x72
       [<c01157ad>] ? need_resched+0x14/0x1e
       [<c017a99e>] ? poll_freewait+0x74/0x74
       [<c01157ad>] ? need_resched+0x14/0x1e
       [<c034cbc1>] ? schedule+0x3e1/0x3f1
       [<c011e55e>] ? irq_exit+0x47/0x75
       [<c01157ad>] ? need_resched+0x14/0x1e
       [<c034cf8a>] ? preempt_schedule_irq+0x44/0x4a
       [<c034dd1e>] ? need_resched+0x17/0x19
       [<c024bc12>] ? put_dec_full+0x7b/0xaa
       [<c0240060>] ? blkdev_ioctl+0x434/0x618
       [<c024bc70>] ? put_dec+0x2f/0x6d
       [<c024c6a5>] ? number.clone.1+0x10b/0x1d0
       [<c034cf8a>] ? preempt_schedule_irq+0x44/0x4a
       [<c034dd1e>] ? need_resched+0x17/0x19
       [<c024d046>] ? vsnprintf+0x225/0x264
       [<c024cea0>] ? vsnprintf+0x7f/0x264
       [<c018346f>] ? seq_printf+0x22/0x40
       [<c01a2fcc>] ? do_task_stat+0x582/0x5a3
       [<c017a913>] ? poll_schedule_timeout+0x27/0x3e
       [<c017b1b5>] ? core_sys_select+0x11f/0x1a3
       [<c017a913>] ? poll_schedule_timeout+0x27/0x3e
       [<c01a34a1>] ? proc_tgid_stat+0xd/0xf
       [<c012357c>] ? recalc_sigpending+0x32/0x35
       [<c0123b9c>] ? __set_task_blocked+0x64/0x6a
       [<c011dfb0>] ? timespec_add_safe+0x24/0x48
       [<c0123449>] ? spin_unlock_irq.clone.16+0x18/0x23
       [<c017b3a1>] ? sys_pselect6+0xe5/0x13e
       [<c034dd65>] ? syscall_call+0x7/0xb
       [<c0340000>] ? rpc_clntdir_depopulate+0x26/0x30
      ---[ end trace 180dcac41a50938b ]---
      Reported-by: default avatarJim Cromie <jim.cromie@gmail.com>
      Signed-off-by: default avatarFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
      Tested-by: default avatarJim Cromie <jim.cromie@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      2fb83cd6
    • Shan Wei's avatar
      net: 8139too: Initial necessary vlan_features to support vlan · 60b67703
      Shan Wei authored
      Offload setting of vlan device requires
      vlan_features to be initialized.
      Signed-off-by: default avatarShan Wei <shanwei@cn.fujitsu.com>
      Acked-by: default avatarFrancois Romieu <romieu@fr.zoreil.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      60b67703
  5. 03 Jul, 2011 2 commits