Hi Josef, Please remove the following patch:
Btrfs: move fs/btrfs/ioctl.h to include/uapi/linux/btrfs.h (55e301fd57a6239ec14b91a1cf2e70b3dd135194 in your btrfs-next.git) It's not fully cooked and I'm working on a second version of the patch that will do a little more rearranging of the header files according to the discussion on IRC a while ago. Thanks, Filipe On Wed, Feb 20, 2013 at 6:26 AM, Josef Bacik <jba...@fusionio.com> wrote: > Hello, > > If you have patches in btrfs-next, make sure they are the right ones so we > don't > have to rebase and repull and merge and all that crap for this merge window. > If > I'm missing stuff that's fine, I can throw that on top, but you need to make > sure I have the right versions of stuff already in the tree so I can rebase it > _now_ rather than trying to figure out how to fix it later. Thanks! > > Josef > -- > To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in > the body of a message to majord...@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html