Messages in this thread | | | Date | Thu, 5 Oct 2023 10:09:32 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the btrfs tree with the btrfs-fixes tree |
| |
Hi all,
Today's linux-next merge of the btrfs tree got a conflict in:
fs/btrfs/transaction.h
between commit:
f8d1b011ca8c ("btrfs: always print transaction aborted messages with an error level")
from the btrfs-fixes tree and commit:
5483af73c851 ("btrfs: rename errno identifiers to error")
from the btrfs tree.
I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts.
-- Cheers, Stephen Rothwell
diff --cc fs/btrfs/transaction.h index 93869cda6af9,de58776de307..000000000000 --- a/fs/btrfs/transaction.h +++ b/fs/btrfs/transaction.h @@@ -213,15 -216,15 +216,15 @@@ do { if (!test_and_set_bit(BTRFS_FS_STATE_TRANS_ABORTED, \ &((trans)->fs_info->fs_state))) { \ first = true; \ - if (WARN(abort_should_print_stack(errno), \ + if (WARN(abort_should_print_stack(error), \ KERN_ERR \ "BTRFS: Transaction aborted (error %d)\n", \ - (errno))) { \ + (error))) { \ /* Stack trace printed. */ \ } else { \ - btrfs_debug((trans)->fs_info, \ - "Transaction aborted (error %d)", \ + btrfs_err((trans)->fs_info, \ + "Transaction aborted (error %d)", \ - (errno)); \ + (error)); \ } \ } \ __btrfs_abort_transaction((trans), __func__, \ [unhandled content-type:application/pgp-signature] | |