]> git.hungrycats.org Git - linux/commitdiff
projects / linux / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ee15276 61baee2)
Merge remote-tracking branch 'stable/linux-6.12.y' into zygo-6.12.x-zb64
authorZygo Blaxell <zblaxell@waya.furryterror.org>
Tue, 10 Dec 2024 14:49:30 +0000 (09:49 -0500)
committerZygo Blaxell <zblaxell@waya.furryterror.org>
Tue, 10 Dec 2024 14:49:30 +0000 (09:49 -0500)
1  2 
fs/btrfs/inode.c patch | diff1 | diff2 | blob | history
fs/btrfs/ioctl.c patch | diff1 | diff2 | blob | history

diff --cc fs/btrfs/inode.c
Simple merge
diff --cc fs/btrfs/ioctl.c
Simple merge
Linux kernels and configurations used by Zygo.