github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-10 23:53:52 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph
099bdfba32
linux/fs/f2fs
History
Tao Huang f6909c028f Merge tag 'ASB-2021-12-05_12-5.10' of https://android.googlesource.com/kernel/common 
https://source.android.com/security/bulletin/2021-12-01
CVE-2021-33909
CVE-2021-38204
CVE-2021-0961

* tag 'ASB-2021-12-05_12-5.10': (3010 commits)
  ANDROID: workqueue: export symbol of the function wq_worker_comm()
  ANDROID: GKI: Update symbols to symbol list
  ANDROID: vendor_hooks: Add hooks for binder proc transaction
  ANDROID: GKI: Add symbols abi for USB IP kernel modules.
  ANDROID: GKI: Fix file mode on mtk abi file
  UPSTREAM: erofs: fix deadlock when shrink erofs slab
  ANDROID: init_task: Init android vendor and oem data
  UPSTREAM: sched/core: Mitigate race cpus_share_cache()/update_top_cache_domain()
  ANDROID: Update symbol list for mtk
  UPSTREAM: erofs: fix unsafe pagevec reuse of hooked pclusters
  UPSTREAM: erofs: remove the occupied parameter from z_erofs_pagevec_enqueue()
  UPSTREAM: usb: dwc3: gadget: Fix null pointer exception
  ANDROID: fips140: support "evaluation testing" builds via build.sh
  FROMGIT: sched/scs: Reset task stack state in bringup_cpu()
  ANDROID: dma-buf: heaps: fix dma-buf heap pool pages stat
  ANDROID: ABI: Add several spi_mem related symbols
  UPSTREAM: spi: spi-mem: add spi_mem_dtr_supports_op()
  ANDROID: gki_defconfig: enable CONFIG_SPI_MEM
  ANDROID: ABI: Add several iio related symbols
  ANDROID: ABI: Update symbol list for IMX
  ...

Change-Id: I09cddc92fa34553b944e62cc5cbbba94a84e5437

Conflicts:
	arch/arm/boot/dts/rk322x.dtsi
	arch/arm64/boot/dts/rockchip/rk3399.dtsi
	drivers/dma-buf/heaps/system_heap.c
	drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c
	drivers/gpu/drm/rockchip/rockchip_drm_vop.c
	drivers/gpu/drm/rockchip/rockchip_lvds.c
	drivers/gpu/drm/rockchip/rockchip_vop_reg.c
	drivers/mtd/nand/spi/core.c
	drivers/pci/controller/pcie-rockchip-host.c
	drivers/soc/rockchip/Kconfig
	drivers/usb/dwc3/core.c
	drivers/usb/dwc3/core.h
2021-12-14 17:09:02 +08:00
..
acl.c f2fs: clean up build warnings 2021-04-11 20:34:05 -07:00
acl.h
checkpoint.c Revert "f2fs: avoid attaching SB_ACTIVE flag during mount/remount" 2021-06-23 01:42:05 -07:00
compress.c f2fs: compress: add compress_inode to cache compressed blocks 2021-06-07 10:21:37 -07:00
data.c UPSTREAM: f2fs: change fiemap way in printing compression chunk 2021-11-15 16:35:09 +00:00
debug.c FROMGIT: f2fs: add sysfs nodes to get GC info for each GC mode 2021-07-16 00:21:51 +00:00
dir.c f2fs: introduce f2fs_casefolded_name slab cache 2021-06-21 07:24:24 -07:00
extent_cache.c
f2fs.h Merge remote branch 'android12-5.10-2021-08' of https://android.googlesource.com/kernel/common 2021-08-24 20:07:38 +08:00
file.c Merge tag 'ASB-2021-12-05_12-5.10' of https://android.googlesource.com/kernel/common 2021-12-14 17:09:02 +08:00
gc.c f2fs: atgc: fix to set default age threshold 2021-07-20 16:05:49 +02:00
gc.h f2fs: introduce gc_merge mount option 2021-03-30 20:59:19 -07:00
hash.c
inline.c Merge remote-tracking branch 'aosp/upstream-f2fs-stable-linux-5.10.y' into android12-5.10 2021-06-04 16:30:01 -07:00
inode.c FROMGIT: f2fs: should use GFP_NOFS for directory inodes 2021-09-16 08:46:29 -07:00
Kconfig f2fs: compress: Allow modular (de)compression algorithms 2021-03-24 15:50:10 -07:00
Makefile f2fs: deprecate f2fs_trace_io 2021-01-26 23:06:01 -08:00
namei.c Merge tag 'android12-5.10.66_r00' into android12-5.10 2021-10-21 09:45:02 +02:00
node.c FROMGIT: f2fs: don't sleep while grabing nat_tree_lock 2021-07-29 01:29:53 +00:00
node.h f2fs: swap: support migrating swapfile in aligned write mode 2021-06-07 10:21:38 -07:00
recovery.c f2fs: fix to avoid racing on fsync_entry_slab by multi filesystem instances 2021-07-19 09:45:03 +02:00
segment.c FROMGIT: f2fs: let's keep writing IOs on SBI_NEED_FSCK 2021-07-22 23:53:01 +00:00
segment.h f2fs: fix to avoid touching checkpointed data in get_victim() 2021-05-19 10:13:02 +02:00
shrinker.c f2fs: avoid race condition for shrinker count 2021-01-06 14:56:54 +01:00
super.c Merge tag 'ASB-2021-12-05_12-5.10' of https://android.googlesource.com/kernel/common 2021-12-14 17:09:02 +08:00
sysfs.c f2fs: Show casefolding support only when supported 2021-07-25 14:36:17 +02:00
verity.c f2fs: fix error handling in f2fs_end_enable_verity() 2021-05-11 14:47:34 +02:00
xattr.c Merge remote-tracking branch 'aosp/upstream-f2fs-stable-linux-5.10.y' into android12-5.10 2021-05-14 18:14:44 -07:00
xattr.h