Search manual merge akpm

Advanced search
In
56 results in the forums
Order by date - Order by pertinence
All (56)
High-tech (56)
 
linux-next: manual merge of the akpm tree with the rr tree
Hi Andrew, Today's linux-next merge of the akpm tree got conflicts in kernel/lglock.c, include/linux/lglock.h, fs/namespace.c and fs/internal.h between various commits from the rr tree and commit "brlocks/lglocks: cleanups" from the akpm ...
Message posted on the May 10th, 2012 - 5:00 AM ET
linux-next: manual merge of the akpm tree with the tree
Hi Andrew, Today's linux-next merge of the akpm tree got a conflict in ipc/sem.c between commit 321310ced2d6 ("ipc: move sem_obtain_lock() rcu locking into the only caller") from Linus' tree and commit "ipc/sem.c: alternatives to ...
Message posted on the May 06th, 2013 - 12:00 am ET
linux-next: manual merge of the akpm tree with the drm tree
Hi Andrew, Today's linux-next merge of the akpm tree got a conflict in drivers/gpu/drm/drm_fb_helper.c between commit 848499032504 ("drm: add drm_modeset_lock|unlock_all") from the drm tree and commit ...
Message posted on the January 21st, 2013 - 12:50 am ET
linux-next: manual merge of the akpm tree with the block tree
Hi Andrew, Today's linux-next merge of the akpm tree got a conflict in drivers/block/mtip32xx/mtip32xx.c between commit 16c906e51c6f ("mtip32xx: Add workqueue and NUMA support") from the tree and commit "mtip32xx: convert to batch ...
Message posted on the January 13th, 2013 - 11:00 pm ET
linux-next: manual merge of the akpm tree with the tip tree
Hi Andrew, Today's linux-next merge of the akpm tree got a conflict in mm/migrate.c between the tip tree and commit "mm: memcg: fix compaction/migration failing due to memcg limits" from the akpm tree. The commit 4783af477d3d ("mm: ...
Message posted on the July 25th, 2012 - 12:10 am ET
linux-next: manual merge of the akpm tree with the vfs tree
Hi Andrew, Today's linux-next merge of the akpm tree got a conflict in fs/proc/generic.c between several commits from the vfs tree and commit "procfs: improve scaling in proc" from the akpm tree. I just dropped the akpm tree patch (and ...
Message posted on the April 04th, 2013 - 02:30 am ET
linux-next: manual merge of the akpm tree with the vfs tree
Hi Andrew, Today's linux-next merge of the akpm tree got conflicts in mm/filemap.c, fs/xfs/xfs_file.c, fs/splice.c, fs/ocfs2/file.c, fs/ntfs/file.c, fs/fuse/file.c, fs/cifs/file.c and fs/btrfs/file.c between commit 36bd5dc0c4e2 ("lift ...
Message posted on the April 04th, 2013 - 02:20 am ET
linux-next: manual merge of the akpm tree with Linus' tree
Hi Andrew, Today's linux-next merge of the akpm tree got a conflict in mm/memcontrol.c between commit 78ccf5b5ab83 ("mm: memcg: print statistics directly to seq_file") and others from Linus' tree and commit "memcg: add mlock ...
Message posted on the May 31st, 2012 - 12:20 am ET
linux-next: manual merge of the akpm tree with the tip tree
Hi all, Today's linux-next merge of the akpm tree got a conflict in between commit a6fca40f1d7f ("x86, tlb: Switch cr3 in leave_mm() only when needed") from the tip tree and commit "x86: use this_cpu_xxx to replace percpu_xxx ...
Message posted on the March 26th, 2012 - 12:10 am ET
linux-next: manual merge of the akpm tree with Linus' tree
Hi Andrew, Today's linux-next merge of the akpm tree got a conflict in arch/x86/mm/hugetlbpage.c between commit 097d59106a8e ("vm: avoid using find_vma_prev() unnecessarily") from Linus' tree and commit "hugetlb: drop prev_vma in ...
Message posted on the March 08th, 2012 - 02:00 am ET
linux-next: manual merge of the akpm tree with Linus' tree
Hi Andrew, Today's linux-next merge of the akpm tree got a conflict in mm/page_alloc.c between commit c67fe3752abe ("mm: compaction: Abort async compaction if locks are contended or taking too long") from Linus' tree and commit "mm: ...
Message posted on the August 22nd, 2012 - 02:10 am ET
linux-next: manual merge of the akpm tree with Linus' tree
Hi Andrew, Today's linux-next merge of the akpm tree got a conflict in kernel/auditsc.c between commit b24a30a73054 ("audit: fix event coverage of AUDIT_ANOM_LINK") from Linus' tree and commit "audit: fix mq_open and mq_unlink to ...
Message posted on the May 12th, 2013 - 10:10 pm ET
linux-next: manual merge of the akpm tree with the tip tree
Hi Andrew, Today's linux-next merge of the akpm tree got a conflict in kernel/timeconst.pl between commit 63a3f603413f ("timeconst.pl: Eliminate Perl warning") from the tip tree and commit "timeconst.pl: remove deprecated ...
Message posted on the February 13th, 2013 - 11:30 pm ET
linux-next: manual merge of the akpm-current tree with the kvm tree
Hi Andrew, Today's linux-next merge of the akpm-current tree got a conflict in arch/x86/kvm/mmu.c between commit 9bb4f6b15ec0 ("KVM: MMU: drop unneeded checks") from the kvm tree and commit "hlist: drop the node parameter from ...
Message posted on the February 07th, 2013 - 01:10 am ET