github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-07 14:04:54 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph
ee2b4a4f87
linux/fs
History
Tao Huang 582f79266f Merge remote branch 'android12-5.10' of https://android.googlesource.com/kernel/common 
* android12-5.10: (2274 commits)
  FROMGIT: mm: slub: move sysfs slab alloc/free interfaces to debugfs
  ANDROID: gki - CONFIG_NET_SCH_FQ=y
  ANDROID: GKI: Kconfig.gki: Add GKI_HIDDEN_ETHERNET_CONFIGS
  FROMLIST: media: Kconfig: Fix DVB_CORE can't be selected as module
  ANDROID: Update ABI and symbol list
  Revert "net: usb: cdc_ncm: don't spew notifications"
  ANDROID: Fips 140: move fips symbols entirely in own list
  ANDROID: core of xt_IDLETIMER send_nl_msg support
  ANDROID: start to re-add xt_IDLETIMER send_nl_msg support
  ANDROID: add fips140.ko symbols to module ABI
  ANDROID: inject correct HMAC digest into fips140.ko at build time
  ANDROID: crypto: fips140 - perform load time integrity check
  FROMLIST: crypto: shash - stop comparing function pointers to avoid breaking CFI
  ANDROID: arm64: module: preserve RELA sections for FIPS140 integrity selfcheck
  ANDROID: arm64: simd: omit capability check in may_use_simd()
  ANDROID: kbuild: lto: permit the use of .a archives in LTO modules
  ANDROID: arm64: only permit certain alternatives in the FIPS140 module
  ANDROID: crypto: lib/aes - add vendor hooks for AES library routines
  ANDROID: crypto: lib/sha256 - add vendor hook for sha256() routine
  UPSTREAM: KVM: arm64: Mark the host stage-2 memory pools static
  ...

Conflicts:
	drivers/mmc/core/mmc_ops.c
	drivers/usb/gadget/function/f_uac1.c
	drivers/usb/gadget/function/f_uac2.c
	drivers/usb/gadget/function/f_uvc.c
