Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Oct 18, 2011
  1. @shishirng
  2. @shishirng
  3. @shishirng
Commits on Oct 17, 2011
  1. @Lakshmipathi

    add iworm mount option

    Lakshmipathi authored
Commits on Oct 13, 2011
  1. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

    torvalds authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
      mscan: too much data copied to CAN frame due to 16 bit accesses
      gro: refetch inet6_protos[] after pulling ext headers
      bnx2x: fix cl_id allocation for non-eth clients for NPAR mode
      mlx4_en: fix endianness with blue frame support
  2. @johfel @torvalds

    ide: Fix file references in drivers/ide/

    johfel authored torvalds committed
    Fix file references in drivers/ide/
    
    There are a lot of file references to now moved or deleted files in the
    whole tree, especially in documentation and Kconfig files.  This patch
    fixes the references in drivers/ide/.
    
    Signed-off-by: Johann Felix Soden <johfel@users.sourceforge.net>
    Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
    Acked-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  3. @torvalds

    Merge branch 'btrfs-3.0' of git://github.com/chrismason/linux

    torvalds authored
    * 'btrfs-3.0' of git://github.com/chrismason/linux:
      Btrfs: make sure not to defrag extents past i_size
      Btrfs: fix recursive auto-defrag
Commits on Oct 11, 2011
  1. @chrismason-xx

    Btrfs: make sure not to defrag extents past i_size

    chrismason-xx authored
    The btrfs file defrag code will loop through the extents and
    force COW on them.  But there is a concurrent truncate in the middle of
    the defrag, it might end up defragging the same range over and over
    again.
    
    The problem is that writepage won't go through and do anything on pages
    past i_size, so the cow won't happen, so the file will appear to still
    be fragmented.  defrag will end up hitting the same extents again and
    again.
    
    In the worst case, the truncate can actually live lock with the defrag
    because the defrag keeps creating new ordered extents which the truncate
    code keeps waiting on.
    
    The fix here is to make defrag check for i_size inside the main loop,
    instead of just once before the looping starts.
    
    Signed-off-by: Chris Mason <chris.mason@oracle.com>
