Merge branch 'driver-core-next' into cgroup/for-3.15
Pending kernfs conversion depends on kernfs improvements in
driver-core-next. Pull it into for-3.15.
Signed-off-by: 
Tejun Heo <tj@kernel.org>
No related branches found
No related tags found
Showing
- arch/s390/include/asm/ccwgroup.h 1 addition, 0 deletionsarch/s390/include/asm/ccwgroup.h
- arch/s390/pci/pci_sysfs.c 8 additions, 10 deletionsarch/s390/pci/pci_sysfs.c
- drivers/base/core.c 17 additions, 33 deletionsdrivers/base/core.c
- drivers/base/dma-buf.c 11 additions, 7 deletionsdrivers/base/dma-buf.c
- drivers/gpu/drm/drm_prime.c 1 addition, 1 deletiondrivers/gpu/drm/drm_prime.c
- drivers/gpu/drm/exynos/exynos_drm_dmabuf.c 1 addition, 1 deletiondrivers/gpu/drm/exynos/exynos_drm_dmabuf.c
- drivers/media/v4l2-core/videobuf2-dma-contig.c 1 addition, 1 deletiondrivers/media/v4l2-core/videobuf2-dma-contig.c
- drivers/pci/pci-sysfs.c 3 additions, 14 deletionsdrivers/pci/pci-sysfs.c
- drivers/s390/block/dcssblk.c 7 additions, 7 deletionsdrivers/s390/block/dcssblk.c
- drivers/s390/cio/ccwgroup.c 16 additions, 10 deletionsdrivers/s390/cio/ccwgroup.c
- drivers/scsi/scsi_sysfs.c 2 additions, 13 deletionsdrivers/scsi/scsi_sysfs.c
- fs/Kconfig 1 addition, 0 deletionsfs/Kconfig
- fs/Makefile 2 additions, 1 deletionfs/Makefile
- fs/kernfs/Kconfig 7 additions, 0 deletionsfs/kernfs/Kconfig
- fs/kernfs/dir.c 554 additions, 200 deletionsfs/kernfs/dir.c
- fs/kernfs/file.c 32 additions, 23 deletionsfs/kernfs/file.c
- fs/kernfs/kernfs-internal.h 3 additions, 11 deletionsfs/kernfs/kernfs-internal.h
- fs/kernfs/mount.c 37 additions, 0 deletionsfs/kernfs/mount.c
- fs/kernfs/symlink.c 1 addition, 5 deletionsfs/kernfs/symlink.c
- fs/sysfs/Kconfig 1 addition, 0 deletionsfs/sysfs/Kconfig
Loading
Please register or sign in to comment