shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 03:40:35 +09:00
Code Issues Packages Projects Releases Wiki Activity
Files
869d6f07523379689a1d1186fc8a54bfa13ba5f8
linux/fs
History
Greg Kroah-Hartman 869d6f0752 ANDROID: fix up fscrypt merge to build properly 
Ok, that what's I get for celebrating too early...

Fixes: 7f08695198 ("Merge 7c7fdaf6ad ("Merge tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt") into android-mainline")
Cc: Eric Biggers <ebiggers@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I16632cc19377041ab96e9d873d061199d1eb4556
2020-12-15 14:24:40 +01:00
..
9p
Merge 5.10-rc7 into android-mainline
2020-12-09 08:09:26 +01:00
adfs
Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2020-10-24 12:26:05 -07:00
affs
Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2020-10-24 12:26:05 -07:00
afs
Merge a68a0262ab ("mm/madvise: remove racy mm ownership check") into android-mainline
2020-12-10 11:34:58 +01:00
autofs
autofs: harden ioctl table
2020-10-16 11:11:22 -07:00
befs
[PATCH] reduce boilerplate in fsid handling
2020-09-18 16:45:50 -04:00
bfs
[PATCH] reduce boilerplate in fsid handling
2020-09-18 16:45:50 -04:00
btrfs
Merge c84e1efae0 ("Merge tag 'asm-generic-fixes-5.10-2' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic") into android-mainline
2020-11-28 08:23:09 +01:00
cachefiles
FROMLIST: cachefiles: Handle readpage error correctly
2020-10-28 15:11:54 +01:00
ceph
Merge 5.10-rc3 into android-mainline
2020-11-09 12:49:27 +01:00
cifs
Merge 5.10-rc7 into android-mainline
2020-12-09 08:09:26 +01:00
coda
docs: filesystems: convert coda.txt to ReST
2020-05-05 09:22:21 -06:00
configfs
fs: configfs: delete repeated words in comments
2020-10-16 11:11:19 -07:00
cramfs
[PATCH] reduce boilerplate in fsid handling
2020-09-18 16:45:50 -04:00
crypto
ANDROID: fix up fscrypt merge to build properly
2020-12-15 14:24:40 +01:00
debugfs
debugfs: remove return value of debugfs_create_devm_seqfile()
2020-10-30 08:37:39 +01:00
devpts
…
dlm
Merge tag 'net-next-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next
2020-10-15 18:42:13 -07:00
ecryptfs
Merge 449dc8c970 ("Merge tag 'for-v5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply") into android-mainline
2020-08-08 13:07:20 +02:00
efivarfs
efivarfs: revert "fix memory leak in efivarfs_create()"
2020-11-25 16:55:02 +01:00
efs
[PATCH] reduce boilerplate in fsid handling
2020-09-18 16:45:50 -04:00
erofs
Merge eccc876724 ("Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs") into android-mainline
2020-11-12 08:02:21 +01:00
exfat
Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2020-10-24 12:26:05 -07:00
exportfs
…
ext2
Merge 0746c4a9f3 ("Merge branch 'i2c/for-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux") into android-mainline
2020-10-28 21:20:34 +01:00
ext4
Merge 7c7fdaf6ad ("Merge tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt") into android-mainline
2020-12-15 14:21:29 +01:00
f2fs
Merge 7c7fdaf6ad ("Merge tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt") into android-mainline
2020-12-15 14:21:29 +01:00
fat
[PATCH] reduce boilerplate in fsid handling
2020-09-18 16:45:50 -04:00
freevxfs
…
fscache
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next
2020-06-03 16:27:18 -07:00
fuse
ANDROID: fuse: Add support for d_canonical_path
2020-11-06 18:49:25 +00:00
gfs2
Merge 34816d20f1 ("Merge tag 'gfs2-v5.10-rc5-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2") into android-mainline
2020-12-03 18:58:23 +01:00
hfs
Merge c2dc4c073f ("Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost") into android-mainline
2020-11-02 11:59:56 +01:00
hfsplus
Merge c2dc4c073f ("Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost") into android-mainline
2020-11-02 11:59:56 +01:00
hostfs
hostfs: Use kasprintf() instead of fixed buffer formatting
2020-03-29 23:23:00 +02:00
hpfs
[PATCH] reduce boilerplate in fsid handling
2020-09-18 16:45:50 -04:00
hugetlbfs
hugetlbfs: prevent filesystem stacking of hugetlbfs
2020-08-12 10:57:56 -07:00
incfs
ANDROID: Incremental fs: Set credentials before reading/writing
2020-12-10 20:16:16 +00:00
iomap
Merge 5.10-rc3 into android-mainline
2020-11-09 12:49:27 +01:00
isofs
fs: Replace zero-length array with flexible-array member
2020-10-29 17:22:59 -05:00
jbd2
jbd2: fix kernel-doc markups
2020-11-19 22:38:29 -05:00
jffs2
Merge 5.9-rc3 into android-mainline
2020-08-31 19:51:25 +02:00
jfs
Merge 6e4dc3d592 ("Merge tag 'for-linus-5.10-1' of git://github.com/cminyard/linux-ipmi") into android-mainline
2020-10-25 16:26:30 +01:00
kernfs
Merge 86cfccb669 ("Merge tag 'dlm-5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm") into android-mainline
2020-08-07 16:19:28 +02:00
lockd
Merge tag 'nfsd-5.10' of git://linux-nfs.org/~bfields/linux
2020-10-22 09:44:27 -07:00
minix
[PATCH] reduce boilerplate in fsid handling
2020-09-18 16:45:50 -04:00
nfs
Merge 33dc9614dc ("Merge tag 'ktest-v5.10-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest") into android-mainline
2020-12-11 10:26:31 +01:00
nfs_common
NFSv4.2: Fix NFS4ERR_STALE error when doing inter server copy
2020-10-21 10:31:20 -04:00
nfsd
NFSD: fix missing refcount in nfsd4_copy by nfsd4_do_async_copy
2020-11-05 17:25:14 -05:00
nilfs2
Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2020-10-24 12:26:05 -07:00
nls
treewide: replace '---help---' in Kconfig files with 'help'
2020-06-14 01:57:21 +09:00
notify
Merge a349e4c659 ("Merge tag 'xfs-5.10-fixes-7' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux") into android-mainline
2020-11-23 08:00:16 +01:00
ntfs
Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2020-10-24 12:26:05 -07:00
ocfs2
Merge e28c0d7c92 ("Merge branch 'akpm' (patches from Andrew)") into android-mainline
2020-11-15 14:37:09 +01:00
omfs
fs: omfs: use kmemdup() rather than kmalloc+memcpy
2020-09-22 23:39:45 -04:00
openpromfs
…
orangefs
Merge fb893de323 ("Merge tag 'tag-chrome-platform-for-v5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux") into android-mainline
2020-08-12 12:01:09 +02:00
overlayfs
ANDROID: overlayfs: fixup after upstream merge
2020-10-29 14:45:25 +00:00
proc
Merge 7f376f1917 ("Merge tag 'mtd/fixes-for-5.10-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux") into android-mainline
2020-12-12 12:19:56 +01:00
pstore
treewide: Use fallthrough pseudo-keyword
2020-08-23 17:36:59 -05:00
qnx4
[PATCH] reduce boilerplate in fsid handling
2020-09-18 16:45:50 -04:00
qnx6
[PATCH] reduce boilerplate in fsid handling
2020-09-18 16:45:50 -04:00
quota
Merge tag 'fs_for_v5.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
2020-10-15 14:56:15 -07:00
ramfs
ramfs: fix nommu mmap with gaps in the page cache
2020-10-16 11:11:22 -07:00
reiserfs
Merge 2d0f6b0aab ("Merge tag 'hyperv-next-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux") into android-mainline
2020-10-26 09:13:37 +01:00
romfs
Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2020-10-24 12:26:05 -07:00
squashfs
Merge 0746c4a9f3 ("Merge branch 'i2c/for-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux") into android-mainline
2020-10-28 21:20:34 +01:00
sysfs
sysfs: Add sysfs_emit and sysfs_emit_at to format sysfs output
2020-10-02 12:02:30 +02:00
sysv
[PATCH] reduce boilerplate in fsid handling
2020-09-18 16:45:50 -04:00
tracefs
…
ubifs
Merge 7c7fdaf6ad ("Merge tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt") into android-mainline
2020-12-15 14:21:29 +01:00
udf
Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2020-10-24 12:26:05 -07:00
ufs
Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2020-10-24 12:26:05 -07:00
unicode
ANDROID: sync generic casefolding code with patches going upstream
2020-09-27 21:56:06 +00:00
vboxsf
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2020-10-15 15:11:56 -07:00
verity
fs-verity: use smp_load_acquire() for ->i_verity_info
2020-07-21 16:02:41 -07:00
xfs
Merge a349e4c659 ("Merge tag 'xfs-5.10-fixes-7' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux") into android-mainline
2020-11-23 08:00:16 +01:00
zonefs
zonefs: fix page reference and BIO leak
2020-12-10 15:14:19 +09:00
aio.c
vfs: separate __sb_start_write into blocking and non-blocking helpers
2020-11-10 16:53:07 -08:00
anon_inodes.c
…
attr.c
Revert "ANDROID: vfs: Add setattr2 for filesystems with per mount permissions"
2020-05-29 08:49:31 +02:00
bad_inode.c
fs: move the fiemap definitions out of fs.h
2020-06-03 23:16:55 -04:00
binfmt_aout.c
exec: Rename flush_old_exec begin_new_exec
2020-05-07 16:55:47 -05:00
binfmt_elf_fdpic.c
binfmt_elf, binfmt_elf_fdpic: use a VMA list snapshot
2020-10-16 11:11:21 -07:00
binfmt_elf.c
fs: Replace zero-length array with flexible-array member
2020-10-29 17:22:59 -05:00
binfmt_em86.c
Merge branch 'akpm' (patches from Andrew)
2020-06-04 19:18:29 -07:00
binfmt_flat.c
binfmt_flat: revert "binfmt_flat: don't offset the data start"
2020-08-24 08:49:13 +10:00
binfmt_misc.c
Merge branch 'akpm' (patches from Andrew)
2020-06-04 19:18:29 -07:00
binfmt_script.c
Merge branch 'akpm' (patches from Andrew)
2020-06-04 19:18:29 -07:00
block_dev.c
block: add a bdget_part helper
2020-10-05 10:38:33 -06:00
buffer.c
mm, memcg: rework remote charging API to support nesting
2020-10-18 09:27:09 -07:00
char_dev.c
vfs: allow unprivileged whiteout creation
2020-05-14 16:44:23 +02:00
compat_binfmt_elf.c
Merge tag 'core_core_updates_for_5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2020-06-05 13:45:21 -07:00
coredump.c
coredump: fix core_pattern parse error
2020-12-06 10:19:07 -08:00
d_path.c
fs: fix NULL dereference due to data race in prepend_path()
2020-10-14 14:54:45 -07:00
dax.c
Merge tag 'fuse-update-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse
2020-10-19 14:28:30 -07:00
dcache.c
vfs: Use sequence counter with associated spinlock
2020-07-29 16:14:27 +02:00
dcookies.c
…
direct-io.c
Merge 2d0f6b0aab ("Merge tag 'hyperv-next-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux") into android-mainline
2020-10-26 09:13:37 +01:00
drop_caches.c
sysctl: pass kernel pointers to ->proc_handler
2020-04-27 02:07:40 -04:00
eventfd.c
eventfd: convert to f_op->read_iter()
2020-05-06 22:33:43 -04:00
eventpoll.c
Merge 5.9-rc8 into android-mainline
2020-10-06 09:55:29 +02:00
exec.c
Merge tag 'powerpc-5.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux
2020-10-16 12:21:15 -07:00
fcntl.c
treewide: Use fallthrough pseudo-keyword
2020-08-23 17:36:59 -05:00
fhandle.c
…
file_table.c
task_work: cleanup notification modes
2020-10-17 15:05:30 -06:00
file.c
io_uring: don't rely on weak ->files references
2020-09-30 20:32:32 -06:00
filesystems.c
fs/filesystems.c: downgrade user-reachable WARN_ONCE() to pr_warn_once()
2020-04-10 15:36:22 -07:00
fs_context.c
treewide: Use fallthrough pseudo-keyword
2020-08-23 17:36:59 -05:00
fs_parser.c
fs_parse: mark fs_param_bad_value() as static
2020-10-13 18:38:27 -07:00
fs_pin.c
…
fs_struct.c
vfs: Use sequence counter with associated spinlock
2020-07-29 16:14:27 +02:00
fs_types.c
…
fs-writeback.c
Merge tag 'block-5.10-2020-10-12' of git://git.kernel.dk/linux-block
2020-10-13 12:12:44 -07:00
fsopen.c
treewide: Use fallthrough pseudo-keyword
2020-08-23 17:36:59 -05:00
init.c
init: add an init_dup helper
2020-08-04 21:02:38 -04:00
inode.c
fs: add a filesystem flag for THPs
2020-10-16 11:11:15 -07:00
internal.h
fs: remove compat_sys_mount
2020-09-22 23:45:57 -04:00
io_uring.c
io_uring: fix file leak on error path of io ctx creation
2020-12-08 08:54:26 -07:00
io-wq.c
io-wq: cancel request if it's asking for files and we don't have them
2020-11-04 10:22:56 -07:00
io-wq.h
io_uring: unify fsize with def->work_flags
2020-10-20 16:03:13 -06:00
ioctl.c
fs: remove ksys_ioctl
2020-07-31 08:16:01 +02:00
Kconfig
Merge 449dc8c970 ("Merge tag 'for-v5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply") into android-mainline
2020-08-08 13:07:20 +02:00
Kconfig.binfmt
treewide: replace '---help---' in Kconfig files with 'help'
2020-06-14 01:57:21 +09:00
kernel_read_file.c
fs/kernel_file_read: Add "offset" arg for partial reads
2020-10-05 13:37:04 +02:00
libfs.c
ANDROID: sync encrypt+casefold support with patches going upstream
2020-11-25 17:05:08 +00:00
locks.c
treewide: Use fallthrough pseudo-keyword
2020-08-23 17:36:59 -05:00
Makefile
Merge 1f70935f63 ("Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc") into android-mainline
2020-10-27 11:47:16 +01:00
mbcache.c
…
mount.h
proc/mounts: add cursor
2020-05-14 16:44:24 +02:00
mpage.c
Merge 94709049fb ("Merge branch 'akpm' (patches from Andrew)") into android-mainline
2020-06-12 14:39:46 +02:00
namei.c
Merge 0746c4a9f3 ("Merge branch 'i2c/for-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux") into android-mainline
2020-10-28 21:20:34 +01:00
namespace.c
Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2020-10-24 12:26:05 -07:00
no-block.c
…
nsfs.c
nsproxy: attach to namespaces via pidfds
2020-05-13 11:41:22 +02:00
open.c
Revert "Revert "exec: move S_ISREG() check earlier""
2020-08-14 09:12:13 +02:00
pipe.c
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2020-10-11 11:11:35 -07:00
pnode.c
Revert "ANDROID: mnt: Add filesystem private data to mount points"
2020-08-08 13:04:28 +02:00
pnode.h
Revert "ANDROID: mnt: Add filesystem private data to mount points"
2020-08-08 13:04:28 +02:00
posix_acl.c
Merge ad57a1022f ("Merge tag 'exfat-for-5.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat") into android-mainline
2020-06-24 17:54:12 +02:00
proc_namespace.c
Add a "nosymfollow" mount option.
2020-08-27 16:06:47 -04:00
read_write.c
Revert "Revert "fs: remove the compat readv/writev syscalls""
2020-11-02 09:27:39 +01:00
readdir.c
fs: remove ksys_getdents64
2020-07-31 08:16:00 +02:00
remap_range.c
vfs: move the remap range helpers to remap_range.c
2020-10-15 09:48:49 -07:00
select.c
fs: Replace zero-length array with flexible-array member
2020-10-29 17:22:59 -05:00
seq_file.c
fix return values of seq_read_iter()
2020-11-15 22:12:53 -05:00
signalfd.c
treewide: Use fallthrough pseudo-keyword
2020-08-23 17:36:59 -05:00
splice.c
Revert "Revert "fs: remove compat_sys_vmsplice""
2020-11-02 09:27:41 +01:00
stack.c
…
stat.c
fs: remove KSTAT_QUERY_FLAGS
2020-09-26 22:55:05 -04:00
statfs.c
Add a "nosymfollow" mount option.
2020-08-27 16:06:47 -04:00
super.c
vfs: move __sb_{start,end}_write* to fs.h
2020-11-10 16:53:11 -08:00
sync.c
Merge 5.8-rc1 into android-mainline
2020-06-25 14:25:32 +02:00
timerfd.c
…
userfaultfd.c
Merge 54a4c789ca ("Merge tag 'docs/v5.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media") into android-mainline
2020-10-26 09:23:33 +01:00
utimes.c
fs: expose utimes_common
2020-07-31 08:16:01 +02:00
xattr.c
Merge d5660df4a5 ("Merge branch 'akpm' (patches from Andrew)") into android-mainline
2020-10-25 11:57:29 +01:00