1. 11 Dec, 2012 1 commit
  2. 07 Dec, 2012 1 commit
  3. 28 Nov, 2012 1 commit
    • Will Deacon's avatar
      ARM: 7586/1: sp804: set cpumask to cpu_possible_mask for clock event device · ea3aacf5
      Will Deacon authored
      The SP804 driver statically initialises the cpumask of the clock event
      device to be cpu_all_mask, which is derived from the compile-time
      constant NR_CPUS. This breaks SMP_ON_UP systems where the interrupt
      controller handling the sp804 doesn't have the irq_set_affinity callback
      on the irq_chip, because the common timer code fails to identify the
      device as cpu-local and ends up treating it as a broadcast device
      This patch fixes the problem by using cpu_possible_mask at runtime,
      which will correctly represent the possible CPUs when SMP_ON_UP is being
      Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
      Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
  4. 27 Nov, 2012 14 commits
    • Linus Torvalds's avatar
      Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media · e23739b4
      Linus Torvalds authored
      Pull media fixes from Mauro Carvalho Chehab:
       "For some media fixes:
         - dvb_usb_v2: some fixes at the core
         - Some fixes on some embedded drivers: soc_camera, adv7604, omap3isp,
         - Several Exynos4/5 camera fixes
         - a fix at stv0900 driver
         - a few USB ID additions to detect more variants of rtl28xxu-based
      * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (25 commits)
        [media] rtl28xxu: 0ccd:00d7 TerraTec Cinergy T Stick+
        [media] rtl28xxu: 1d19:1102 Dexatek DK mini DVB-T Dongle
        [media] mt9v022: fix the V4L2_CID_EXPOSURE control
        [media] mx2_camera: fix missing unlock on error in mx2_start_streaming()
        [media] media: omap1_camera: fix const cropping related warnings
        [media] media: mx1_camera: use the default .set_crop() implementation
        [media] media: mx2_camera: fix const cropping related warnings
        [media] media: mx3_camera: fix const cropping related warnings
        [media] media: pxa_camera: fix const cropping related warnings
        [media] media: sh_mobile_ceu_camera: fix const cropping related warnings
        [media] media: sh_vou: fix const cropping related warnings
        [media] adv7604: restart STDI once if format is not found
        [media] adv7604: use presets where possible
        [media] adv7604: Replace prim_mode by mode
        [media] adv7604: cleanup references
        [media] dvb_usb_v2: switch interruptible mutex to normal
        [media] dvb_usb_v2: fix pid_filter callback error logging
        [media] exynos-gsc: change driver compatible string
        [media] omap3isp: Fix warning caused by bad subdev events operations prototypes
        [media] omap3isp: video: Fix warning caused by bad vidioc_s_crop prototype
    • Linus Torvalds's avatar
      Merge branch 'akpm' (Fixes from Andrew) · 2844a487
      Linus Torvalds authored
      Merge misc fixes from Andrew Morton:
       "8 fixes"
      * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (8 patches)
        futex: avoid wake_futex() for a PI futex_q
        watchdog: using u64 in get_sample_period()
        writeback: put unused inodes to LRU after writeback completion
        mm: vmscan: check for fatal signals iff the process was throttled
        Revert "mm: remove __GFP_NO_KSWAPD"
        proc: check vma->vm_file before dereferencing
        UAPI: strip the _UAPI prefix from header guards during header installation
        include/linux/bug.h: fix sparse warning related to BUILD_BUG_ON_INVALID
    • Linus Torvalds's avatar
      Merge tag 'tty-3.7-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty · 5687100a
      Linus Torvalds authored
      Pull TTY fix from Greg Kroah-Hartman:
       "Here is a single fix for a reported regression in 3.7-rc5 for the tty
        layer.  This fix has been in the linux-next tree and solves the
        reported problem.
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org&gt;">
      * tag 'tty-3.7-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
        tty vt: Fix a regression in command line edition
    • Linus Torvalds's avatar
      Merge tag 'mfd-for-linus-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6 · c854539d
      Linus Torvalds authored
      Pull MFD fixes from Samuel Ortiz:
       - A twl fix preventing a buffer overflow.
       - A wm5102 register patch fix.
       - A wm5110 error misreport fix.
       - Arizona fixes: Use the right array size when adding subdevices,
         correctly report underclocked events, synchronize register cache
         after reset.
       - A twl4030 fix for preventing the system to hang from an interrupt
      * tag 'mfd-for-linus-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6:
        mfd: twl4030: Fix chained irq handling on resume from suspend
        mfd: arizona: Sync regcache after reset
        mfd: arizona: Correctly report when AIF2/AIF1 is underclocked
        mfd: arizona: Use correct array for ARRAY_SIZE in mfd_add_devices call
        mfd: wm5110: Disable control interface error report for WM5110 rev B
        mfd: wm5102: Update register patch for latest evaluation
        mfd: twl-core: Fix chip ID for the twl6030-pwm module
    • Linus Torvalds's avatar
      Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm · 33057692
      Linus Torvalds authored
      Pull ARM fixes from Russell King:
       "Not much here, just a couple minor/cosmetic fixes and a patch for the
        decompressor which fixes problems with modern GCC and CPUs."
      * 'fixes' of git://git.linaro.org/people/rmk/linux-arm:
        ARM: 7583/1: decompressor: Enable unaligned memory access for v6 and above
        ARM: 7572/1: proc-v6.S: fix comment
        ARM: 7570/1: quiet down the non make -s output
    • Linus Torvalds's avatar
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs · 87726c33
      Linus Torvalds authored
      Pull ext3 regression fix from Jan Kara:
       "Fix an ext3 regression introduced during 3.7 merge window.  It leads
        to deadlock if you stress the filesystem in the right way (luckily
        only if blocksize < pagesize)."
      * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
        jbd: Fix lock ordering bug in journal_unmap_buffer()
    • Darren Hart's avatar
      futex: avoid wake_futex() for a PI futex_q · aa10990e
      Darren Hart authored
      Dave Jones reported a bug with futex_lock_pi() that his trinity test
      exposed.  Sometime between queue_me() and taking the q.lock_ptr, the
      lock_ptr became NULL, resulting in a crash.
      While futex_wake() is careful to not call wake_futex() on futex_q's with
      a pi_state or an rt_waiter (which are either waiting for a
      futex_unlock_pi() or a PI futex_requeue()), futex_wake_op() and
      futex_requeue() do not perform the same test.
      Update futex_wake_op() and futex_requeue() to test for q.pi_state and
      q.rt_waiter and abort with -EINVAL if detected.  To ensure any future
      breakage is caught, add a WARN() to wake_futex() if the same condition
      is true.
      This fix has seen 3 hours of testing with "trinity -c futex" on an
      x86_64 VM with 4 CPUS.
      [akpm@linux-foundation.org: tidy up the WARN()]
      Signed-off-by: default avatarDarren Hart <dvhart@linux.intel.com>
      Reported-by: default avatarDave Jones <davej@redat.com>
      Cc: Thomas Gleixner <tglx@linutronix.de>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Ingo Molnar <mingo@elte.hu>
      Cc: John Kacur <jkacur@redhat.com>
      Cc: <stable@vger.kernel.org>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    • Chuansheng Liu's avatar
      watchdog: using u64 in get_sample_period() · 8ffeb9b0
      Chuansheng Liu authored
      In get_sample_period(), unsigned long is not enough:
        watchdog_thresh * 2 * (NSEC_PER_SEC / 5)
        watchdog_thresh is 10 by default, the sample value will be: 0xEE6B2800
       set watchdog_thresh is 20, the sample value will be: 0x1 DCD6 5000
      In case2, we need use u64 to express the sample period.  Otherwise,
      changing the threshold thru proc often can not be successful.
      Signed-off-by: default avatarliu chuansheng <chuansheng.liu@intel.com>
      Acked-by: default avatarDon Zickus <dzickus@redhat.com>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    • Jan Kara's avatar
      writeback: put unused inodes to LRU after writeback completion · 4eff96dd
      Jan Kara authored
      Commit 169ebd90
       ("writeback: Avoid iput() from flusher thread")
      removed iget-iput pair from inode writeback.  As a side effect, inodes
      that are dirty during iput_final() call won't be ever added to inode LRU
      (iput_final() doesn't add dirty inodes to LRU and later when the inode
      is cleaned there's noone to add the inode there).  Thus inodes are
      effectively unreclaimable until someone looks them up again.
      The practical effect of this bug is limited by the fact that inodes are
      pinned by a dentry for long enough that the inode gets cleaned.  But
      still the bug can have nasty consequences leading up to OOM conditions
      under certain circumstances.  Following can easily reproduce the
        for (( i = 0; i < 1000; i++ )); do
          mkdir $i
          for (( j = 0; j < 1000; j++ )); do
            touch $i/$j
            echo 2 > /proc/sys/vm/drop_caches
      then one needs to run 'sync; ls -lR' to make inodes reclaimable again.
      We fix the issue by inserting unused clean inodes into the LRU after
      writeback finishes in inode_sync_complete().
      Signed-off-by: default avatarJan Kara <jack@suse.cz>
      Reported-by: default avatarOGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
      Cc: Al Viro <viro@zeniv.linux.org.uk>
      Cc: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
      Cc: Wu Fengguang <fengguang.wu@intel.com>
      Cc: Dave Chinner <david@fromorbit.com>
      Cc: <stable@vger.kernel.org>		[3.5+]
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    • Mel Gorman's avatar
      mm: vmscan: check for fatal signals iff the process was throttled · 50694c28
      Mel Gorman authored
      Commit 5515061d
       ("mm: throttle direct reclaimers if PF_MEMALLOC
      reserves are low and swap is backed by network storage") introduced a
      check for fatal signals after a process gets throttled for network
      storage.  The intention was that if a process was throttled and got
      killed that it should not trigger the OOM killer.  As pointed out by
      Minchan Kim and David Rientjes, this check is in the wrong place and too
      broad.  If a system is in am OOM situation and a process is exiting, it
      can loop in __alloc_pages_slowpath() and calling direct reclaim in a
      loop.  As the fatal signal is pending it returns 1 as if it is making
      forward progress and can effectively deadlock.
      This patch moves the fatal_signal_pending() check after throttling to
      throttle_direct_reclaim() where it belongs.  If the process is killed
      while throttled, it will return immediately without direct reclaim
      except now it will have TIF_MEMDIE set and will use the PFMEMALLOC
      Minchan pointed out that it may be better to direct reclaim before
      returning to avoid using the reserves because there may be pages that
      can easily reclaim that would avoid using the reserves.  However, we do
      no such targetted reclaim and there is no guarantee that suitable pages
      are available.  As it is expected that this throttling happens when
      swap-over-NFS is used there is a possibility that the process will
      instead swap which may allocate network buffers from the PFMEMALLOC
      reserves.  Hence, in the swap-over-nfs case where a process can be
      throtted and be killed it can use the reserves to exit or it can
      potentially use reserves to swap a few pages and then exit.  This patch
      takes the option of using the reserves if necessary to allow the process
      exit quickly.
      If this patch passes review it should be considered a -stable candidate
      for 3.6.
      Signed-off-by: default avatarMel Gorman <mgorman@suse.de>
      Cc: David Rientjes <rientjes@google.com>
      Cc: Luigi Semenzato <semenzato@google.com>
      Cc: Dan Magenheimer <dan.magenheimer@oracle.com>
      Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
      Cc: Sonny Rao <sonnyrao@google.com>
      Cc: Minchan Kim <minchan@kernel.org>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    • Mel Gorman's avatar
      Revert "mm: remove __GFP_NO_KSWAPD" · 82b212f4
      Mel Gorman authored
      With "mm: vmscan: scale number of pages reclaimed by reclaim/compaction
      based on failures" reverted, Zdenek Kabelac reported the following
        Hmm,  so it's just took longer to hit the problem and observe
        kswapd0 spinning on my CPU again - it's not as endless like before -
        but still it easily eats minutes - it helps to	turn off  Firefox
        or TB  (memory hungry apps) so kswapd0 stops soon - and restart
        those apps again.  (And I still have like >1GB of cached memory)
        kswapd0         R  running task        0    30      2 0x00000000
        Call Trace:
      The sysrq+m indicates the system has no swap so it'll never reclaim
      anonymous pages as part of reclaim/compaction.  That is one part of the
      problem but not the root cause as file-backed pages could also be
      The likely underlying problem is that kswapd is woken up or kept awake
      for each THP allocation request in the page allocator slow path.
      If compaction fails for the requesting process then compaction will be
      deferred for a time and direct reclaim is avoided.  However, if there
      are a storm of THP requests that are simply rejected, it will still be
      the the case that kswapd is awake for a prolonged period of time as
      pgdat->kswapd_max_order is updated each time.  This is noticed by the
      main kswapd() loop and it will not call kswapd_try_to_sleep().  Instead
      it will loopp, shrinking a small number of pages and calling
      shrink_slab() on each iteration.
      The temptation is to supply a patch that checks if kswapd was woken for
      THP and if so ignore pgdat->kswapd_max_order but it'll be a hack and not
      backed up by proper testing.  As 3.7 is very close to release and this
      is not a bug we should release with, a safer path is to revert "mm:
      remove __GFP_NO_KSWAPD" for now and revisit it with the view to ironing
      out the balance_pgdat() logic in general.
      Signed-off-by: default avatarMel Gorman <mgorman@suse.de>
      Cc: Zdenek Kabelac <zkabelac@redhat.com>
      Cc: Seth Jennings <sjenning@linux.vnet.ibm.com>
      Cc: Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
      Cc: Jiri Slaby <jirislaby@gmail.com>
      Cc: Rik van Riel <riel@redhat.com>
      Cc: Robert Jennings <rcj@linux.vnet.ibm.com>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    • Stanislav Kinsbursky's avatar
      proc: check vma->vm_file before dereferencing · 05f56484
      Stanislav Kinsbursky authored
      Commit 7b540d06
       ("proc_map_files_readdir(): don't bother with
      grabbing files") switched proc_map_files_readdir() to use @f_mode
      directly instead of grabbing @file reference, but same time the test for
      @vm_file presence was lost leading to nil dereference.  The patch brings
      the test back.
      The all proc_map_files feature is CONFIG_CHECKPOINT_RESTORE wrapped
      (which is set to 'n' by default) so the bug doesn't affect regular
      The regression is 3.7-rc1 only as far as I can tell.
      [gorcunov@openvz.org: provided changelog]
      Signed-off-by: default avatarStanislav Kinsbursky <skinsbursky@parallels.com>
      Acked-by: default avatarCyrill Gorcunov <gorcunov@openvz.org>
      Cc: Al Viro <viro@zeniv.linux.org.uk>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    • David Howells's avatar
      UAPI: strip the _UAPI prefix from header guards during header installation · 56c176c9
      David Howells authored
      Strip the _UAPI prefix from header guards during header installation so
      that any userspace dependencies aren't affected.  glibc, for example,
      checks for linux/types.h, linux/kernel.h, linux/compiler.h and
      linux/list.h by their guards - though the last two aren't actually
        libtool: compile:  gcc -std=gnu99 -DHAVE_CONFIG_H -I. -Wall -Werror -Wformat -Wformat-security -D_FORTIFY_SOURCE=2 -fno-delete-null-pointer-checks -fstack-protector -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -m32 -march=i686 -mtune=atom -fasynchronous-unwind-tables -c child.c  -fPIC -DPIC -o .libs/child.o
        In file included from cli.c:20:0:
        common.h:152:8: error: redefinition of 'struct sysinfo'
        In file included from /usr/include/linux/kernel.h:4:0,
        		 from /usr/include/linux/sysctl.h:25,
        		 from /usr/include/sys/sysctl.h:43,
        		 from common.h:50,
        		 from cli.c:20:
        /usr/include/linux/sysinfo.h:7:8: note: originally defined here
      Reported-by: default avatarTomasz Torcz <tomek@pipebreaker.pl>
      Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
      Acked-by: default avatarJosh Boyer <jwboyer@redhat.com>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    • Tushar Behera's avatar
      include/linux/bug.h: fix sparse warning related to BUILD_BUG_ON_INVALID · c5782e9f
      Tushar Behera authored
      Commit baf05aa9
       ("bug: introduce BUILD_BUG_ON_INVALID() macro")
      introduces this macro only when _CHECKER_ is not defined.  Define a
      silent macro in the else condition to fix following sparse warning:
        mm/filemap.c:395:9: error: undefined identifier 'BUILD_BUG_ON_INVALID'
        mm/filemap.c:396:9: error: undefined identifier 'BUILD_BUG_ON_INVALID'
        mm/filemap.c:397:9: error: undefined identifier 'BUILD_BUG_ON_INVALID'
        include/linux/mm.h:419:9: error: undefined identifier 'BUILD_BUG_ON_INVALID'
        include/linux/mm.h:419:9: error: not a function <noident>
      Signed-off-by: default avatarTushar Behera <tushar.behera@linaro.org>
      Acked-by: default avatarKonstantin Khlebnikov <khlebnikov@openvz.org>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
  5. 26 Nov, 2012 3 commits
  6. 25 Nov, 2012 1 commit
  7. 24 Nov, 2012 4 commits
    • Linus Torvalds's avatar
      Merge tag 'sound-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · 194d9831
      Linus Torvalds authored
      Pull sound build error fix from Takashi Iwai:
       "Only a single commit for fixing the build error without CONFIG_PM in
        hda driver."
      * tag 'sound-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
        ALSA: hda - Fix build without CONFIG_PM
    • Takashi Iwai's avatar
      ALSA: hda - Fix build without CONFIG_PM · d846b174
      Takashi Iwai authored
      I forgot this again...  codec->in_pm is in #ifdef CONFIG_PM
      Reported-by: default avatarMarkus Trippelsdorf <markus@trippelsdorf.de>
      Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
    • Linus Torvalds's avatar
      Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 2654ad44
      Linus Torvalds authored
      Pull x86 arch fixes from Peter Anvin:
       "Here is a collection of fixes for 3.7-rc7.  This is a superset of
        tglx' earlier pull request."
      * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86-64: Fix ordering of CFI directives and recent ASM_CLAC additions
        x86, microcode, AMD: Add support for family 16h processors
        x86-32: Export kernel_stack_pointer() for modules
        x86-32: Fix invalid stack address while in softirq
        x86, efi: Fix processor-specific memcpy() build error
        x86: remove dummy long from EFI stub
        x86, mm: Correct vmflag test for checking VM_HUGETLB
        x86, amd: Disable way access filter on Piledriver CPUs
        x86/mce: Do not change worker's running cpu in cmci_rediscover().
        x86/ce4100: Fix PCI configuration register access for devices without interrupts
        x86/ce4100: Fix reboot by forcing the reboot method to be KBD
        x86/ce4100: Fix pm_poweroff
        MAINTAINERS: Update email address for Robert Richter
        x86, microcode_amd: Change email addresses, MAINTAINERS entry
        MAINTAINERS: Change Boris' email address
        EDAC: Change Boris' email address
        x86, AMD: Change Boris' email address
    • Linus Torvalds's avatar
      Merge tag 'for-linus-20121123' of git://git.infradead.org/mtd-2.6 · 35f95d22
      Linus Torvalds authored
      Pull MTD fixes from David Woodhouse:
       "The most important part of this is that it fixes a regression in
        Samsung NAND chip detection, introduced by some rework which went into
        3.7.  The initial fix wasn't quite complete, so it's in two parts.  In
        fact the first part is committed twice (Artem committed his own copy
        of the same patch) and I've merged Artem's tree into mine which
        already had that fix.
        I'd have recommitted that to make it somewhat cleaner, but figured by
        this point in the release cycle it was better to merge *exactly* the
        commits which have been in linux-next.
        If I'd recommitted, I'd also omit the sparse warning fix.  But it's
        there, and it's harmless — just marking one function as 'static' in
        onenand code.
        This also includes a couple more fixes for stable: an AB-BA deadlock
        in JFFS2, and an invalid range check in slram."
      * tag 'for-linus-20121123' of git://git.infradead.org/mtd-2.6:
        mtd: nand: fix Samsung SLC detection regression
        mtd: nand: fix Samsung SLC NAND identification regression
        jffs2: Fix lock acquisition order bug in jffs2_write_begin
        mtd: onenand: Make flexonenand_set_boundary static
        mtd: slram: invalid checking of absolute end address
        mtd: ofpart: Fix incorrect NULL check in parse_ofoldpart_partitions()
        mtd: nand: fix Samsung SLC NAND identification regression
  8. 23 Nov, 2012 15 commits
    • Linus Torvalds's avatar
      Merge tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux-2.6 · 5e351cdc
      Linus Torvalds authored
      Pull device tree regression fix from Grant Likely:
       "Simple build regression fix for DT device drivers on Sparc.  An
        earlier change had masked out the of_iomap() helper on SPARC."
      * tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux-2.6:
        of/address: sparc: Declare of_iomap as an extern function for sparc again
    • Linus Torvalds's avatar
      Merge tag 'pm-for-3.7-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · a0543d64
      Linus Torvalds authored
      Pull power management update from Rafael Wysocki:
       "Fix for an incorrect error condition check in device PM QoS code that
        may lead to an Oops from Guennadi Liakhovetski."
      * tag 'pm-for-3.7-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        PM / QoS: fix wrong error-checking condition
    • Linus Torvalds's avatar
      Merge tag 'md-3.7-fixes' of git://neil.brown.name/md · 1d838d70
      Linus Torvalds authored
      Pull md fixes from NeilBrown:
       "Several bug fixes for md in 3.7:
         - raid5 discard has problems
         - raid10 replacement devices have problems
         - bad block lock seqlock usage has problems
         - dm-raid doesn't free everything"
      * tag 'md-3.7-fixes' of git://neil.brown.name/md:
        md/raid10: decrement correct pending counter when writing to replacement.
        md/raid10: close race that lose writes lost when replacement completes.
        md/raid5: Make sure we clear R5_Discard when discard is finished.
        md/raid5: move resolving of reconstruct_state earlier in stripe_handle.
        md/raid5: round discard alignment up to power of 2.
        md: make sure everything is freed when dm-raid stops an array.
        md: Avoid write invalid address if read_seqretry returned true.
        md: Reassigned the parameters if read_seqretry returned true in func md_is_badblock.
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.dk/linux-block · a8946afe
      Linus Torvalds authored
      Pull block layer fixes from Jens Axboe:
       "Distilled down version of bug fixes for 3.7.  The patches have been
        well tested.  If you notice that commit dates are from today, it's
        because I pulled less important bits out and shuffled them into the
        3.8 mix.  Apart from that, no changes, base still the same.
        It contains:
         - Fix for aoe, don't run request_fn while it's plugged.
         - Fix for a regression in floppy since 3.6, which causes problems if
           no floppy is found.
         - Stable fix for blk_exec(), don't touch a request after it has been
           sent to the scheduler (and the device as well).
         - Five fixes for various nasties in mtip32xx."
      * 'for-linus' of git://git.kernel.dk/linux-block:
        block: Don't access request after it might be freed
        mtip32xx: Fix padding issue
        aoe: avoid running request handler on plugged queue
        mtip32xx: fix potential NULL pointer dereference in mtip_timeout_function()
        mtip32xx: fix shift larger than type warning
        mtip32xx: Fix incorrect mask used for erase mode
        mtip32xx: Fix to make lba address correct in big-endian systems
        mtip32xx: fix potential crash on SEC_ERASE_UNIT
        dm: fix deadlock with request based dm and queue request_fn recursion
        floppy: destroy floppy workqueue before cleaning up the queue
    • Andreas Larsson's avatar
      of/address: sparc: Declare of_iomap as an extern function for sparc again · 0e622d39
      Andreas Larsson authored and Grant Likely's avatar Grant Likely committed
      This bug-fix makes sure that of_iomap is defined extern for sparc so that the
      sparc-specific implementation of_iomap is once again used when including
      include/linux/of_address.h in a sparc context. OF_GPIO that is now available for
      sparc relies on this.
      The bug was inadvertently introduced in a850a755, "of/address: add empty static
      inlines for !CONFIG_OF", that added a static dummy inline for of_iomap when
      !CONFIG_OF_ADDRESS. However, CONFIG_OF_ADDRESS is never defined for sparc, but
      there is a sparc-specific implementation /arch/sparc/kernel/of_device_common.c.
      This fix takes the same approach as 0bce04be
       that solved the equivalent problem
      for of_address_to_resource.
      Signed-off-by: default avatarAndreas Larsson <andreas@gaisler.com>
      Acked-by: default avatarDavid Miller <davem@davemloft.net>
      Signed-off-by: Grant Likely's avatarGrant Likely <grant.likely@secretlab.ca>
    • Linus Torvalds's avatar
      Merge tag 'omapdss-for-3.7-rc' of git://gitorious.org/linux-omap-dss2/linux · f789dcc7
      Linus Torvalds authored
      Pull omapdss fixes from Tomi Valkeinen:
       "Here are a few OMAPDSS fixes for the next -rc.  I'm sending these
        directly to you, and quite late, as the fbdev tree maintainer
        (Florian) has been busy with his work and hasn't had time to manage
        the fb patches."
      * tag 'omapdss-for-3.7-rc' of git://gitorious.org/linux-omap-dss2/linux:
        OMAPDSS: do not fail if dpll4_m4_ck is missing
        OMAPFB: Fix possible null pointer dereferencing
        OMAPDSS: HDMI: fix missing unlock on error in hdmi_dump_regs()
        omapdss: dss: Fix clocks on OMAP363x
        OMAPDSS: DSI: fix dsi_get_dsidev_from_id()
    • Linus Torvalds's avatar
      Merge branch 'i2c-embedded/for-current' of git://git.pengutronix.de/git/wsa/linux · 33f14593
      Linus Torvalds authored
      Pull i2c fixes from Wolfram Sang:
       "Bugfixes for the i2c subsystem.
        Except for a few one-liners, there is mainly one revert because of an
        overlooked dependency.  Since there is no linux-next at the moment, I
        did some extra testing, and all was fine for me."
      * 'i2c-embedded/for-current' of git://git.pengutronix.de/git/wsa/linux:
        i2c: mxs: Handle i2c DMA failure properly
        i2c: s3c2410: Fix code to free gpios
        i2c: omap: ensure writes to dev->buf_len are ordered
        Revert "ARM: OMAP: convert I2C driver to PM QoS for MPU latency constraints"
        i2c: at91: fix SMBus quick command
    • Linus Torvalds's avatar
      Merge tag 'sound-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · f470b8c2
      Linus Torvalds authored
      Pull sound fixes from Takashi Iwai:
       "The highlight of this update is the fixes for ASoC kirkwood by
        Russell.  In addition to that, a couple of regression fixes for
        HD-audio due to the runtime PM support on 3.7, and other driver-
        specific regression fixes like USB MIDI on non-standard USB audio
      * tag 'sound-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
        ALSA: snd-usb: properly initialize the sync endpoint
        ALSA: hda - Cirrus: Correctly clear line_out_pins when moving to speaker
        ALSA: hda - Add support for Realtek ALC292
        ASoC: kirkwood-i2s: more pause-mode fixes
        ASoC: kirkwood-i2s: fix DMA underruns
        ASoC: kirkwood-i2s: fix DCO lock detection
        ASoC: kirkwood-dma: don't ignore other irq causes on error
        ASoC: kirkwood-dma: fix use of virt_to_phys()
        ALSA: hda - Limit runtime PM support only to known Intel chips
        ALSA: hda - Fix recursive suspend/resume call
        ALSA: ua101, usx2y: fix broken MIDI output
        ASoC: arizona: Fix typo - Swap value in 48k_rates[] and 44k1_rates[]
        ASoC: bells: Fix up git patch application failure
        ASoC: cs4271: free allocated GPIO
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · eb5aaedd
      Linus Torvalds authored
      Pull networkign fixes from David Miller:
       "Networking bug fixes, Cacio e Pepe edition:
        1) BNX2X accidently accesses chip rev specific registers without an
           appropriate guard, fix from Ariel Elior.
        2) When we removed the routing cache, we set ip_rt_max_size to ~0 just
           to keep reporting a value to userspace via sysfs.  But the ipv4
           IPSEC layer was using this to tune itself which is completely bogus
           to now do.  Fix from Steffen Klassert.
        3) Missing initialization in netfilter ipset code from Jozsef
        4) Check CTA_TIMEOUT_NAME length properly in netfilter cttimeout code,
           fix from Florian Westphal.
        5) After removing the routing cache, we inadvertantly are caching
           multicast routes that end up looping back locally, we cannot do
           that legitimately any more.  Fix from Julian Anastasov.
        6) Revert a race fix for 8139cp qemu/kvm that doesn't actually work
           properly on real hardware.  From Francois Romieu.
        7) Fixup errors in example command lines in VXLAN device docs."
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
        bnx2x: remove redundant warning log
        vxlan: fix command usage in its doc
        8139cp: revert "set ring address before enabling receiver"
        ipv4: do not cache looped multicasts
        netfilter: cttimeout: fix buffer overflow
        netfilter: ipset: Fix range bug in hash:ip,port,net
        xfrm: Fix the gc threshold value for ipv4
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc · f3a443af
      Linus Torvalds authored
      Pull sparc fix from David Miller:
       "Bug fix from Al Viro"
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
        sparc64: not any error from do_sigaltstack() should fail rt_sigreturn()
    • Linus Torvalds's avatar
      Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 45aaff06
      Linus Torvalds authored
      Pull one more ARM SoC fix from Olof Johansson:
       "I missed one pull request from Samsung with one fix in the previous
        batch.  Here it is -- a dma driver fix for an early version of silicon
        that they still support."
      * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
        ARM: EXYNOS: PL330 MDMA1 fix for revision 0 of Exynos4210 SOC
    • Guennadi Liakhovetski's avatar
      PM / QoS: fix wrong error-checking condition · a7227a0f
      Guennadi Liakhovetski authored
      dev_pm_qos_add_request() can return 0, 1, or a negative error code,
      therefore the correct error test is "if (error < 0)." Checking just for
      non-zero return code leads to erroneous setting of the req->dev pointer
      to NULL, which then leads to a repeated call to
      dev_pm_qos_add_ancestor_request() in st1232_ts_irq_handler(). This in turn
      leads to an Oops, when the I2C host adapter is unloaded and reloaded again
      because of the inconsistent state of its QoS request list.
      Signed-off-by: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
      Cc: <stable@vger.kernel.org>
      Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
    • Ariel Elior's avatar
      bnx2x: remove redundant warning log · 4a25417c
      Ariel Elior authored
      fix bug where a register which was only meant to be read in 578xx/57712
      devices causes a bogus error message to be logged when read from other
      Signed-off-by: default avatarAriel Elior <ariele@broadcom.com>
      Signed-off-by: default avatarEilon Greenstein <eilong@broadcom.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
    • Zhi Yong Wu's avatar
      vxlan: fix command usage in its doc · cc9b3101
      Zhi Yong Wu authored
        Some commands don't work in its example doc. The patch will fix it.
      Signed-off-by: default avatarZhi Yong Wu <wuzhy@linux.vnet.ibm.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
    • françois romieu's avatar
      8139cp: revert "set ring address before enabling receiver" · b26623da
      françois romieu authored
      This patch reverts b01af457.
      The original patch was tested with emulated hardware. Real
      hardware chokes.
      Fixes https://bugzilla.kernel.org/show_bug.cgi?id=47041
      Signed-off-by: default avatarFrancois Romieu <romieu@fr.zoreil.com>
      Acked-by: default avatarJeff Garzik <jgarzik@redhat.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>