Hi Linus, I''m still getting settled into new devel hardware etc, but I do have one commit for the next rc. Please grab it from my for-linus branch: git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs.git for-linus This changes my email over to fb.com, and adds a MAINTAINERS entry for Josef as well. Instead of diffstat etc, I''ve put the patch below. The commit is also signed, my updated key should be floating around the pgp servers now. commit c0778e2534b81be6b85b5ee07c0e15ff774f7136 Author: Chris Mason <clm@fb.com> Date: Tue Dec 3 20:16:03 2013 -0500 Btrfs: update the MAINTAINERS file Josef and I have new email addresses Signed-off-by: Chris Mason <clm@fb.com> Signed-off-by: Josef Bacik <jbacik@fb.com> diff --git a/MAINTAINERS b/MAINTAINERS index ffcaf97..db89b5d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1921,7 +1921,8 @@ S: Maintained F: drivers/gpio/gpio-bt8xx.c BTRFS FILE SYSTEM -M: Chris Mason <chris.mason@fusionio.com> +M: Chris Mason <clm@fb.com> +M: Josef Bacik <jbacik@fb.com> L: linux-btrfs@vger.kernel.org W: http://btrfs.wiki.kernel.org/ Q: http://patchwork.kernel.org/project/linux-btrfs/list/
On Wed, Dec 4, 2013 at 9:53 AM, Chris Mason <clm@fb.com> wrote:> > Instead of diffstat etc, I''ve put the patch below. The commit is also > signed, my updated key should be floating around the pgp servers now.You''ve done something to the git tree since your test request, because now the signed tag isn''t there any more, now it''s just a regular branch. Mind re-uploading the *tag*, which is where the signature is? Linus -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Quoting Linus Torvalds (2013-12-05 12:53:26)> On Wed, Dec 4, 2013 at 9:53 AM, Chris Mason <clm@fb.com> wrote: > > > > Instead of diffstat etc, I''ve put the patch below. The commit is also > > signed, my updated key should be floating around the pgp servers now. > > You''ve done something to the git tree since your test request, because > now the signed tag isn''t there any more, now it''s just a regular > branch. > > Mind re-uploading the *tag*, which is where the signature is?I had used git commit -S instead of signing the tag. I just pushed out a signed tag on for-linus as well. -chris
On Thu, Dec 5, 2013 at 10:19 AM, Chris Mason <clm@fb.com> wrote:> > I had used git commit -S instead of signing the tag.Ahh. And that was actually what you had done the first time around for your test too - but back then I didn''t actually *merge* it. Then I just looked at the top commit and said "yup, it''s signed". And now that I tried to merged it, I noticed my merge commit didn''t get the signage I expected. And that only happens if I pull a tag that''s signed (which also gets me the message I expect from signed pulls).. Anyway, now I have both a signature on the merge and on your actual commit. Thanks, Linus