2021-06-25 11:32:04 +08:00
..
9p rk: revert to v4.19 2021-03-17 18:05:39 +08:00
adfs rk: revert to v4.19 2021-03-17 18:05:39 +08:00
affs rk: revert to v4.19 2021-03-17 18:05:39 +08:00
afs Merge 5.10.42 into android12-5.10 2021-06-03 18:47:38 +02:00
autofs rk: revert to v4.19 2021-03-17 18:05:39 +08:00
befs
bfs rk: revert to v4.19 2021-03-17 18:05:39 +08:00
btrfs Merge 5.10.43 into android12-5.10 2021-06-12 14:48:14 +02:00
cachefiles fs/cachefiles: Remove wait_bit_key layout dependency 2021-03-30 14:32:07 +02:00
ceph This is the 5.10.39 stable release 2021-05-22 15:34:48 +02:00
cifs Merge 5.10.42 into android12-5.10 2021-06-03 18:47:38 +02:00
coda rk: revert to v4.19 2021-03-17 18:05:39 +08:00
configfs FROMLIST: configfs: make directories inherit uid/gid from creator 2021-03-24 21:32:54 +00:00
cramfs rk: revert to v4.19 2021-03-17 18:05:39 +08:00
crypto UPSTREAM: fscrypt: relax Kconfig dependencies for crypto API algorithms 2021-05-13 07:53:32 +00:00
debugfs debugfs: Make debugfs_allow RO after init 2021-05-19 10:13:19 +02:00
devpts rk: revert to v4.19 2021-03-17 18:05:39 +08:00
dlm fs: dlm: flush swork on shutdown 2021-05-19 10:12:52 +02:00
ecryptfs Merge 5.10.40 into android12-5.10 2021-05-27 08:36:46 +02:00
efivarfs rk: revert to v4.19 2021-03-17 18:05:39 +08:00
efs
erofs UPSTREAM: erofs: support adjust lz4 history window size 2021-06-09 12:02:00 +00:00
exfat exfat: fix erroneous discard when clear cluster bit 2021-05-11 14:47:36 +02:00
exportfs rk: revert to v4.19 2021-03-17 18:05:39 +08:00
ext2 rk: revert to v4.19 2021-03-17 18:05:39 +08:00
ext4 Merge 5.10.43 into android12-5.10 2021-06-12 14:48:14 +02:00
f2fs Merge remote branch 'android12-5.10' of https://android.googlesource.com/kernel/common 2021-06-25 11:32:04 +08:00
fat rk: revert to v4.19 2021-03-17 18:05:39 +08:00
freevxfs
fscache rk: revert to v4.19 2021-03-17 18:05:39 +08:00
fuse Merge remote branch 'android12-5.10' of https://android.googlesource.com/kernel/common 2021-06-25 11:32:04 +08:00
gfs2 Merge 5.10.43 into android12-5.10 2021-06-12 14:48:14 +02:00
hfs rk: revert to v4.19 2021-03-17 18:05:39 +08:00
hfsplus Merge 5.10.38 into android12-5.10 2021-05-20 15:35:25 +02:00
hostfs hostfs: fix memory handling in follow_link() 2021-04-14 08:42:06 +02:00
hpfs
hugetlbfs mm/hugetlb: fix F_SEAL_FUTURE_WRITE 2021-05-19 10:13:11 +02:00
incfs ANDROID: Incremental fs: Add uid to INCFS_IOC_GET_LAST_READ_ERROR 2021-05-17 20:08:43 +00:00
iomap Merge 5.10.28 into android12-5.10 2021-04-09 09:29:17 +02:00
isofs isofs: release buffer head before return 2021-03-04 11:38:00 +01:00
jbd2 ext4: fix debug format string warning 2021-05-19 10:13:19 +02:00
jffs2 Merge 5.10.36 into android12-5.10 2021-05-13 14:22:11 +02:00
jfs rk: revert to v4.19 2021-03-17 18:05:39 +08:00
kernfs rk: revert to v4.19 2021-03-17 18:05:39 +08:00
lockd rk: revert to v4.19 2021-03-17 18:05:39 +08:00
minix rk: revert to v4.19 2021-03-17 18:05:39 +08:00
nfs Merge 5.10.42 into android12-5.10 2021-06-03 18:47:38 +02:00
nfs_common rk: revert to v4.19 2021-03-17 18:05:39 +08:00
nfsd nfsd: ensure new clients break delegations 2021-05-19 10:13:03 +02:00
nilfs2 rk: revert to v4.19 2021-03-17 18:05:39 +08:00
nls
notify rk: revert to v4.19 2021-03-17 18:05:39 +08:00
ntfs rk: revert to v4.19 2021-03-17 18:05:39 +08:00
ocfs2 Merge 5.10.43 into android12-5.10 2021-06-12 14:48:14 +02:00
omfs
openpromfs
orangefs rk: revert to v4.19 2021-03-17 18:05:39 +08:00
overlayfs Merge 5.10.37 into android12-5.10 2021-05-15 09:28:55 +02:00
proc FROMLIST: bootconfig: Change array value to use child node 2021-06-03 19:56:53 +00:00
pstore FROMGIT: pstore: Add mem_type property DT parsing support 2021-04-02 10:56:28 +00:00
qnx4
qnx6
quota rk: revert to v4.19 2021-03-17 18:05:39 +08:00
ramfs rk: revert to v4.19 2021-03-17 18:05:39 +08:00
reiserfs Merge 5.10.28 into android12-5.10 2021-04-09 09:29:17 +02:00
romfs rk: revert to v4.19 2021-03-17 18:05:39 +08:00
sdcardfs
squashfs Merge 5.10.38 into android12-5.10 2021-05-20 15:35:25 +02:00
sysfs rk: revert to v4.19 2021-03-17 18:05:39 +08:00
sysv rk: revert to v4.19 2021-03-17 18:05:39 +08:00
tracefs
ubifs Merge remote branch 'android12-5.10' of https://android.googlesource.com/kernel/common 2021-06-25 11:32:04 +08:00
udf udf: fix silent AED tagLocation corruption 2021-03-17 17:06:23 +01:00
ufs rk: revert to v4.19 2021-03-17 18:05:39 +08:00
unicode rk: revert to v4.19 2021-03-17 18:05:39 +08:00
vboxsf
verity UPSTREAM: fsverity: relax build time dependency on CRYPTO_SHA256 2021-05-13 07:53:32 +00:00
xfs Merge 5.10.37 into android12-5.10 2021-05-15 09:28:55 +02:00
zonefs zonefs: fix to update .i_wr_refcnt correctly in zonefs_open_zone() 2021-03-25 09:04:05 +01:00
aio.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
anon_inodes.c UPSTREAM: fs: anon_inodes: rephrase to appropriate kernel-doc 2021-03-03 16:18:33 +00:00
attr.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
bad_inode.c
binfmt_aout.c
binfmt_elf_fdpic.c
binfmt_elf.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
binfmt_em86.c
binfmt_flat.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
binfmt_misc.c binfmt_misc: fix possible deadlock in bm_register_write 2021-03-17 17:06:35 +01:00
binfmt_script.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
block_dev.c Merge 5.10.42 into android12-5.10 2021-06-03 18:47:38 +02:00
buffer.c Revert "FROMLIST: fs/buffer.c: Revoke LRU when trying to drop buffers" 2021-03-24 17:40:49 +00:00
char_dev.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
compat_binfmt_elf.c
coredump.c ANDROID: mm: page_pinner: use put_user_page at dump_user_range 2021-04-30 09:13:35 -07:00
d_path.c
dax.c dax: Wake up all waiters after invalidating dax entry 2021-05-19 10:13:12 +02:00
dcache.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
dcookies.c
direct-io.c Merge 5.10.30 into android12-5.10 2021-04-15 14:23:41 +02:00
drop_caches.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
eventfd.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
eventpoll.c Merge 5.10.36 into android12-5.10 2021-05-13 14:22:11 +02:00
exec.c ANDROID: vendor_hooks: Export the tracepoints task_rename 2021-06-04 06:26:01 +00:00
fcntl.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
fhandle.c
file_table.c
file.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
filesystems.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
fs_context.c
fs_parser.c
fs_pin.c
fs_struct.c
fs_types.c
fs-writeback.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
fsopen.c
init.c
inode.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
internal.h rk: revert to v4.19 2021-03-17 18:05:39 +08:00
io_uring.c io_uring: use better types for cflags 2021-06-10 13:39:23 +02:00
io-wq.c io_uring: always batch cancel in *cancel_files() 2021-02-13 13:54:56 +01:00
io-wq.h io_uring: always batch cancel in *cancel_files() 2021-02-13 13:54:56 +01:00
ioctl.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
Kconfig rk: revert to v4.19 2021-03-17 18:05:39 +08:00
Kconfig.binfmt
kernel_read_file.c
libfs.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
locks.c Revert "nfsd4: a client's own opens needn't prevent delegations" 2021-03-20 10:43:44 +01:00
Makefile rk: revert to v4.19 2021-03-17 18:05:39 +08:00
mbcache.c
mount.h
mpage.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
namei.c Merge 5.10.30 into android12-5.10 2021-04-15 14:23:41 +02:00
namespace.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
no-block.c
nsfs.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
open.c FROMLIST: mm, thp: Relax the VM_DENYWRITE constraint on file-backed THPs 2021-04-28 18:41:35 +00:00
OWNERS ANDROID: Add OWNERS files referring to the respective android-mainline OWNERS 2021-04-03 14:11:30 +00:00
pipe.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
pnode.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
pnode.h mount: fix mounting of detached mounts onto targets that reside on shared mounts 2021-03-17 17:06:13 +01:00
posix_acl.c
proc_namespace.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
read_write.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
readdir.c readdir: make sure to verify directory entry for legacy interfaces too 2021-04-21 13:00:54 +02:00
remap_range.c
select.c kernel, fs: Introduce and use set_restart_fn() and arch_set_restart_data() 2021-03-25 09:04:16 +01:00
seq_file.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
signalfd.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
splice.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
stack.c
stat.c fs: fix reporting supported extra file attributes for statx() 2021-05-11 14:47:33 +02:00
statfs.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
super.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
sync.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
timerfd.c ANDROID: fs: Add vendor hooks for ep_create_wakeup_source & timerfd_create 2021-03-24 17:57:22 +00:00
userfaultfd.c FROMGIT: userfaultfd/shmem: advertise shmem minor fault support 2021-06-04 19:13:03 +00:00
utimes.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
xattr.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00