1. 19 12月, 2013 3 次提交
    • L
      Merge tag 'staging-3.13-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging · 1aba038b
      Linus Torvalds 提交于
      Pull staging driver fixes from Greg KH:
       "Here are a number of staging, and iio, fixes for 3.13-rc5 that resolve
        some reported issues"
      
      * tag 'staging-3.13-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
        imx-drm: imx-drm-core: improve safety of imx_drm_add_crtc()
        imx-drm: imx-drm-core: make imx_drm_crtc_register() safer
        imx-drm: imx-drm-core: use defined constant for number of CRTCs.
        imx-drm: imx-tve: don't call sleeping functions beneath enable_lock spinlock
        imx-drm: ipu-v3: fix potential CRTC device registration race
        imx-drm: imx-drm-core: fix DRM cleanup paths
        imx-drm: imx-drm-core: fix error cleanup path for imx_drm_add_crtc()
        staging: comedi: drivers: fix return value of comedi_load_firmware()
        staging: comedi: 8255_pci: fix for newer PCI-DIO48H
        iio:adc:ad7887 Fix channel reported endianness from cpu to big endian
        iio:imu:adis16400 fix pressure channel scan type
        staging:iio:mag:hmc5843 fix incorrect endianness of channel as a result of missuse of the IIO_ST macro.
        iio: cm36651: Changed return value of read function
      1aba038b
    • L
      Merge tag 'driver-core-3.13-rc5' of... · 2516b615
      Linus Torvalds 提交于
      Merge tag 'driver-core-3.13-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
      
      Pull driver core fix from Greg KH:
       "Here's a single sysfs fix for 3.13-rc5 that resolves a lockdep issue
        in sysfs that has been reported"
      
      * tag 'driver-core-3.13-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
        sysfs: give different locking key to regular and bin files
      2516b615
    • L
      Merge branch 'keys-devel' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs · a81bddde
      Linus Torvalds 提交于
      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
  2. 18 12月, 2013 37 次提交
新手
引导
客服 返回
顶部