Commits on Oct 10, 2011
  1. @chrismason-xx

    Btrfs: fix recursive auto-defrag

    Li Zefan authored chrismason-xx committed
    Follow those steps:
    
      # mount -o autodefrag /dev/sda7 /mnt
      # dd if=/dev/urandom of=/mnt/tmp bs=200K count=1
      # sync
      # dd if=/dev/urandom of=/mnt/tmp bs=8K count=1 conv=notrunc
    
    and then it'll go into a loop: writeback -> defrag -> writeback ...
    
    It's because writeback writes [8K, 200K] and then writes [0, 8K].
    
    I tried to make writeback know if the pages are dirtied by defrag,
    but the patch was a bit intrusive. Here I simply set writeback_index
    when we defrag a file.
    
    Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
    Signed-off-by: Chris Mason <chris.mason@oracle.com>
  2. @davem330

    mscan: too much data copied to CAN frame due to 16 bit accesses

    Wolfgang Grandegger authored davem330 committed
    Due to the 16 bit access to mscan registers there's too much data copied to
    the zero initialized CAN frame when having an odd number of bytes to copy.
    This patch ensures that only the requested bytes are copied by using an
    8 bit access for the remaining byte.
    
    Reported-by: Andre Naujoks <nautsch@gmail.com>
    Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
    Signed-off-by: Wolfgang Grandegger <wg@grandegger.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  3. @davem330

    gro: refetch inet6_protos[] after pulling ext headers

    Yan, Zheng authored davem330 committed
    ipv6_gro_receive() doesn't update the protocol ops after pulling
    the ext headers. It looks like a typo.
    
    Signed-off-by: Zheng Yan <zheng.z.yan@intel.com>
    Acked-by: Eric Dumazet <eric.dumazet@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  4. @davem330

    bnx2x: fix cl_id allocation for non-eth clients for NPAR mode

    Dmitry Kravkov authored davem330 committed
    There are some consolidations of NPAR configuration
    when FCoE and iSCSI L2 clients will get the same id,
    in this case FCoE ring will be non-functional.
    
    Signed-off-by: Dmitry Kravkov <dmitry@broadcom.com>
    Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  5. @davem330

    mlx4_en: fix endianness with blue frame support

    Thadeu Lima de Souza Cascardo authored davem330 committed
    The doorbell register was being unconditionally swapped. In x86, that
    meant it was being swapped to BE and written to the descriptor and to
    memory, depending on the case of blue frame support or writing to
    doorbell register. On PPC, this meant it was being swapped to LE and
    then swapped back to BE while writing to the register. But in the blue
    frame case, it was being written as LE to the descriptor.
    
    The fix is not to swap doorbell unconditionally, write it to the
    register as BE and convert it to BE when writing it to the descriptor.
    
    Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@linux.vnet.ibm.com>
    Reported-by: Richard Hendrickson <richhend@us.ibm.com>
    Cc: Eli Cohen <eli@dev.mellanox.co.il>
    Cc: Yevgeny Petrilin <yevgenyp@mellanox.co.il>
    Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  6. @torvalds

    Merge git://git.samba.org/sfrench/cifs-2.6

    torvalds authored
    * git://git.samba.org/sfrench/cifs-2.6:
      [CIFS] Fix first time message on mount, ntlmv2 upgrade delayed to 3.2
  7. @torvalds

    Merge branch 'fixes' of git://git.linaro.org/people/arnd/arm-soc

    torvalds authored
    * 'fixes' of git://git.linaro.org/people/arnd/arm-soc:
      ARM: mach-ux500: enable fix for ARM errata 754322
      ARM: OMAP: musb: Remove a redundant omap4430_phy_init call in usb_musb_init
      ARM: OMAP: Fix i2c init for twl4030
      ARM: OMAP4: MMC: fix power and audio issue, decouple USBC1 from MMC1
  8. @marvintwentyfour @torvalds

    ARM: tegra: fix compilation error due to mach/hardware.h removal

    marvintwentyfour authored torvalds committed
    This fixes a compilation error in cpu-tegra.c which was introduced in
    dc8d966 ("ARM: convert PCI defines to variables") which removed the
    now obsolete mach/hardware.h from the mach-tegra subtree.
    
    Signed-off-by: Marc Dietrich <marvin24@gmx.de>
    Signed-off-by: Olof Johansson <olof@lixom.net>
    Cc: Sergei Shtylyov <sshtylyov@ru.mvista.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  9. @torvalds

    Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux

    torvalds authored
    * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
      drm/radeon/kms: use hardcoded dig encoder to transmitter mapping for DCE4.1
      drm/radeon/kms: fix dp_detect handling for DP bridge chips
      drm/radeon/kms: retry aux transactions if there are status flags
  10. @olofj @torvalds

    MAINTAINERS: Update tegra maintainer information

    olofj authored torvalds committed
    A couple of changes to the Tegra maintainership setup:
    
    I'm very glad to bring on Stephen Warren on board as a maintainer. The
    work he has done so far is excellent, and the fact that he works for
    Nvidia means he has long-term interest in the platform.
    
    Erik Gilling did an astounding amount of work on getting things up and
    running but has been a silent partner on the maintainership side for a
    while, and is stepping down. Thanks for your contributions so far, Erik.
    
    Finally, update the git URL since I'll take over running the main repo
    for a while.
    
    Overall maintainership model isn't changing much at this time: We'll all
    three review patches as appropriate, and one of us will collect the main
    repo (me at this time).
    
    Signed-off-by: Olof Johansson <olof@lixom.net>
    Cc: Erik Gilling <konkers@android.com>
    Acked-by: Colin Cross <ccross@android.com>
    Acked-by: Stephen Warren <swarren@nvidia.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  11. @torvalds

    Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-…

    torvalds authored
    …linus
    
    * 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus: (29 commits)
      MIPS: Call oops_enter, oops_exit in die
      staging/octeon: Software should check the checksum of no tcp/udp packets
      MIPS: Octeon: Enable C0_UserLocal probing.
      MIPS: No branches in delay slots for huge pages in handle_tlbl
      MIPS: Don't clobber CP0_STATUS value for CONFIG_MIPS_MT_SMTC
      MIPS: Octeon: Select CONFIG_HOLES_IN_ZONE
      MIPS: PM: Use struct syscore_ops instead of sysdevs for PM (v2)
      MIPS: Compat: Use 32-bit wrapper for compat_sys_futex.
      MIPS: Do not use EXTRA_CFLAGS
      MIPS: Alchemy: DB1200: Disable cascade IRQ in handler
      SERIAL: Lantiq: Set timeout in uart_port
      MIPS: Lantiq: Fix setting the PCI bus speed on AR9
      MIPS: Lantiq: Fix external interrupt sources
      MIPS: tlbex: Fix build error in R3000 code.
      MIPS: Alchemy: Include Au1100 in PM code.
      MIPS: Alchemy: Fix typo in MAC0 registration
      MIPS: MSP71xx: Fix build error.
      MIPS: Handle __put_user() sleeping.
      MIPS: Allow forced irq threading
      MIPS: i8259: Mark cascade interrupt non-threaded
      ...
