Re: Patch "btrfs: check unsupported filters in balance arguments" has been added to the 4.1-stable tree

[Greg KH <greg@kroah.com>]

On Sat, Dec 12, 2015 at 09:47:03PM +0000, Holger Hoffst�tte wrote:
> On Fri, 11 Dec 2015 09:19:26 -0800, gregkh wrote:
> 
> > This is a note to let you know that I've just added the patch titled
> > 
> >     btrfs: check unsupported filters in balance arguments
> > 
> > to the 4.1-stable tree which can be found at:
> >     http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
> > 
> > The filename of the patch is:
> >      btrfs-check-unsupported-filters-in-balance-arguments.patch
> > and it can be found in the queue-4.1 subdirectory.
> 
> This patch was previously already added to 4.1.12 & 4.2.5 and should be
> dropped from all queues. 4.3 has it out of the box, so no need to add it
> there either.
> 
> Not sure how but apparently you managed to apply it twice, so e.g.
> fs/btrfs/ioctl.c:4604 from 4.1.15-rc1 now looks like:
> 
> ...
> if (bctl->flags & ~(BTRFS_BALANCE_ARGS_MASK | BTRFS_BALANCE_TYPE_MASK)) {
> 	ret = -EINVAL;
> 	goto out_bctl;
> }
> 
> if (bctl->flags & ~(BTRFS_BALANCE_ARGS_MASK | BTRFS_BALANCE_TYPE_MASK)) {
> 	ret = -EINVAL;
> 	goto out_bargs;
> }
> ...

Thanks for letting me know, this must have come in in a different branch
multiple times, which is why I tried to pick it up twice.  Now removed
from the queue.

thanks,

greg k-h