From: smtpauth@cumulusnetworks.com
To: linux-mm@kvack.org, shm@cumulusnetworks.com,
curt@cumulusnetworks.com, nolan@cumulusnetworks.com,
sfeldma@cumulusnetworks.com
Subject: Please resolve File Modified on merge for patches/kernel/kernel-nowarn-sysctl.patch
Date: Tue, 7 Apr 2015 17:48:59 -0700 (PDT) [thread overview]
Message-ID: <20150408004859.50E7A156002E@frank-02.cumulusnetworks.com> (raw)
This is automated email to inform you about source code difference
between releases CumulusLinux-2.5_br and CumulusLinux-2.6_br .
Please continue this email thread to decide how to proceed with these changes.
If multiple committers are identified for this file, please elect or self-elect an owner of the merge action.
Execute and commit the merge and reply on this email modifying the subject with <CLOSING> prefix.
When a moderator receives this closing email, the corresponding status entry for this file will be deleted as completed.
If no closing email is sent, the reminder email will be triggered again for duration of a week from the original request.
After one week of inactivity the moderator declares that merge for this file is not needed and no further actions required to sync these branches.
Please execute following steps to replicate the git merge environment
git clone ssh://<your name>@dev.cumulusnetworks.com/home/trac/cumulus.git --branch CumulusLinux-2.5_br
git checkout CumulusLinux-2.6_br
git merge CumulusLinux-2.5_br
git status
*
*
*
4c4
< index 313381c..de7701d 100644
---
> index ab98dc6..f206e4b 100644
7c7
< @@ -3493,7 +3493,7 @@ void check_move_unevictable_pages(struct page **pages, int nr_pages)
---
> @@ -3496,7 +3496,7 @@ void check_move_unevictable_pages(struct page **pages, int nr_pages)
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
reply other threads:[~2015-04-08 0:49 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150408004859.50E7A156002E@frank-02.cumulusnetworks.com \
--to=smtpauth@cumulusnetworks.com \
--cc=curt@cumulusnetworks.com \
--cc=linux-mm@kvack.org \
--cc=nolan@cumulusnetworks.com \
--cc=sfeldma@cumulusnetworks.com \
--cc=shm@cumulusnetworks.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox