As written in the official issue ticket, following the way how to solve your conflict locally.
A quick update to figure out the conflicted files.
cd into your nextcloud synchronized path
#list conflicted files
find . -iname *conflic* -type f
You can than decide which file is the one you want to keep foo.bar or foo (conflicted copy 2020-09-09 083407).bar.
The unofficial but great archzfs build has a new maintainer and most important, a new key.
#pacman-key -r F75D9D76
#pacman-key --lsign-key F75D9D76
And you are ready to upgrade. The key was changed since they are now using a buildbot to reduce the time between new kernel release and adapted archzfs package. Thanks for your great work people!
If you are using archzfs and the zfsonlinux, you know that it can happen from time to time that you have to wait until packages are updated to the newest kernel (or lts kernel). Whenever you want to upgrade your system, you get an error like the following.
:: Starting full system upgrade...
resolving dependencies...
looking for conflicting packages...
error: failed to prepare transaction (could not satisfy dependencies)
:: spl-linux-lts: installing linux-lts (4.9.32-1) breaks dependency 'linux-lts=4.9.30'
:: zfs-linux-lts: installing linux-lts (4.9.32-1) breaks dependency 'linux-lts=4.9.30'
:: zfs-utils-linux-lts: installing linux-lts (4.9.32-1) breaks dependency 'linux-lts=4.9.30'
To update your system without the kernel (and its dependencies), you can use the following trick.
#example if you use the lts kernel
#if you use plain pacman
pacman -Syyu --ignore=linux-lts,linux-lts-headers
#if you use pacaur
pacaur pacman -Syyu --ignore=linux-lts,linux-lts-headers
Thats it :-).
Hey folks, since kernel 4.6.2 I got a lot of X11 freezes as well as unusable gui tools (delayed inputs, scrolling and broken display rendering). Also all the virtual box clients are behaving the same. Only the chromium gui and xterm were usable (well, xterm only on my host, not on the virtual box clients).
I tried my best and here are the changes I made that stopped the system from a total freeze since four days:
#run as root
cat /etc/X11/xorg.conf.d/20-intel-graphics.conf < DELIM
Section "Device"
Identifier "Intel Graphics"
Driver "intel"
Option "AccelMethod" "uxa"
Option "NoAccel" "True"
EndSection
DELIM
I am crossing fingers it is working on your machine also.