Vladimír Čunát 89023c38fc Recover the complicated situation after my bad merge ... I made a mistake merge. Reverting it in c778945806 undid the state on master, but now I realize it crippled the git merge mechanism. As the merge contained a mix of commits from `master..staging-next` and other commits from `staging-next..staging`, it got the `staging-next` branch into a state that was difficult to recover. I reconstructed the "desired" state of staging-next tree by: - checking out the last commit of the problematic range: 4effe769e2 - `git rebase -i --preserve-merges a8a018ddc0` - dropping the mistaken merge commit and its revert from that range (while keeping reapplication from 4effe769e2) - merging the last unaffected staging-next commit (803ca85c20) - fortunately no other commits have been pushed to staging-next yet - applying a diff on staging-next to get it into that state		2020-10-26 09:01:04 +01:00
..
0001-Start-device-units-for-uninitialised-encrypted-devic.patch	systemd: 246 -> 246.4	2020-09-12 08:31:22 +02:00
0002-Don-t-try-to-unmount-nix-or-nix-store.patch	systemd: 246 -> 246.4	2020-09-12 08:31:22 +02:00
0003-Fix-NixOS-containers.patch	systemd: 246 -> 246.4	2020-09-12 08:31:22 +02:00
0004-Look-for-fsck-in-the-right-place.patch	systemd: 246 -> 246.4	2020-09-12 08:31:22 +02:00
0005-Add-some-NixOS-specific-unit-directories.patch	systemd: 246 -> 246.4	2020-09-12 08:31:22 +02:00
0006-Get-rid-of-a-useless-message-in-user-sessions.patch	systemd: 246 -> 246.4	2020-09-12 08:31:22 +02:00
0007-hostnamed-localed-timedated-disable-methods-that-cha.patch	systemd: 246 -> 246.4	2020-09-12 08:31:22 +02:00
0008-Fix-hwdb-paths.patch	systemd: 246 -> 246.4	2020-09-12 08:31:22 +02:00
0009-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch	systemd: 246 -> 246.4	2020-09-12 08:31:22 +02:00
0010-localectl-use-etc-X11-xkb-for-list-x11.patch	systemd: 246 -> 246.4	2020-09-12 08:31:22 +02:00
0011-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch	systemd: 246 -> 246.4	2020-09-12 08:31:22 +02:00
0012-Install-default-configuration-into-out-share-factory.patch	systemd: 246 -> 246.4	2020-09-12 08:31:22 +02:00
0013-inherit-systemd-environment-when-calling-generators.patch	systemd: 246 -> 246.4	2020-09-12 08:31:22 +02:00
0014-add-rootprefix-to-lookup-dir-paths.patch	systemd: 246 -> 246.4	2020-09-12 08:31:22 +02:00
0015-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch	systemd: 246 -> 246.4	2020-09-12 08:31:22 +02:00
0016-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch	systemd: 246 -> 246.4	2020-09-12 08:31:22 +02:00
0017-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch	systemd: 246 -> 246.4	2020-09-12 08:31:22 +02:00
0018-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch	systemd: 246 -> 246.4	2020-09-12 08:31:22 +02:00
0019-revert-get-rid-of-seat_can_multi_session.patch	systemd: show CanMultiSession again	2020-10-05 07:40:29 -05:00
default.nix	Recover the complicated situation after my bad merge	2020-10-26 09:01:04 +01:00