Permalink
Commits on Aug 5, 2012
  1. Merge branch 'bld-3.5' into pf-3.5

    Oleksandr Natalenko committed Aug 5, 2012
  2. bld-3.5: probable fix weird loadavg

    Oleksandr Natalenko committed Aug 5, 2012
Commits on Jul 31, 2012
  1. Merge branch 'configs-3.5' into pf-3.5

    Oleksandr Natalenko committed Jul 31, 2012
  2. Merge branch 'bld-3.5' into pf-3.5

    Oleksandr Natalenko committed Jul 31, 2012
  3. bld-3.5: merge BLD for Linux v3.5

    Oleksandr Natalenko committed Jul 31, 2012
Commits on Jul 28, 2012
  1. @NigelCunningham

    Merge tag 'v3.5' into tuxonice-head

    Linux 3.5
    NigelCunningham committed Jul 28, 2012
Commits on Jul 27, 2012
  1. Merge branch 'bfq-3.5' into pf-3.5

    Oleksandr Natalenko committed Jul 27, 2012
  2. bfq-3.5: update BFQ as notified by Arianna

    Oleksandr Natalenko committed Jul 27, 2012
  3. Merge branch 'bfq-3.5' into pf-3.5

    Oleksandr Natalenko committed Jul 27, 2012
  4. bfq-3.5: add BFQ v4 for Linux v3.5

    Oleksandr Natalenko committed Jul 27, 2012
Commits on Jul 26, 2012
  1. Merge branch 'uksm-3.5' into pf-3.5

    Oleksandr Natalenko committed Jul 26, 2012
  2. uksm-3.5: add uksm v0.1.2 for Linux v3.5

    Oleksandr Natalenko committed Jul 26, 2012
Commits on Jul 22, 2012
  1. Merge branch 'configs-3.5' into pf-3.5

    Oleksandr Natalenko committed Jul 22, 2012
  2. Merge branch 'configs-3.4' into configs-3.5

    Oleksandr Natalenko committed Jul 22, 2012
  3. configs-3.4: update samsung-np900x3a.config

    Oleksandr Natalenko committed Jul 22, 2012
  4. Merge branch 'distro-3.5' into pf-3.5

    Oleksandr Natalenko committed Jul 22, 2012
  5. Merge branch 'version-3.5' into pf-3.5

    Oleksandr Natalenko committed Jul 22, 2012
  6. distro-3.5: bump Arch Linux PKGBUILD version to 3.5.1-pf

    Oleksandr Natalenko committed Jul 22, 2012
  7. Merge branch 'distro-3.4' into distro-3.5

    Oleksandr Natalenko committed Jul 22, 2012
  8. version-3.5: bump to v3.5.1-pf

    Oleksandr Natalenko committed Jul 22, 2012
