Implemented the first suggestion.
Second suggestion is borked:
merge: upstream_stable/v5.1.18 - not something we can merge
fatal: '--ours/--theirs' cannot be used with switching branches
Git Clone URL: | https://aur.archlinux.org/linux-bcachefs-git.git (read-only, click to copy) |
---|---|
Package Base: | linux-bcachefs-git |
Description: | Headers and scripts for building modules for the Linux kernel ~ featuring Kent Overstreet's bcachefs filesystem |
Upstream URL: | https://github.com/koverstreet/bcachefs |
Licenses: | GPL-2.0-only |
Submitter: | Chiruno |
Maintainer: | QuartzDragon |
Last Packager: | QuartzDragon |
Votes: | 17 |
Popularity: | 0.58 |
First Submitted: | 2018-01-13 15:37 (UTC) |
Last Updated: | 2025-05-22 01:21 (UTC) |
« First ‹ Previous 1 .. 6 7 8 9 10 11 12 13 14 Next › Last »
Implemented the first suggestion.
Second suggestion is borked:
merge: upstream_stable/v5.1.18 - not something we can merge
fatal: '--ours/--theirs' cannot be used with switching branches
(echo "$_subarch"; yes) | make oldconfig
is better
also for simple conflicts, such as the one that is blocking 5.1.17, remove the git pull and add this
git fetch --tags upstream_stable
if ! git merge upstream_stable/v${_srcver_tag}
then if ! git diff --name-only --diff-filter=U | xargs git checkout --theirs
then git diff --name-only --diff-filter=U |
while read line
do sleep 0.1; if ! git checkout --theirs $line
then sleep 0.1; git rm $line
fi
done
fi
fi
Stuck at 5.1.15 for now.
5.1.16 produces an auto-merge conflict.
5.1 is a go it seams https://github.com/koverstreet/bcachefs/issues/46#issuecomment-508420107
Reverted back to 5.0.21 for now.
Will revert.
do not update, it kernel panics as per the latest issue in the project's github
If there are bugs related to the PKGBUILD or config, report here.
Otherwise, please report here:
Done. :)
please add || true
on line 109
and the other remote add
Pinned Comments
QuartzDragon commented on 2019-06-11 15:15 (UTC) (edited on 2019-06-11 15:17 (UTC) by QuartzDragon)
If there are bugs related to the PKGBUILD or config, report here.
Otherwise, please report here:
https://github.com/koverstreet/bcachefs/issues