From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <stable-owner@vger.kernel.org>
Received: from out1-smtp.messagingengine.com ([66.111.4.25]:33646 "EHLO
	out1-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK)
	by vger.kernel.org with ESMTP id S1750926AbbLMBNd (ORCPT
	<rfc822;stable@vger.kernel.org>); Sat, 12 Dec 2015 20:13:33 -0500
Received: from compute2.internal (compute2.nyi.internal [10.202.2.42])
	by mailout.nyi.internal (Postfix) with ESMTP id 3360E2027B
	for <stable@vger.kernel.org>; Sat, 12 Dec 2015 20:13:33 -0500 (EST)
Date: Sat, 12 Dec 2015 17:13:31 -0800
From: Greg KH <greg@kroah.com>
To: Holger =?iso-8859-1?Q?Hoffst=E4tte?=
	<holger.hoffstaette@googlemail.com>
Cc: stable@vger.kernel.org
Subject: Re: Patch "btrfs: check unsupported filters in balance arguments"
 has been added to the 4.1-stable tree
Message-ID: <20151213011331.GA2525@kroah.com>
References: <1449854366214161@kroah.com>
 <pan.2015.12.12.21.47.03@googlemail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <pan.2015.12.12.21.47.03@googlemail.com>
Sender: stable-owner@vger.kernel.org
List-ID: <stable.vger.kernel.org>

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