Commits on Jul 21, 2012
  1. @torvalds

    Linux 3.5

    torvalds committed Jul 21, 2012
  2. @rjwysocki @torvalds

    Remove SYSTEM_SUSPEND_DISK system state

    The SYSTEM_SUSPEND_DISK system state is never used, so drop it.
    
    Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    rjwysocki committed with torvalds Jul 21, 2012
  3. @torvalds

    Merge branch 'anton-kgdb' (kgdb dmesg fixups)

    Merge emailed kgdb dmesg fixups patches from Anton Vorontsov:
     "The dmesg command appears to be broken after the printk rework.  The
      old logic in the kdb code makes no sense in terms of current
      printk/logging storage format, and KDB simply hangs forever upon
      entering 'dmesg' command.
    
      The first patch revives the command by switching to kmsg_dumper
      iterator.  As a side-effect, the code is now much more simpler.
    
      A few changes were needed in the printk.c: we needed unlocked variant
      of the kmsg_dumper iterator, but these can surely wait for 3.6.
    
      It's probably too late even for the first patch to go to 3.5, but I'll
      try to convince otherwise.  :-) Here we go:
    
       - The current code is broken for sure, and has no hope to work at
         all.  It is a regression
       - The new code works for me, and probably works for everyone else;
       - If it compiles (and I urge everyone to compile-test it on your
         setup), it hardly can make things worse."
    
    * Merge emailed patches from Anton Vorontsov: (4 commits)
      kdb: Switch to nolock variants of kmsg_dump functions
      printk: Implement some unlocked kmsg_dump functions
      printk: Remove kdb_syslog_data
      kdb: Revive dmesg command
    torvalds committed Jul 21, 2012
  4. @enomsg @torvalds

    kdb: Switch to nolock variants of kmsg_dump functions

    The locked variants are prone to deadlocks (suppose we got to the
    debugger w/ the logbuf lock held), so let's switch to nolock variants.
    
    Signed-off-by: Anton Vorontsov <anton.vorontsov@linaro.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    enomsg committed with torvalds Jul 21, 2012
  5. @enomsg @torvalds

    printk: Implement some unlocked kmsg_dump functions

    If used from KDB, the locked variants are prone to deadlocks (suppose we
    got to the debugger w/ the logbuf lock held).
    
    So, we have to implement a few routines that grab no logbuf lock.
    
    Yet we don't need these functions in modules, so we don't export them.
    
    Signed-off-by: Anton Vorontsov <anton.vorontsov@linaro.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    enomsg committed with torvalds Jul 21, 2012
  6. @enomsg @torvalds

    printk: Remove kdb_syslog_data

    The function is no longer needed, so remove it.
    
    Signed-off-by: Anton Vorontsov <anton.vorontsov@linaro.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    enomsg committed with torvalds Jul 21, 2012
  7. @enomsg @torvalds

    kdb: Revive dmesg command

    The kgdb dmesg command is broken after the printk rework.  The old logic
    in kdb code makes no sense in terms of current printk/logging storage
    format, and KDB simply hangs forever.
    
    This patch revives the command by switching to kmsg_dumper iterator.
    
    The code is now much more simpler and shorter.
    
    Signed-off-by: Anton Vorontsov <anton.vorontsov@linaro.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    enomsg committed with torvalds Jul 21, 2012