Commits on Oct 8, 2011
  1. @arndb
  2. [CIFS] Fix first time message on mount, ntlmv2 upgrade delayed to 3.2

    Steve French authored
    Microsoft has a bug with ntlmv2 that requires use of ntlmssp, but
    we didn't get the required information on when/how to use ntlmssp to
    old (but once very popular) legacy servers (various NT4 fixpacks
    for example) until too late to merge for 3.1.  Will upgrade
    to NTLMv2 in NTLMSSP in 3.2
    
    Signed-off-by: Steve French <smfrench@gmail.com>
    Reviewed-by: Jeff Layton <jlayton@redhat.com>
Commits on Oct 7, 2011
  1. @arndb

    ARM: mach-ux500: enable fix for ARM errata 754322

    srinidhi kasagar authored arndb committed
    This applies ARM errata fix 754322 for all ux500 platforms.
    
    Cc: stable@kernel.org
    Signed-off-by: srinidhi kasagar <srinidhi.kasagar@stericsson.com>
    Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Commits on Oct 6, 2011
  1. @torvalds

    Merge git://github.com/davem330/net

    torvalds authored
    * git://github.com/davem330/net:
      net: fix typos in Documentation/networking/scaling.txt
      bridge: leave carrier on for empty bridge
      netfilter: Use proper rwlock init function
      tcp: properly update lost_cnt_hint during shifting
      tcp: properly handle md5sig_pool references
      macvlan/macvtap: Fix unicast between macvtap interfaces in bridge mode
  2. @paulepanter @torvalds

    x86/PCI: use host bridge _CRS info on ASUS M2V-MX SE

    paulepanter authored torvalds committed
    In summary, this DMI quirk uses the _CRS info by default for the ASUS
    M2V-MX SE by turning on `pci=use_crs` and is similar to the quirk
    added by commit 2491762 ("x86/PCI: use host bridge _CRS info on
    ASRock ALiveSATA2-GLAN") whose commit message should be read for further
    information.
    
    Since commit 3e3da00 ("x86/pci: AMD one chain system to use pci
    read out res") Linux gives the following oops:
    
        parport0: PC-style at 0x378, irq 7 [PCSPP,TRISTATE]
        HDA Intel 0000:20:01.0: PCI INT A -> GSI 17 (level, low) -> IRQ 17
        HDA Intel 0000:20:01.0: setting latency timer to 64
        BUG: unable to handle kernel paging request at ffffc90011c08000
        IP: [<ffffffffa0578402>] azx_probe+0x3ad/0x86b [snd_hda_intel]
        PGD 13781a067 PUD 13781b067 PMD 1300ba067 PTE 800000fd00000173
        Oops: 0009 [#1] SMP
        last sysfs file: /sys/module/snd_pcm/initstate
        CPU 0
        Modules linked in: snd_hda_intel(+) snd_hda_codec snd_hwdep snd_pcm_oss snd_mixer_oss snd_pcm snd_seq_midi snd_rawmidi snd_seq_midi_event tpm_tis tpm snd_seq tpm_bios psmouse parport_pc snd_timer snd_seq_device parport processor evdev snd i2c_viapro thermal_sys amd64_edac_mod k8temp i2c_core soundcore shpchp pcspkr serio_raw asus_atk0110 pci_hotplug edac_core button snd_page_alloc edac_mce_amd ext3 jbd mbcache sha256_generic cryptd aes_x86_64 aes_generic cbc dm_crypt dm_mod raid1 md_mod usbhid hid sg sd_mod crc_t10dif sr_mod cdrom ata_generic uhci_hcd sata_via pata_via libata ehci_hcd usbcore scsi_mod via_rhine mii nls_base [last unloaded: scsi_wait_scan]
        Pid: 1153, comm: work_for_cpu Not tainted 2.6.37-1-amd64 #1 M2V-MX SE/System Product Name
        RIP: 0010:[<ffffffffa0578402>]  [<ffffffffa0578402>] azx_probe+0x3ad/0x86b [snd_hda_intel]
        RSP: 0018:ffff88013153fe50  EFLAGS: 00010286
        RAX: ffffc90011c08000 RBX: ffff88013029ec00 RCX: 0000000000000006
        RDX: 0000000000000000 RSI: 0000000000000246 RDI: 0000000000000246
        RBP: ffff88013341d000 R08: 0000000000000000 R09: 0000000000000040
        R10: 0000000000000286 R11: 0000000000003731 R12: ffff88013029c400
        R13: 0000000000000000 R14: 0000000000000000 R15: ffff88013341d090
        FS:  0000000000000000(0000) GS:ffff8800bfc00000(0000) knlGS:00000000f7610ab0
        CS:  0010 DS: 0000 ES: 0000 CR0: 000000008005003b
        CR2: ffffc90011c08000 CR3: 0000000132f57000 CR4: 00000000000006f0
        DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
        DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400
        Process work_for_cpu (pid: 1153, threadinfo ffff88013153e000, task ffff8801303c86c0)
        Stack:
         0000000000000005 ffffffff8123ad65 00000000000136c0 ffff88013029c400
         ffff8801303c8998 ffff88013341d000 ffff88013341d090 ffff8801322d9dc8
         ffff88013341d208 0000000000000000 0000000000000000 ffffffff811ad232
        Call Trace:
         [<ffffffff8123ad65>] ? __pm_runtime_set_status+0x162/0x186
         [<ffffffff811ad232>] ? local_pci_probe+0x49/0x92
         [<ffffffff8105afc5>] ? do_work_for_cpu+0x0/0x1b
         [<ffffffff8105afc5>] ? do_work_for_cpu+0x0/0x1b
         [<ffffffff8105afd0>] ? do_work_for_cpu+0xb/0x1b
         [<ffffffff8105fd3f>] ? kthread+0x7a/0x82
         [<ffffffff8100a824>] ? kernel_thread_helper+0x4/0x10
         [<ffffffff8105fcc5>] ? kthread+0x0/0x82
         [<ffffffff8100a820>] ? kernel_thread_helper+0x0/0x10
        Code: f4 01 00 00 ef 31 f6 48 89 df e8 29 dd ff ff 85 c0 0f 88 2b 03 00 00 48 89 ef e8 b4 39 c3 e0 8b 7b 40 e8 fc 9d b1 e0 48 8b 43 38 <66> 8b 10 66 89 14 24 8b 43 14 83 e8 03 83 f8 01 77 32 31 d2 be
        RIP  [<ffffffffa0578402>] azx_probe+0x3ad/0x86b [snd_hda_intel]
         RSP <ffff88013153fe50>
        CR2: ffffc90011c08000
        ---[ end trace 8d1f3ebc136437fd ]---
    
    Trusting the ACPI _CRS information (`pci=use_crs`) fixes this problem.
    
        $ dmesg | grep -i crs # with the quirk
        PCI: Using host bridge windows from ACPI; if necessary, use "pci=nocrs" and report a bug
    
    The match has to be against the DMI board entries though since the vendor entries are not populated.
    
        DMI: System manufacturer System Product Name/M2V-MX SE, BIOS 0304    10/30/2007
    
    This quirk should be removed when `pci=use_crs` is enabled for machines
    from 2006 or earlier or some other solution is implemented.
    
    Using coreboot [1] with this board the problem does not exist but this
    quirk also does not affect it either. To be safe though the check is
    tightened to only take effect when the BIOS from American Megatrends is
    used.
    
            15:13 < ruik> but coreboot does not need that
            15:13 < ruik> because i have there only one root bus
            15:13 < ruik> the audio is behind a bridge
    
            $ sudo dmidecode
            BIOS Information
                    Vendor: American Megatrends Inc.
                    Version: 0304
                    Release Date: 10/30/2007
    
    [1] http://www.coreboot.org/
    
    Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=30552
    
    Cc: stable@kernel.org (2.6.34)
    Cc: Thomas Gleixner <tglx@linutronix.de>
    Cc: Ingo Molnar <mingo@redhat.com>
    Cc: H. Peter Anvin <hpa@zytor.com>
    Cc: x86@kernel.org
    Signed-off-by: Paul Menzel <paulepanter@users.sourceforge.net>
    Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
    Acked-by: Jesse Barnes <jbarnes@virtuousgeek.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  3. @benthaman @davem330

    net: fix typos in Documentation/networking/scaling.txt

    benthaman authored davem330 committed
    The second hunk fixes rps_sock_flow_table but has to re-wrap the paragraph.
    
    Signed-off-by: Benjamin Poirier <benjamin.poirier@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  4. @davem330

    bridge: leave carrier on for empty bridge

    stephen hemminger authored davem330 committed
    This resolves a regression seen by some users of bridging.
    Some users use the bridge like a dummy device.
    They expect to be able to put an IPv6 address on the device
    with no ports attached. Although there are better ways of doing
    this, there is no reason to not allow it.
    
    Note: the bridge still will reflect the state of ports in the
    bridge if there are any added.
    
    Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  5. @torvalds

    Merge branch 'for-linus' of http://people.redhat.com/agk/git/linux-dm

    torvalds authored
    * 'for-linus' of http://people.redhat.com/agk/git/linux-dm:
      dm crypt: always disable discard_zeroes_data
      dm: raid fix write_mostly arg validation
      dm table: avoid crash if integrity profile changes
      dm: flakey fix corrupt_bio_byte error path
  6. @torvalds

    Merge branch 'for-linus' of git://neil.brown.name/md

    torvalds authored
    * 'for-linus' of git://neil.brown.name/md:
      md: Avoid waking up a thread after it has been freed.
  7. drm/radeon/kms: use hardcoded dig encoder to transmitter mapping for …

    Alex Deucher authored Dave Airlie committed
    …DCE4.1
    
    The encoders are supposedly fully routeable, but changing the mapping
    doesn't always seem to take.  Using a hardcoded mapping is much more
    reliable.
    
    Fixes:
    https://bugs.freedesktop.org/show_bug.cgi?id=41366
    
    Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
    Tested-by: Simon Farnsworth <simon.farnsworth@onelan.co.uk>
    Cc: stable@kernel.org
    Signed-off-by: Dave Airlie <airlied@redhat.com>
Commits on Oct 5, 2011
  1. @davem330

    netfilter: Use proper rwlock init function

    Thomas Gleixner authored davem330 committed
    Replace the open coded initialization with the init function.
    
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Acked-by: Hans Schillstrom <hans.schillstrom@ericsson.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  2. @torvalds

    Merge branch 'for-linus' of git://github.com/dtor/input

    torvalds authored
    * 'for-linus' of git://github.com/dtor/input:
      Input: wacom - revert "Cintiq 21UX2 does not have menu strips"
  3. @torvalds

    Merge git://bedivere.hansenpartnership.com/git/scsi-rc-fixes-2.6

    torvalds authored
    * git://bedivere.hansenpartnership.com/git/scsi-rc-fixes-2.6:
      [SCSI] libsas: fix panic when single phy is disabled on a wide port
      [SCSI] qla2xxx: Fix crash in qla2x00_abort_all_cmds() on unload
  4. drm/radeon/kms: fix dp_detect handling for DP bridge chips

    Alex Deucher authored Dave Airlie committed
    The HPD pin is not reliable for detecting whether a monitor
    is connected or not.  Skip HPD and just use DDC or load
    detection.
    
    Fixes phantom VGA connected bugs.
    
    [Michel: fixes phantom VGA bugs on his llano system.]
    
    Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
    Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
    Tested-by: Michel Dänzer <michel.daenzer@amd.com>
    Cc: stable@kernel.org
    Signed-off-by: Dave Airlie <airlied@redhat.com>
  5. drm/radeon/kms: retry aux transactions if there are status flags

    Alex Deucher authored Dave Airlie committed
    If there are error flags in the aux status, retry the transaction.
    This makes aux much more reliable, especially on llano systems.
    
    Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
    Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
    Cc: stable@kernel.org
    Signed-off-by: Dave Airlie <airlied@redhat.com>
  6. @jigpu @dtor

    Input: wacom - revert "Cintiq 21UX2 does not have menu strips"

    jigpu authored dtor committed
    This reverts commit 71c86ce.
    The 21UX2 does have touchstrips, but they are in a somewhat-
    hidden location.
    
    Signed-off-by: Jason Gerecke <killertofu@gmail.com>
    Acked-by: Ping Cheng <pinglinux@gmail.com>
    Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Something went wrong with that request. Please try again.