1. 11 Apr, 2012 8 commits
    • Linus Torvalds's avatar
      Merge tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband · f549e088
      Linus Torvalds authored
      Pull infiniband fixes from Roland Dreier:
       "Fix a regression in the /sys/class/infiniband/.../rate attribute --
        old kernels used to just return something, even if the underlying
        value was out-of-bounds, while 3.4-rc1 returned EINVAL to userspace.
        This breaks some applications that check for the error, so go back to
        the old behavior."
      
      * tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
        IB/core: Don't return EINVAL from sysfs rate attribute for invalid speeds
        IB/mlx4: Don't return an invalid speed when a port is down
      f549e088
    • Linus Torvalds's avatar
      Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile · 70f33fa5
      Linus Torvalds authored
      Pull arch/tile fixes from Chris Metcalf:
       "This is one important change from Srivatsa Bhat that got dropped when
        I put together my pull request for -rc2, plus a trivial change to
        remove a compiler warning."
      
      * 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
        arch/tile: avoid unused variable warning in proc.c for tilegx
        tile/CPU hotplug: Add missing call to notify_cpu_starting()
      70f33fa5
    • Linus Torvalds's avatar
      Merge tag 'sound-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · a1ada086
      Linus Torvalds authored
      Pull sound fixes from Takashi Iwai:
       - A series of fixes for Conexant 20549 HD-audio codec chip
       - A workaround for HDMI hotplug debug prints that annoyed people
       - A fix for the new support of platform DAPM contexts
       - Many driver-specific minor fixes
      
      * tag 'sound-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
        ALSA: hda - hide HDMI/ELD printks unless snd.debug=2
        ALSA: sound/isa/sscape.c: add missing resource-release code
        sound: sound/oss/msnd_pinnacle.c: add vfrees
        ALSA: hda - clean up CX20549 test mixer setup
        ALSA: hda - CX20549 doesn't need pin_amp_workaround.
        ALSA: hda - Remove CD control from model=benq for CX20549
        ALSA: hda - fix record volume controls of CX20459 ("Venice")
        ALSA: hda - Rename capture sources of CX20549 to match common conventions
        ALSA: hda - Fix proc output for ADC amp values of CX20549
        ASoC: tegra: fix i2s compilation when !CONFIG_DEBUG_FS
        ASoC: set idle_bias_off=1 for all platform DAPM contexts
        ASoC: imx-audmux: Check for NULL pointer
        ASoC: imx-audmux: Fix ssi port numbers in sysfs
        ASoC: ak4642: fixup: mute needs +1 step
        MAINTAINERS: Don't list everyone working on Wolfson drivers
        MAINTAINERS: Add missing ASoC OMAP co-maintainer
        ASoC: pxa: pxa2xx-i2s: add io.h for IOMEM macro
        ASoC: tegra: ensure clocks are enabled when touching registers
        ASoC: sgtl5000: Enable VAG when DAC/ADC up
        ALSA: asihpi - fix return value of hpios_locked_mem_alloc()
      a1ada086
    • Linus Torvalds's avatar
      Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media · 39f86a60
      Linus Torvalds authored
      Pull media fixes from Mauro Carvalho Chehab:
      
       - dvb core: there is a regression found when used with xine.  For
         whatever unknown reason, xine (and xine-lib clients) wants that the
         frontend to tell what frequency he is using even before the PLL lock
         (or at least, it expects a non-zero frequency).
      
         On DVB, the frequency is only actually known after a frequency
         zig-zag seek, done by the DVB core.  Anyway, the fix was trivial.
         That solves Fedora BZ#808871.
      
       - ivtv: fix a regression when selecting the language channel
      
       - uvc: fix a race-related crash
      
       - it913x: fixes firmware loading
      
       - two trivial patches (a dependency issue at a radio driver at sound
         Kconfig, and a warning fix on dvb).
      
      * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
        [media] uvcvideo: Fix race-related crash in uvc_video_clock_update()
        [media] Drivers/media/radio: Fix build error
        [media] dvb_frontend: fix compiler warning
        [media] it913x: fix firmware loading errors
        [media] ivtv: Fix AUDIO_(BILINGUAL_)CHANNEL_SELECT regression
        [media] dvb_frontend: regression fix: userspace ABI broken for xine
      39f86a60
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes · 1b6150fe
      Linus Torvalds authored
      Pull GFS2 fixes from Steven Whitehouse
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes:
        GFS2: Allow caching of rindex glock
        GFS2: Make sure rindex is uptodate before starting transactions
        GFS2: use depends instead of select in kconfig
        GFS2: put glock reference in error patch of read_rindex_entry
      1b6150fe
    • Chris Metcalf's avatar
      arch/tile: avoid unused variable warning in proc.c for tilegx · e72d5c7e
      Chris Metcalf authored
      Until we push the unaligned access support for tilegx, it's silly
      to have arch/tile/kernel/proc.c generate a warning about an unused
      variable.  Extend the #ifdef to cover all the code and data for now.
      Signed-off-by: default avatarChris Metcalf <cmetcalf@tilera.com>
      e72d5c7e
    • Linus Torvalds's avatar
      x86: merge 32/64-bit versions of 'strncpy_from_user()' and speed it up · 92ae03f2
      Linus Torvalds authored
      This merges the 32- and 64-bit versions of the x86 strncpy_from_user()
      by just rewriting it in C rather than the ancient inline asm versions
      that used lodsb/stosb and had been duplicated for (trivial) differences
      between the 32-bit and 64-bit versions.
      
      While doing that, it also speeds them up by doing the accesses a word at
      a time.  Finally, the new routines also properly handle the case of
      hitting the end of the address space, which we have never done correctly
      before (fs/namei.c has a hack around it for that reason).
      
      Despite all these improvements, it actually removes more lines than it
      adds, due to the de-duplication.  Also, we no longer export (or define)
      the legacy __strncpy_from_user() function (that was defined to not do
      the user permission checks), since it's not actually used anywhere, and
      the user address space checks are built in to the new code.
      
      Other architecture maintainers have been notified that the old hack in
      fs/namei.c will be going away in the 3.5 merge window, in case they
      copied the x86 approach of being a bit cavalier about the end of the
      address space.
      
      Cc: linux-arch@vger.kernel.org
      Cc: Ingo Molnar <mingo@kernel.org>
      Cc: Peter Anvin" <hpa@zytor.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      92ae03f2
    • Oleg Nesterov's avatar
      cred: copy_process() should clear child->replacement_session_keyring · 79549c6d
      Oleg Nesterov authored
      keyctl_session_to_parent(task) sets ->replacement_session_keyring,
      it should be processed and cleared by key_replace_session_keyring().
      
      However, this task can fork before it notices TIF_NOTIFY_RESUME and
      the new child gets the bogus ->replacement_session_keyring copied by
      dup_task_struct(). This is obviously wrong and, if nothing else, this
      leads to put_cred(already_freed_cred).
      
      change copy_creds() to clear this member. If copy_process() fails
      before this point the wrong ->replacement_session_keyring doesn't
      matter, exit_creds() won't be called.
      
      Cc: <stable@vger.kernel.org>
      Signed-off-by: default avatarOleg Nesterov <oleg@redhat.com>
      Acked-by: default avatarDavid Howells <dhowells@redhat.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      79549c6d
  2. 10 Apr, 2012 12 commits
  3. 09 Apr, 2012 13 commits
  4. 08 Apr, 2012 1 commit
  5. 07 Apr, 2012 6 commits