Merge branch 'upstream' into tizen_base 75/253475/1 accepted/tizen_6.5_base accepted/tizen_6.5_base_tool accepted/tizen_7.0_base accepted/tizen_7.0_base_hotfix accepted/tizen_7.0_base_tool accepted/tizen_7.0_base_tool_hotfix accepted/tizen_8.0_base accepted/tizen_base accepted/tizen_base_riscv accepted/tizen_base_tool tizen_6.5_base tizen_7.0_base tizen_7.0_base_hotfix tizen_8.0_base tizen_base accepted/tizen/6.5/base/20230714.002449 accepted/tizen/6.5/base/tool/20211027.115100 accepted/tizen/7.0/base/20230714.002857 accepted/tizen/7.0/base/hotfix/20230714.003713 accepted/tizen/7.0/base/tool/20221028.113121 accepted/tizen/7.0/base/tool/hotfix/20221115.084910 accepted/tizen/8.0/base/20231005.044651 accepted/tizen/base/20230714.003305 accepted/tizen/base/riscv/20231123.094546 accepted/tizen/base/tool/20210221.221006 submit/tizen_6.5_base/20211026.180901 submit/tizen_6.5_base/20211027.183101 submit/tizen_6.5_base/20211027.200601 submit/tizen_7.0_base/20221028.200901 submit/tizen_7.0_base_hotfix/20221115.161501 submit/tizen_base/20210215.013455 submit/tizen_base/20210217.033244 tizen_6.5.m2_release tizen_7.0_m2_release tizen_8.0_m2_release
authorKarol Lewandowski <k.lewandowsk@samsung.com>
Wed, 10 Feb 2021 15:57:49 +0000 (16:57 +0100)
committerKarol Lewandowski <k.lewandowsk@samsung.com>
Wed, 10 Feb 2021 16:02:20 +0000 (17:02 +0100)
commit515ae81590edfb1e35ea9ce5ed31a5c893814157
tree125503fb6046e48e76dff4543dc306dd9cbe7f2f
parent02dbe4307a237c5570f954aa0cb2064d64972170
parentb741827a4f766d7503c334994f6c7fa29b3a0018
Merge branch 'upstream' into tizen_base

Change-Id: I3cf7519103132fc9e078433a621ba4e476754060
NOTICE
e2fsprogs.spec
misc/mke2fs.8.in
packaging/e2fsprogs.spec
resize/resize2fs.c