On Sat, Dec 12, 2015 at 11:57:49AM -0800, Greg KH wrote: > On Sat, Dec 12, 2015 at 02:32:10PM +0000, Filipe Manana wrote: > > > > > > On 12/11/2015 04:54 PM, gregkh@xxxxxxxxxxxxxxxxxxx wrote: > > > > > > The patch below does not apply to the 4.2-stable tree. > > > If someone wants it applied there, or to any other stable or longterm > > > tree, then please email the backport, including the original git commit > > > id to <stable@xxxxxxxxxxxxxxx>. > > > > Greg, please find attached a version of the patch that applies against > > 4.2.7. > > This patch breaks the build: > > fs/btrfs/delayed-ref.c: In function ‘merge_ref’: > fs/btrfs/delayed-ref.c:223:38: error: ‘struct btrfs_delayed_ref_node’ has no mem > ber named ‘no_quota’ > if (next->type != ref->type || next->no_quota != ref->no_quota) > ^ > fs/btrfs/delayed-ref.c:223:55: error: ‘struct btrfs_delayed_ref_node’ has no mem > ber named ‘no_quota’ > if (next->type != ref->type || next->no_quota != ref->no_quota) > ^ > fs/btrfs/delayed-ref.c: At top level: > fs/btrfs/delayed-ref.c:313:13: error: redefinition of ‘merge_ref’ > static bool merge_ref(struct btrfs_trans_handle *trans, > ^ > fs/btrfs/delayed-ref.c:200:13: note: previous definition of ‘merge_ref’ was here > static bool merge_ref(struct btrfs_trans_handle *trans, > ^ > fs/btrfs/delayed-ref.c:380:6: error: redefinition of ‘btrfs_merge_delayed_refs’ > void btrfs_merge_delayed_refs(struct btrfs_trans_handle *trans, > ^ > fs/btrfs/delayed-ref.c:267:6: note: previous definition of ‘btrfs_merge_delayed_refs’ was here > void btrfs_merge_delayed_refs(struct btrfs_trans_handle *trans, > ^ > > So I'm going to have to drop it, sorry. It also breaks on 4.3, so I'm dropping that patch as well. It would have been nice if you had at least test-built what you sent me :( thanks, greg k-h -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html