Commits on Jul 20, 2012
  1. @torvalds

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

    …ream-linus
    
    Pull late MIPS fixes from Ralf Baechle:
     "This fixes a number of lose ends in the MIPS code and various bug
      fixes.
    
      Aside of dropping some patch that should not be in this pull request
      everything has sat in -next for quite a while and there are no known
      issues.
    
      The biggest patch in this patch set moves the allocation of an array
      that is aliased to a function (for runtime generated code) to
      assembler code.  This avoids an issue with certain toolchains when
      building for microMIPS."
    
    * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (35 commits)
      MIPS: PCI: Move fixups from __init to __devinit.
      MIPS: Fix bug.h MIPS build regression
      MIPS: sync-r4k: remove redundant irq operation
      MIPS: smp: Warn on too early irq enable
      MIPS: call set_cpu_online() on cpu being brought up with irq disabled
      MIPS: call ->smp_finish() a little late
      MIPS: Yosemite: delay irq enable to ->smp_finish()
      MIPS: SMTC: delay irq enable to ->smp_finish()
      MIPS: BMIPS: delay irq enable to ->smp_finish()
      MIPS: Octeon: delay enable irq to ->smp_finish()
      MIPS: Oprofile: Fix build as a module.
      MIPS: BCM63XX: Fix BCM6368 IPSec clock bit
      MIPS: perf: Fix build error caused by unused counters_per_cpu_to_total()
      MIPS: Fix Magic SysRq L kernel crash.
      MIPS: BMIPS: Fix duplicate header inclusion.
      mips: mark const init data with __initconst instead of __initdata
      MIPS: cmpxchg.h: Add missing include
      MIPS: Malta may also be equipped with MIPS64 R2 processors.
      MIPS: Fix typo multipy -> multiply
      MIPS: Cavium: Fix duplicate ARCH_SPARSEMEM_ENABLE in kconfig.
      ...
    torvalds committed Jul 20, 2012
  2. @torvalds

    Merge tag 'dm-3.5-fixes-2' of git://git.kernel.org/pub/scm/linux/kern…

    …el/git/agk/linux-dm
    
    Pull device-mapper discard fixes from Alasdair G Kergon:
      - avoid a crash in dm-raid1 when discards coincide with mirror
        recovery;
      - avoid discarding shared data that's still needed in dm-thin;
      - don't guarantee that discarded blocks will be wiped in dm-raid1.
    
    * tag 'dm-3.5-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-dm:
      dm raid1: set discard_zeroes_data_unsupported
      dm thin: do not send discards to shared blocks
      dm raid1: fix crash with mirror recovery and discard
    torvalds committed Jul 20, 2012
  3. @torvalds

    Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd

    Pull pnfs/ore fixes from Boaz Harrosh:
     "These are catastrophic fixes to the pnfs objects-layout that were just
      discovered.  They are also destined for @stable.
    
      I have found these and worked on them at around RC1 time but
      unfortunately went to the hospital for kidney stones and had a very
      slow recovery.  I refrained from sending them as is, before proper
      testing, and surly I have found a bug just yesterday.
    
      So now they are all well tested, and have my sign-off.  Other then
      fixing the problem at hand, and assuming there are no bugs at the new
      code, there is low risk to any surrounding code.  And in anyway they
      affect only these paths that are now broken.  That is RAID5 in pnfs
      objects-layout code.  It does also affect exofs (which was not broken)
      but I have tested exofs and it is lower priority then objects-layout
      because no one is using exofs, but objects-layout has lots of users."
    
    * 'for-linus' of git://git.open-osd.org/linux-open-osd:
      pnfs-obj: Fix __r4w_get_page when offset is beyond i_size
      pnfs-obj: don't leak objio_state if ore_write/read fails
      ore: Unlock r4w pages in exact reverse order of locking
      ore: Remove support of partial IO request (NFS crash)
      ore: Fix NFS crash by supporting any unaligned RAID IO
    torvalds committed Jul 20, 2012
  4. @torvalds

    Merge tag 'upstream-3.5-rc8' of git://git.infradead.org/linux-ubifs

    Pull UBIFS free space fix-up bugfix from Artem Bityutskiy:
     "It's been reported already twice recently:
    
        http://lists.infradead.org/pipermail/linux-mtd/2012-May/041408.html
        http://lists.infradead.org/pipermail/linux-mtd/2012-June/042422.html
    
      and we finally have the fix.  I am quite confident the fix is correct
      because I could reproduce the problem with nandsim and verify the fix.
      It was also verified by Iwo (the reporter).
    
      I am also confident that this is OK to merge the fix so late because
      this patch affects only the fixup functionality, which is not used by
      most users."
    
    * tag 'upstream-3.5-rc8' of git://git.infradead.org/linux-ubifs:
      UBIFS: fix a bug in empty space fix-up
    torvalds committed Jul 20, 2012
  5. @kergon

    dm raid1: set discard_zeroes_data_unsupported

    We can't guarantee that REQ_DISCARD on dm-mirror zeroes the data even if
    the underlying disks support zero on discard.  So this patch sets
    ti->discard_zeroes_data_unsupported.
    
    For example, if the mirror is in the process of resynchronizing, it may
    happen that kcopyd reads a piece of data, then discard is sent on the
    same area and then kcopyd writes the piece of data to another leg.
    Consequently, the data is not zeroed.
    
    The flag was made available by commit 983c7db
    (dm crypt: always disable discard_zeroes_data).
    
    Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
    Cc: stable@kernel.org
    Signed-off-by: Alasdair G Kergon <agk@redhat.com>
    Mikulas Patocka committed with kergon Jul 20, 2012