>On 04/25/2018 02:28 PM, Joe Lawrence wrote: > [ ... snip ... ] > > base-commit: 0adb32858b0bddf4ada5f364a84ed60b196dbcda > prerequisite-patch-id: 5ed747c1a89a5dc4bba08186e21f927d7f3bf049 > prerequisite-patch-id: e9800288b71a9f339ea066e58d9ef70dece67083 > prerequisite-patch-id: 415f2e190b1b50142c78f2940c7b8dd39b5321a0 > prerequisite-patch-id: d229d9cf08af087e0a758d9df1da467103c2c200 > prerequisite-patch-id: b8c7ef99b13c6b321cba5e8919ed0b3e29f213e9 > prerequisite-patch-id: 4e10c0d08f151b18310fe0b1e5013d62db94cfeb > prerequisite-patch-id: 33046b190c114d202f3a52e0e274dbb2b1907a4c > prerequisite-patch-id: 6978944a725756317dd4e005d479b6101784aaf0 > prerequisite-patch-id: cce9d3c7e1ae8887f387ca9e072552dc63479749 > prerequisite-patch-id: c44ccc5dd7b1be6fe2b1f32ca6abde1da73fae79 >
Hi kbuild test robot folks, I attempted to use the --base option with git format-patch as suggested by Philip, but the bot still sent me mail (addressed only to myself and cc'd kbuild-...@01.org) about build test ERRORs against the wrong base: > [auto build test ERROR on v4.16] > [also build test ERROR on next-20180424] > [cannot apply to linus/master jikos-livepatching/for-next] I'm assuming operator error :( Here's a summary of my workflow: * Save an .mbox of the entire base patchset, as posted to the live-patching list: https://lkml.org/lkml/2018/3/23/665 * Create a "base" branch and apply the mbox: % git checkout -b test_base v4.16 Switched to a new branch 'test_base' % git am /tmp/pm.mbox Applying: livepatch: Use lists to manage patches, objects and functions Applying: livepatch: Free only structures with initialized kobject Applying: livepatch: Add atomic replace Applying: livepatch: Add an extra flag to distinguish registered patches Applying: livepatch: Remove replaced patches from the stack Applying: livepatch: Remove Nop structures when unused Applying: livepatch: Allow to replace even disabled patches Applying: livepatch: Atomic replace and cumulative patches documentation * Create a new dev branch from the base, make a trivial change and commit: % git checkout -b test_branch test_base % sed -i 's/^EXTRAVERSION =/EXTRAVERSION = .test/' Makefile % git commit Makefile -m 'test commit' * Create .patch files with --base: % git format-patch --base=v4.16 -1 --cover-letter % grep -e '^base-commit' -e 'prereq' 0000-cover-letter.patch base-commit: 0adb32858b0bddf4ada5f364a84ed60b196dbcda prerequisite-patch-id: 5ed747c1a89a5dc4bba08186e21f927d7f3bf049 prerequisite-patch-id: e9800288b71a9f339ea066e58d9ef70dece67083 prerequisite-patch-id: 415f2e190b1b50142c78f2940c7b8dd39b5321a0 prerequisite-patch-id: d229d9cf08af087e0a758d9df1da467103c2c200 prerequisite-patch-id: b8c7ef99b13c6b321cba5e8919ed0b3e29f213e9 prerequisite-patch-id: 4e10c0d08f151b18310fe0b1e5013d62db94cfeb prerequisite-patch-id: 33046b190c114d202f3a52e0e274dbb2b1907a4c prerequisite-patch-id: 6978944a725756317dd4e005d479b6101784aaf0 I notice that these patch-ids are only added to the cover-letter... do I need to force them each individual patch as well? /confused Thanks, -- Joe
