1:54 a.m.
Hi Anand,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on kdave/for-next]
[also build test ERROR on v5.9-rc8 next-20201006]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url:
https://github.com/0day-ci/linux/commits/Anand-Jain/btrfs-fix-devid-0-wit...
base: https://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git for-next
config: i386-randconfig-s001-20201005 (attached as .config)
compiler: gcc-9 (Debian 9.3.0-15) 9.3.0
reproduce:
# apt-get install sparse
# sparse version: v0.6.2-201-g24bdaac6-dirty
#
https://github.com/0day-ci/linux/commit/ed4ebb4eb3f213f048ea5f6a2ed80f6bd...
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review
Anand-Jain/btrfs-fix-devid-0-without-a-replace-item-by-failing-the-mount/20201006-210957
git checkout ed4ebb4eb3f213f048ea5f6a2ed80f6bd728c9e1
# save the attached .config to linux build tree
make W=1 C=1 CF='-fdiagnostic-prefix -D__CHECK_ENDIAN__' ARCH=i386
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp(a)intel.com>
All errors (new ones prefixed by >>):
fs/btrfs/dev-replace.c: In function 'btrfs_init_dev_replace':
> fs/btrfs/dev-replace.c:98:7: error: too few arguments to function
'btrfs_find_device'
98 | if
(btrfs_find_device(fs_info->fs_devices,
| ^~~~~~~~~~~~~~~~~
In file included from fs/btrfs/dev-replace.c:18:
fs/btrfs/volumes.h:455:22: note: declared here
455 | struct btrfs_device *btrfs_find_device(struct btrfs_fs_devices *fs_devices,
| ^~~~~~~~~~~~~~~~~
fs/btrfs/dev-replace.c:161:7: error: too few arguments to function
'btrfs_find_device'
161 | if (btrfs_find_device(fs_info->fs_devices,
| ^~~~~~~~~~~~~~~~~
In file included from fs/btrfs/dev-replace.c:18:
fs/btrfs/volumes.h:455:22: note: declared here
455 | struct btrfs_device *btrfs_find_device(struct btrfs_fs_devices *fs_devices,
| ^~~~~~~~~~~~~~~~~
vim +/btrfs_find_device +98 fs/btrfs/dev-replace.c
68
69 int btrfs_init_dev_replace(struct btrfs_fs_info *fs_info)
70 {
71 struct btrfs_key key;
72 struct btrfs_root *dev_root = fs_info->dev_root;
73 struct btrfs_dev_replace *dev_replace = &fs_info->dev_replace;
74 struct extent_buffer *eb;
75 int slot;
76 int ret = 0;
77 struct btrfs_path *path = NULL;
78 int item_size;
79 struct btrfs_dev_replace_item *ptr;
80 u64 src_devid;
81
82 path = btrfs_alloc_path();
83 if (!path) {
84 ret = -ENOMEM;
85 goto out;
86 }
87
88 key.objectid = 0;
89 key.type = BTRFS_DEV_REPLACE_KEY;
90 key.offset = 0;
91 ret = btrfs_search_slot(NULL, dev_root, &key, path, 0, 0);
92 if (ret) {
93 no_valid_dev_replace_entry_found:
94 /*
95 * We don't have a replace item or it's corrupted.
96 * If there is a replace target, fail the mount.
97 */
98 if (btrfs_find_device(fs_info->fs_devices,
99
BTRFS_DEV_REPLACE_DEVID, NULL, NULL)) {
100 btrfs_err(fs_info,
101 "found replace target device without a replace item");
102 ret = -EIO;
103 goto out;
104 }
105 ret = 0;
106 dev_replace->replace_state =
107 BTRFS_IOCTL_DEV_REPLACE_STATE_NEVER_STARTED;
108 dev_replace->cont_reading_from_srcdev_mode =
109 BTRFS_DEV_REPLACE_ITEM_CONT_READING_FROM_SRCDEV_MODE_ALWAYS;
110 dev_replace->time_started = 0;
111 dev_replace->time_stopped = 0;
112 atomic64_set(&dev_replace->num_write_errors, 0);
113 atomic64_set(&dev_replace->num_uncorrectable_read_errors, 0);
114 dev_replace->cursor_left = 0;
115 dev_replace->committed_cursor_left = 0;
116 dev_replace->cursor_left_last_write_of_item = 0;
117 dev_replace->cursor_right = 0;
118 dev_replace->srcdev = NULL;
119 dev_replace->tgtdev = NULL;
120 dev_replace->is_valid = 0;
121 dev_replace->item_needs_writeback = 0;
122 goto out;
123 }
124 slot = path->slots[0];
125 eb = path->nodes[0];
126 item_size = btrfs_item_size_nr(eb, slot);
127 ptr = btrfs_item_ptr(eb, slot, struct btrfs_dev_replace_item);
128
129 if (item_size != sizeof(struct btrfs_dev_replace_item)) {
130 btrfs_warn(fs_info,
131 "dev_replace entry found has unexpected size, ignore entry");
132 goto no_valid_dev_replace_entry_found;
133 }
134
135 src_devid = btrfs_dev_replace_src_devid(eb, ptr);
136 dev_replace->cont_reading_from_srcdev_mode =
137 btrfs_dev_replace_cont_reading_from_srcdev_mode(eb, ptr);
138 dev_replace->replace_state = btrfs_dev_replace_replace_state(eb, ptr);
139 dev_replace->time_started = btrfs_dev_replace_time_started(eb, ptr);
140 dev_replace->time_stopped =
141 btrfs_dev_replace_time_stopped(eb, ptr);
142 atomic64_set(&dev_replace->num_write_errors,
143 btrfs_dev_replace_num_write_errors(eb, ptr));
144 atomic64_set(&dev_replace->num_uncorrectable_read_errors,
145 btrfs_dev_replace_num_uncorrectable_read_errors(eb, ptr));
146 dev_replace->cursor_left = btrfs_dev_replace_cursor_left(eb, ptr);
147 dev_replace->committed_cursor_left = dev_replace->cursor_left;
148 dev_replace->cursor_left_last_write_of_item = dev_replace->cursor_left;
149 dev_replace->cursor_right = btrfs_dev_replace_cursor_right(eb, ptr);
150 dev_replace->is_valid = 1;
151
152 dev_replace->item_needs_writeback = 0;
153 switch (dev_replace->replace_state) {
154 case BTRFS_IOCTL_DEV_REPLACE_STATE_NEVER_STARTED:
155 case BTRFS_IOCTL_DEV_REPLACE_STATE_FINISHED:
156 case BTRFS_IOCTL_DEV_REPLACE_STATE_CANCELED:
157 /*
158 * We don't have an active replace item but if there is a
159 * replace target, fail the mount.
160 */
161 if (btrfs_find_device(fs_info->fs_devices,
162 BTRFS_DEV_REPLACE_DEVID, NULL, NULL)) {
163 btrfs_err(fs_info,
164 "replace devid present without an active replace item");
165 ret = -EIO;
166 } else {
167 dev_replace->srcdev = NULL;
168 dev_replace->tgtdev = NULL;
169 }
170 break;
171 case BTRFS_IOCTL_DEV_REPLACE_STATE_STARTED:
172 case BTRFS_IOCTL_DEV_REPLACE_STATE_SUSPENDED:
173 dev_replace->srcdev = btrfs_find_device(fs_info->fs_devices,
174 src_devid, NULL, NULL, true);
175 dev_replace->tgtdev = btrfs_find_device(fs_info->fs_devices,
176 BTRFS_DEV_REPLACE_DEVID,
177 NULL, NULL, true);
178 /*
179 * allow 'btrfs dev replace_cancel' if src/tgt device is
180 * missing
181 */
182 if (!dev_replace->srcdev &&
183 !btrfs_test_opt(fs_info, DEGRADED)) {
184 ret = -EIO;
185 btrfs_warn(fs_info,
186 "cannot mount because device replace operation is ongoing and");
187 btrfs_warn(fs_info,
188 "srcdev (devid %llu) is missing, need to run 'btrfs dev
scan'?",
189 src_devid);
190 }
191 if (!dev_replace->tgtdev &&
192 !btrfs_test_opt(fs_info, DEGRADED)) {
193 ret = -EIO;
194 btrfs_warn(fs_info,
195 "cannot mount because device replace operation is ongoing and");
196 btrfs_warn(fs_info,
197 "tgtdev (devid %llu) is missing, need to run 'btrfs dev
scan'?",
198 BTRFS_DEV_REPLACE_DEVID);
199 }
200 if (dev_replace->tgtdev) {
201 if (dev_replace->srcdev) {
202 dev_replace->tgtdev->total_bytes =
203 dev_replace->srcdev->total_bytes;
204 dev_replace->tgtdev->disk_total_bytes =
205 dev_replace->srcdev->disk_total_bytes;
206 dev_replace->tgtdev->commit_total_bytes =
207 dev_replace->srcdev->commit_total_bytes;
208 dev_replace->tgtdev->bytes_used =
209 dev_replace->srcdev->bytes_used;
210 dev_replace->tgtdev->commit_bytes_used =
211 dev_replace->srcdev->commit_bytes_used;
212 }
213 set_bit(BTRFS_DEV_STATE_REPLACE_TGT,
214 &dev_replace->tgtdev->dev_state);
215
216 WARN_ON(fs_info->fs_devices->rw_devices == 0);
217 dev_replace->tgtdev->io_width = fs_info->sectorsize;
218 dev_replace->tgtdev->io_align = fs_info->sectorsize;
219 dev_replace->tgtdev->sector_size = fs_info->sectorsize;
220 dev_replace->tgtdev->fs_info = fs_info;
221 set_bit(BTRFS_DEV_STATE_IN_FS_METADATA,
222 &dev_replace->tgtdev->dev_state);
223 }
224 break;
225 }
226
227 out:
228 btrfs_free_path(path);
229 return ret;
230 }
231
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org
1:07 p.m.
New subject: [PATCH] btrfs: fix devid 0 without a replace item by failing the mount
On 6/10/20 10:54 pm, kernel test robot wrote:
Hi Anand,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on kdave/for-next]
[also build test ERROR on v5.9-rc8 next-20201006]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url:
https://github.com/0day-ci/linux/commits/Anand-Jain/btrfs-fix-devid-0-wit...
base: https://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git for-next
config: i386-randconfig-s001-20201005 (attached as .config)
compiler: gcc-9 (Debian 9.3.0-15) 9.3.0
reproduce:
# apt-get install sparse
# sparse version: v0.6.2-201-g24bdaac6-dirty
#
https://github.com/0day-ci/linux/commit/ed4ebb4eb3f213f048ea5f6a2ed80f6bd...
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review
Anand-Jain/btrfs-fix-devid-0-without-a-replace-item-by-failing-the-mount/20201006-210957
git checkout ed4ebb4eb3f213f048ea5f6a2ed80f6bd728c9e1
# save the attached .config to linux build tree
make W=1 C=1 CF='-fdiagnostic-prefix -D__CHECK_ENDIAN__' ARCH=i386
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp(a)intel.com>
All errors (new ones prefixed by >>):
fs/btrfs/dev-replace.c: In function 'btrfs_init_dev_replace':
>> fs/btrfs/dev-replace.c:98:7: error: too few arguments to function
'btrfs_find_device'
98 | if (btrfs_find_device(fs_info->fs_devices,
| ^~~~~~~~~~~~~~~~~
In file included from fs/btrfs/dev-replace.c:18:
fs/btrfs/volumes.h:455:22: note: declared here
455 | struct btrfs_device *btrfs_find_device(struct btrfs_fs_devices *fs_devices,
| ^~~~~~~~~~~~~~~~~
fs/btrfs/dev-replace.c:161:7: error: too few arguments to function
'btrfs_find_device'
161 | if (btrfs_find_device(fs_info->fs_devices,
| ^~~~~~~~~~~~~~~~~
In file included from fs/btrfs/dev-replace.c:18:
fs/btrfs/volumes.h:455:22: note: declared here
455 | struct btrfs_device *btrfs_find_device(struct btrfs_fs_devices *fs_devices,
| ^~~~~~~~~~~~~~~~~
Is there is a way to mention the patch dependencies, so that 0-Day
tests would understand. As in the patch's changelog, two dependent
patches [1] aren't in the misc-next yet.
[1]
https://patchwork.kernel.org/patch/11818635
https://patchwork.kernel.org/patch/11796905
Thanks, Anand
vim +/btrfs_find_device +98 fs/btrfs/dev-replace.c
68
69 int btrfs_init_dev_replace(struct btrfs_fs_info *fs_info)
70 {
71 struct btrfs_key key;
72 struct btrfs_root *dev_root = fs_info->dev_root;
73 struct btrfs_dev_replace *dev_replace = &fs_info->dev_replace;
74 struct extent_buffer *eb;
75 int slot;
76 int ret = 0;
77 struct btrfs_path *path = NULL;
78 int item_size;
79 struct btrfs_dev_replace_item *ptr;
80 u64 src_devid;
81
82 path = btrfs_alloc_path();
83 if (!path) {
84 ret = -ENOMEM;
85 goto out;
86 }
87
88 key.objectid = 0;
89 key.type = BTRFS_DEV_REPLACE_KEY;
90 key.offset = 0;
91 ret = btrfs_search_slot(NULL, dev_root, &key, path, 0, 0);
92 if (ret) {
93 no_valid_dev_replace_entry_found:
94 /*
95 * We don't have a replace item or it's corrupted.
96 * If there is a replace target, fail the mount.
97 */
> 98 if (btrfs_find_device(fs_info->fs_devices,
99 BTRFS_DEV_REPLACE_DEVID, NULL, NULL)) {
100 btrfs_err(fs_info,
101 "found replace target device without a replace item");
102 ret = -EIO;
103 goto out;
104 }
105 ret = 0;
106 dev_replace->replace_state =
107 BTRFS_IOCTL_DEV_REPLACE_STATE_NEVER_STARTED;
108 dev_replace->cont_reading_from_srcdev_mode =
109 BTRFS_DEV_REPLACE_ITEM_CONT_READING_FROM_SRCDEV_MODE_ALWAYS;
110 dev_replace->time_started = 0;
111 dev_replace->time_stopped = 0;
112 atomic64_set(&dev_replace->num_write_errors, 0);
113 atomic64_set(&dev_replace->num_uncorrectable_read_errors, 0);
114 dev_replace->cursor_left = 0;
115 dev_replace->committed_cursor_left = 0;
116 dev_replace->cursor_left_last_write_of_item = 0;
117 dev_replace->cursor_right = 0;
118 dev_replace->srcdev = NULL;
119 dev_replace->tgtdev = NULL;
120 dev_replace->is_valid = 0;
121 dev_replace->item_needs_writeback = 0;
122 goto out;
123 }
124 slot = path->slots[0];
125 eb = path->nodes[0];
126 item_size = btrfs_item_size_nr(eb, slot);
127 ptr = btrfs_item_ptr(eb, slot, struct btrfs_dev_replace_item);
128
129 if (item_size != sizeof(struct btrfs_dev_replace_item)) {
130 btrfs_warn(fs_info,
131 "dev_replace entry found has unexpected size, ignore entry");
132 goto no_valid_dev_replace_entry_found;
133 }
134
135 src_devid = btrfs_dev_replace_src_devid(eb, ptr);
136 dev_replace->cont_reading_from_srcdev_mode =
137 btrfs_dev_replace_cont_reading_from_srcdev_mode(eb, ptr);
138 dev_replace->replace_state = btrfs_dev_replace_replace_state(eb, ptr);
139 dev_replace->time_started = btrfs_dev_replace_time_started(eb, ptr);
140 dev_replace->time_stopped =
141 btrfs_dev_replace_time_stopped(eb, ptr);
142 atomic64_set(&dev_replace->num_write_errors,
143 btrfs_dev_replace_num_write_errors(eb, ptr));
144 atomic64_set(&dev_replace->num_uncorrectable_read_errors,
145 btrfs_dev_replace_num_uncorrectable_read_errors(eb, ptr));
146 dev_replace->cursor_left = btrfs_dev_replace_cursor_left(eb, ptr);
147 dev_replace->committed_cursor_left = dev_replace->cursor_left;
148 dev_replace->cursor_left_last_write_of_item = dev_replace->cursor_left;
149 dev_replace->cursor_right = btrfs_dev_replace_cursor_right(eb, ptr);
150 dev_replace->is_valid = 1;
151
152 dev_replace->item_needs_writeback = 0;
153 switch (dev_replace->replace_state) {
154 case BTRFS_IOCTL_DEV_REPLACE_STATE_NEVER_STARTED:
155 case BTRFS_IOCTL_DEV_REPLACE_STATE_FINISHED:
156 case BTRFS_IOCTL_DEV_REPLACE_STATE_CANCELED:
157 /*
158 * We don't have an active replace item but if there is a
159 * replace target, fail the mount.
160 */
161 if (btrfs_find_device(fs_info->fs_devices,
162 BTRFS_DEV_REPLACE_DEVID, NULL, NULL)) {
163 btrfs_err(fs_info,
164 "replace devid present without an active replace item");
165 ret = -EIO;
166 } else {
167 dev_replace->srcdev = NULL;
168 dev_replace->tgtdev = NULL;
169 }
170 break;
171 case BTRFS_IOCTL_DEV_REPLACE_STATE_STARTED:
172 case BTRFS_IOCTL_DEV_REPLACE_STATE_SUSPENDED:
173 dev_replace->srcdev = btrfs_find_device(fs_info->fs_devices,
174 src_devid, NULL, NULL, true);
175 dev_replace->tgtdev = btrfs_find_device(fs_info->fs_devices,
176 BTRFS_DEV_REPLACE_DEVID,
177 NULL, NULL, true);
178 /*
179 * allow 'btrfs dev replace_cancel' if src/tgt device is
180 * missing
181 */
182 if (!dev_replace->srcdev &&
183 !btrfs_test_opt(fs_info, DEGRADED)) {
184 ret = -EIO;
185 btrfs_warn(fs_info,
186 "cannot mount because device replace operation is ongoing and");
187 btrfs_warn(fs_info,
188 "srcdev (devid %llu) is missing, need to run 'btrfs dev
scan'?",
189 src_devid);
190 }
191 if (!dev_replace->tgtdev &&
192 !btrfs_test_opt(fs_info, DEGRADED)) {
193 ret = -EIO;
194 btrfs_warn(fs_info,
195 "cannot mount because device replace operation is ongoing and");
196 btrfs_warn(fs_info,
197 "tgtdev (devid %llu) is missing, need to run 'btrfs dev
scan'?",
198 BTRFS_DEV_REPLACE_DEVID);
199 }
200 if (dev_replace->tgtdev) {
201 if (dev_replace->srcdev) {
202 dev_replace->tgtdev->total_bytes =
203 dev_replace->srcdev->total_bytes;
204 dev_replace->tgtdev->disk_total_bytes =
205 dev_replace->srcdev->disk_total_bytes;
206 dev_replace->tgtdev->commit_total_bytes =
207 dev_replace->srcdev->commit_total_bytes;
208 dev_replace->tgtdev->bytes_used =
209 dev_replace->srcdev->bytes_used;
210 dev_replace->tgtdev->commit_bytes_used =
211 dev_replace->srcdev->commit_bytes_used;
212 }
213 set_bit(BTRFS_DEV_STATE_REPLACE_TGT,
214 &dev_replace->tgtdev->dev_state);
215
216 WARN_ON(fs_info->fs_devices->rw_devices == 0);
217 dev_replace->tgtdev->io_width = fs_info->sectorsize;
218 dev_replace->tgtdev->io_align = fs_info->sectorsize;
219 dev_replace->tgtdev->sector_size = fs_info->sectorsize;
220 dev_replace->tgtdev->fs_info = fs_info;
221 set_bit(BTRFS_DEV_STATE_IN_FS_METADATA,
222 &dev_replace->tgtdev->dev_state);
223 }
224 break;
225 }
226
227 out:
228 btrfs_free_path(path);
229 return ret;
230 }
231
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org
1:51 p.m.
New subject: [PATCH] btrfs: fix devid 0 without a replace item by failing the mount
On 10/7/20 10:07 AM, Anand Jain wrote:
On 6/10/20 10:54 pm, kernel test robot wrote:
> Hi Anand,
>
> Thank you for the patch! Yet something to improve:
>
> [auto build test ERROR on kdave/for-next]
> [also build test ERROR on v5.9-rc8 next-20201006]
> [If your patch is applied to the wrong git tree, kindly drop us a note.
> And when submitting patch, we suggest to use '--base' as documented in
> https://git-scm.com/docs/git-format-patch]
>
> url:
>
https://github.com/0day-ci/linux/commits/Anand-Jain/btrfs-fix-devid-0-wit...
> base: https://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git
> for-next
> config: i386-randconfig-s001-20201005 (attached as .config)
> compiler: gcc-9 (Debian 9.3.0-15) 9.3.0
> reproduce:
> # apt-get install sparse
> # sparse version: v0.6.2-201-g24bdaac6-dirty
> #
> https://github.com/0day-ci/linux/commit/ed4ebb4eb3f213f048ea5f6a2ed80f6bd...
> git remote add linux-review https://github.com/0day-ci/linux
> git fetch --no-tags linux-review
>
Anand-Jain/btrfs-fix-devid-0-without-a-replace-item-by-failing-the-mount/20201006-210957
> git checkout ed4ebb4eb3f213f048ea5f6a2ed80f6bd728c9e1
> # save the attached .config to linux build tree
> make W=1 C=1 CF='-fdiagnostic-prefix -D__CHECK_ENDIAN__'
> ARCH=i386
>
> If you fix the issue, kindly add following tag as appropriate
> Reported-by: kernel test robot <lkp(a)intel.com>
>
> All errors (new ones prefixed by >>):
>
> fs/btrfs/dev-replace.c: In function 'btrfs_init_dev_replace':
>>> fs/btrfs/dev-replace.c:98:7: error: too few arguments to function
>>> 'btrfs_find_device'
> 98 | if (btrfs_find_device(fs_info->fs_devices,
> | ^~~~~~~~~~~~~~~~~
> In file included from fs/btrfs/dev-replace.c:18:
> fs/btrfs/volumes.h:455:22: note: declared here
> 455 | struct btrfs_device *btrfs_find_device(struct
> btrfs_fs_devices *fs_devices,
> | ^~~~~~~~~~~~~~~~~
> fs/btrfs/dev-replace.c:161:7: error: too few arguments to
> function 'btrfs_find_device'
> 161 | if (btrfs_find_device(fs_info->fs_devices,
> | ^~~~~~~~~~~~~~~~~
> In file included from fs/btrfs/dev-replace.c:18:
> fs/btrfs/volumes.h:455:22: note: declared here
> 455 | struct btrfs_device *btrfs_find_device(struct
> btrfs_fs_devices *fs_devices,
> | ^~~~~~~~~~~~~~~~~
>
Is there is a way to mention the patch dependencies, so that 0-Day
tests would understand. As in the patch's changelog, two dependent
patches [1] aren't in the misc-next yet.
[1]
https://patchwork.kernel.org/patch/11818635
https://patchwork.kernel.org/patch/11796905
HI Anand,
The '--base' option in git format-patch may help, from man git format-patch:
BASE TREE INFORMATION
The base tree information block is used for maintainers or third
party testers to know the exact state the patch series applies to. It
consists of the base commit, which is a well-known commit that is part
of the stable part of the project history everybody else works
off of, and zero or more prerequisite patches, which are
well-known patches in flight that is not yet part of the base commit
that need to be applied on top of base commit in topological order
before the patches can be applied.
The base commit is shown as "base-commit: " followed by the
40-hex of the commit object name. A prerequisite patch is shown as
"prerequisite-patch-id: " followed by the 40-hex patch id, which can be
obtained by passing the patch through the git patch-id --stable
command.
Imagine that on top of the public commit P, you applied
well-known patches X, Y and Z from somebody else, and then built your
three-patch series A, B, C, the history would be like:
---P---X---Y---Z---A---B---C
With git format-patch --base=P -3 C (or variants thereof, e.g.
with --cover-letter or using Z..C instead of -3 C to specify the range),
the base tree information block is shown at the end of the first message
the command outputs (either the first patch, or the cover
letter), like this:
base-commit: P
prerequisite-patch-id: X
prerequisite-patch-id: Y
prerequisite-patch-id: Z
For non-linear topology, such as
---P---X---A---M---C
\ /
Y---Z---B
You can also use git format-patch --base=P -3 C to generate
patches for A, B and C, and the identifiers for P, X, Y, Z are appended
at the end of the first message.
If set --base=auto in cmdline, it will track base commit
automatically, the base commit will be the merge base of tip commit of
the remote-tracking branch and revision-range specified in cmdline. For
a local branch, you need to track a remote branch by git branch
--set-upstream-to before using this option.
Best Regards,
Rong Chen
708
days inactive
714
days old
2 comments
3 participants
participants (3)
-
Anand Jain -
kernel test robot -
Rong Chen