linux-kernel - Rebased for_next branch in my linux-fs git tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date:	Thu, 4 Jul 2013 19:43:04 +0200
From:	Jan Kara <jack@...e.cz>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	LKML <linux-kernel@...r.kernel.org>
Subject: Rebased for_next branch in my linux-fs git tree

  Hello Stephen,

  I'm just writing this to let you know that I had to rebase for_next
branch in my linux-fs git tree because I've messed up my tree and for_linus
& for_next branches contained the same patches but with different commit
IDs (fast track fixes). When I pulled for_next into for_linus branch,
the changelog had commit logs for those patches twice which was rather
confusing. The only solution I found was to rebase for_next on top of
for_linus to get rid of the duplicate patches. If there's a cleaner
solution of the situation, I'm happy to learn it for future...

This is just that you know what's going on when you are doing your merge
window statistics :).

								Honza
-- 
Jan Kara <jack@...e.cz>
SUSE Labs, CR
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/