linux-kernel - -mm breaks and merging maintainer git trees with mainline

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]

Message-ID: <524f69650707181309w42d665c9ua49179b9d7e0a6b1@mail.gmail.com>
Date:	Wed, 18 Jul 2007 15:09:55 -0500
From:	"Steve French" <smfrench@...il.com>
To:	LKML <linux-kernel@...r.kernel.org>
Subject: -mm breaks and merging maintainer git trees with mainline

What is the currently recommended procedure for merging a maintainer
tree with mainline in order to reorder all of the fixes in the
maintainer tree, after the changes in the linux-2.6. tree (to make the
eventual merge from Linus easier)?

In this particular case, the
http://git.kernel.org/?p=linux/kernel/git/sfrench/cifs-2.6.git tree
has a few dozen changesets that are not in its parent yet (and the
cifs-2.6.git is at 2.6.22-rc5 level)
(http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git) but
mainline now has fixes which affect the same directory as the
maintainer tree maintains.

If I do a "git pull" from cifs-2.6.git tree that will pull in the
required changes from mainline but there will be cluttered merge
messages when Linus pulls cifs-2.6.git into his tree.

What is the current recommended way to handle this?

-- 
Thanks,

Steve
-
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/