Please resolve File Modified on merge for patches/kernel/kernel-nowarn-sysctl.patch

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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@xxxxxxxxx.  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@xxxxxxxxx";> email@xxxxxxxxx </a>




[Index of Archives]     [Linux ARM Kernel]     [Linux ARM]     [Linux Omap]     [Fedora ARM]     [IETF Annouce]     [Bugtraq]     [Linux]     [Linux OMAP]     [Linux MIPS]     [ECOS]     [Asterisk Internet PBX]     [Linux API]