Repository : ssh://git@open-mesh.org/doc
On branches: backup-redmine/2017-07-13,master
commit 173fd3289db112b8b484a5842cf71e73ba9d2223 Author: Marek Lindner mareklindner@neomailbox.ch Date: Thu Sep 8 16:27:01 2011 +0000
doc: batman-adv/SubmittingLinux
173fd3289db112b8b484a5842cf71e73ba9d2223 batman-adv/SubmittingLinux.textile | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/batman-adv/SubmittingLinux.textile b/batman-adv/SubmittingLinux.textile index 0f4dd299..e12c1e35 100644 --- a/batman-adv/SubmittingLinux.textile +++ b/batman-adv/SubmittingLinux.textile @@ -91,6 +91,8 @@ rm 'net/batman-adv/compat.h' [linux f2204f0] Merge remote branch 'origin/standalone/next' into merge/master </pre>
+All changes to the the sysfs-class-net-* files can't be automatically merged because they reside in a different subfolder. As a consequence the new version has to be manually copied from a local git tree to 'Documentation/ABI/testing/'. The README file also requires manually handling: All relevant in-kernel changes have to be merged into 'Documentation/networking/batman-adv.txt' whereas out-of-kernel information has be stripped out. +
h2. check for compat code