1. 18 Dec, 2013 2 commits
    • Linus Torvalds's avatar
      Merge branch 'keys-devel' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs · a81bddde
      Linus Torvalds authored
      Pull crypto key patches from David Howells:
       "There are four items:
      
         - A patch to fix X.509 certificate gathering.  The problem was that I
           was coming up with a different path for signing_key.x509 in the
           build directory if it didn't exist to if it did exist.  This meant
           that the X.509 cert container object file would be rebuilt on the
           second rebuild in a build directory and the kernel would get
           relinked.
      
         - Unconditionally remove files generated by SYSTEM_TRUSTED_KEYRING=y
           when doing make mrproper.
      
         - Actually initialise the persistent-keyring semaphore for
           init_user_ns.  I have no idea why this works at all for users in
           the base user namespace unless it's something to do with systemd
           containerising the system.
      
         - Documentation for module signing"
      
      * 'keys-devel' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs:
        Add Documentation/module-signing.txt file
        KEYS: fix uninitialized persistent_keyring_register_sem
        KEYS: Remove files generated when SYSTEM_TRUSTED_KEYRING=y
        X.509: Fix certificate gathering
      a81bddde
    • Linus Torvalds's avatar
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · 35eecf05
      Linus Torvalds authored
      Pull drm fixes from Dave Airlie:
       "Definitely seems quieter this week,
      
        Radeon, intel, intel broadwell, vmwgfx, ttm, armada, and a couple of
        core fixes, one revert in radeon
      
        Most of these are either going to stable or fixes for things
        introduced in the merge window"
      
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: (30 commits)
        drm/edid: add quirk for BPC in Samsung NP700G7A-S01PL notebook
        drm/ttm: Fix accesses through vmas with only partial coverage
        drm/nouveau: only runtime suspend by default in optimus configuration
        drm: don't double-free on driver load error
        Revert "drm/radeon: Implement radeon_pci_shutdown"
        drm/radeon: add missing display tiling setup for oland
        drm/radeon: fix typo in cik_copy_dma
        drm/radeon/cik: plug in missing blit callback
        drm/radeon/dpm: Fix hwmon crash
        drm/radeon: Fix sideport problems on certain RS690 boards
        drm/i915: don't update the dri1 breadcrumb with modesetting
        DRM: Armada: prime refcounting bug fix
        DRM: Armada: fix printing of phys_addr_t/dma_addr_t
        DRM: Armada: destroy framebuffer after helper
        DRM: Armada: implement lastclose() for fbhelper
        drm/i915: Repeat eviction search after idling the GPU
        drm/vmwgfx: Add max surface memory param
        drm/i915: Fix use-after-free in do_switch
        drm/i915: fix pm init ordering
        drm/i915: Hold mutex across i915_gem_release
        ...
      35eecf05
  2. 17 Dec, 2013 31 commits
  3. 16 Dec, 2013 4 commits
  4. 15 Dec, 2013 3 commits
    • Linus Torvalds's avatar
      Linux 3.13-rc4 · 319e2e3f
      Linus Torvalds authored
      319e2e3f
    • Matias Bjorling's avatar
      null_blk: mem garbage on NUMA systems during init · 57053d8c
      Matias Bjorling authored
      For NUMA systems, initializing the blk-mq layer and using per node hctx.
      We initialize submit queues to 1, while blk-mq nr_hw_queues is
      initialized to the number of NUMA nodes.
      
      This makes the null_init_hctx function overwrite memory outside of what
      it allocated.  In my case it lead to writing garbage into struct
      request_queue's mq_map.
      Signed-off-by: default avatarMatias Bjorling <m@bjorling.me>
      Cc: Jens Axboe <axboe@kernel.dk>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      57053d8c
    • Sergey Senozhatsky's avatar
      radeon_pm: fix oops in hwmon_attributes_visible() and radeon_hwmon_show_temp_thresh() · e4158f1b
      Sergey Senozhatsky authored
      Since commit ec39f64b ("drm/radeon/dpm: Convert to use
      devm_hwmon_register_with_groups") radeon_hwmon_init() is using
      hwmon_device_register_with_groups(), which sets `rdev' as a device
      private driver_data, while hwmon_attributes_visible() and
      radeon_hwmon_show_temp_thresh() are still waiting for `drm_device'.
      
      Fix them by using dev_get_drvdata(), in order to avoid this oops:
      
        BUG: unable to handle kernel paging request at 0000000000001e28
        IP: [<ffffffffa02ae8b4>] hwmon_attributes_visible+0x18/0x3d [radeon]
        PGD 15057e067 PUD 151a8e067 PMD 0
        Oops: 0000 [#1] PREEMPT SMP
        Call Trace:
          internal_create_group+0x114/0x1d9
          sysfs_create_group+0xe/0x10
          sysfs_create_groups+0x22/0x5f
          device_add+0x34f/0x501
          device_register+0x15/0x18
          hwmon_device_register_with_groups+0xb5/0xed
          radeon_hwmon_init+0x56/0x7c [radeon]
          radeon_pm_init+0x134/0x7e5 [radeon]
          radeon_modeset_init+0x75f/0x8ed [radeon]
          radeon_driver_load_kms+0xc6/0x187 [radeon]
          drm_dev_register+0xf9/0x1b4 [drm]
          drm_get_pci_dev+0x98/0x129 [drm]
          radeon_pci_probe+0xa3/0xac [radeon]
          pci_device_probe+0x6e/0xcf
          driver_probe_device+0x98/0x1c4
          __driver_attach+0x5c/0x7e
          bus_for_each_dev+0x7b/0x85
          driver_attach+0x19/0x1b
          bus_add_driver+0x104/0x1ce
          driver_register+0x89/0xc5
          __pci_register_driver+0x58/0x5b
          drm_pci_init+0x86/0xea [drm]
          radeon_init+0x97/0x1000 [radeon]
          do_one_initcall+0x7f/0x117
          load_module+0x1583/0x1bb4
          SyS_init_module+0xa0/0xaf
      Signed-off-by: default avatarSergey Senozhatsky <sergey.senozhatsky@gmail.com>
      Cc: Borislav Petkov <bp@alien8.de>
      Cc: Alexander Deucher <Alexander.Deucher@amd.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      e4158f1b