linux-next: manual merge of the akpm-current tree with Linus' tree

Hi all, Today's linux-next merge of the akpm-current tree got a conflict in: kernel/watchdog.c between commit: 89e28ce60cb6 ("workqueue/watchdog: Make unbound workqueues aware of touch_softlockup_watchdog() 84;0;0c84;0;0c There are two workqueue-specific watchdog timestamps:") (pity

linux-next: manual merge of the akpm-current tree with Linus' tree

Hi all, Today's linux-next merge of the akpm-current tree got a conflict in: lib/cpumask.c between commit: 2452483d9546 ("Revert "lib: Restrict cpumask_local_spread to houskeeping CPUs"") from Linus' tree and commits: 9eca9bb9bd98 ("lib: optimize cpumask_local_spread()")

linux-next: manual merge of the akpm-current tree with Linus' tree

Hi all, Today's linux-next merge of the akpm-current tree got a conflict in: drivers/dax/device.c between commit: 4533d3aed857 ("memremap: rename MEMORY_DEVICE_DEVDAX to MEMORY_DEVICE_GENERIC") from Linus' tree and commit: ceb1b473719c ("device-dax: make pgmap optional for instance

linux-next: manual merge of the akpm-current tree with Linus' tree

Hi all, Today's linux-next merge of the akpm-current tree got a conflict in: .clang-format between commit: 4e4bb894467c ("clang-format: Update with the latest for_each macro list") from Linus' tree and commits: 7008a2f408a3 ("memblock: implement for_each_reserved_mem_region() using

linux-next: manual merge of the akpm-current tree with Linus' tree

Hi all, Today's linux-next merge of the akpm-current tree got a conflict in: mm/gup.c between commit: 17839856fd58 ("gup: document and work around "COW can break either way" issue") from Linus' tree and (at least) commits: d7f76db8e4ad ("mm/gup: move __get_user_pages_fast() down a few

linux-next: manual merge of the akpm-current tree with Linus' tree

Hi all, Today's linux-next merge of the akpm-current tree got a conflict in: drivers/gpu/drm/i915/gem/i915_gem_userptr.c between commit: 17839856fd58 ("gup: document and work around "COW can break either way" issue") from Linus' tree and commit: bca3ecd3b92c ("drm/i915: convert

Re: linux-next: manual merge of the akpm-current tree with Linus' tree

Hi all, On Mon, 18 Feb 2019 17:51:20 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the akpm-current tree got a conflict in: > > fs/binfmt_script.c > > between commit: > > cb5b020a8d38 ("Revert "exec: load_script: don't blindly truncate shebang > string"") > > from

linux-next: manual merge of the akpm-current tree with Linus' tree

Hi all, Today's linux-next merge of the akpm-current tree got a conflict in: fs/binfmt_script.c between commit: cb5b020a8d38 ("Revert "exec: load_script: don't blindly truncate shebang string"") from Linus' tree and commit: 76b21f3b9c4d ("exec: load_script: allow interpreter argument

Re: linux-next: manual merge of the akpm-current tree with Linus' tree

On Fri, Jan 11, 2019 at 01:51:00PM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the akpm-current tree got a conflict in: > > mm/rmap.c > > between commit: > > ba422731316d ("mm/mmu_notifier: mm/rmap.c: Fix a mmu_notifier range bug in > try_to_unmap_one") > >

linux-next: manual merge of the akpm-current tree with Linus' tree

Hi all, Today's linux-next merge of the akpm-current tree got a conflict in: mm/rmap.c between commit: ba422731316d ("mm/mmu_notifier: mm/rmap.c: Fix a mmu_notifier range bug in try_to_unmap_one") from Linus' tree and commit: f955d5dda846 ("mm/mmu_notifier: contextual information for

linux-next: manual merge of the akpm-current tree with Linus' tree

Hi all, Today's linux-next merge of the akpm-current tree got a conflict in: mm/mincore.c between commit: 574823bfab82 ("Change mincore() to count "mapped" pages rather than "cached" pages") from Linus' tree and commit: 86ee23ad82b6 ("mm: fix race between swapoff and mincore") from

linux-next: manual merge of the akpm-current tree with Linus' tree

Hi all, Today's linux-next merge of the akpm-current tree got a conflict in: include/asm-generic/pgtable.h between commits: 42e4089c7890 ("x86/speculation/l1tf: Disallow non privileged high MMIO PROT_NONE mappings") 6c26fcd2abfe ("x86/speculation/l1tf: Unbreak

linux-next: manual merge of the akpm-current tree with Linus' tree

Hi all, Today's linux-next merge of the akpm-current tree got a conflict in: include/asm-generic/pgtable.h between commits: 42e4089c7890 ("x86/speculation/l1tf: Disallow non privileged high MMIO PROT_NONE mappings") 6c26fcd2abfe ("x86/speculation/l1tf: Unbreak

linux-next: manual merge of the akpm-current tree with Linus' tree

Hi all, Today's linux-next merge of the akpm-current tree got a conflict in: mm/mmap.c between commit: 490fc053865c ("mm: make vm_area_alloc() initialize core fields") from Linus' tree and commit: 97478b56e246 ("mm: Fix vma_is_anonymous() false-positives") from the akpm-current tree.

linux-next: manual merge of the akpm-current tree with Linus' tree

Hi all, Today's linux-next merge of the akpm-current tree got a conflict in: mm/mmap.c between commit: 490fc053865c ("mm: make vm_area_alloc() initialize core fields") from Linus' tree and commit: 97478b56e246 ("mm: Fix vma_is_anonymous() false-positives") from the akpm-current tree.

linux-next: manual merge of the akpm-current tree with Linus' tree

Hi Andrew, Today's linux-next merge of the akpm-current tree got a conflict in: fs/ocfs2/journal.c between commit: 6396bb221514 ("treewide: kzalloc() -> kcalloc()") from Linus' tree and commits: 18dc5b7810ff ("ocfs2: without quota support, avoid calling quota recovery") aa935a9c155b

linux-next: manual merge of the akpm-current tree with Linus' tree

Hi Andrew, Today's linux-next merge of the akpm-current tree got a conflict in: fs/ocfs2/journal.c between commit: 6396bb221514 ("treewide: kzalloc() -> kcalloc()") from Linus' tree and commits: 18dc5b7810ff ("ocfs2: without quota support, avoid calling quota recovery") aa935a9c155b

linux-next: manual merge of the akpm-current tree with Linus' tree

Hi Andrew, Today's linux-next merge of the akpm-current tree got a conflict in: fs/binfmt_elf.c between commit: 42bc47b35320 ("treewide: Use array_size() in vmalloc()") from Linus' tree and commit: 1d5239111f52 ("coredump: fix spam with zero VMA process") from the akpm-current tree.

linux-next: manual merge of the akpm-current tree with Linus' tree

Hi Andrew, Today's linux-next merge of the akpm-current tree got a conflict in: fs/binfmt_elf.c between commit: 42bc47b35320 ("treewide: Use array_size() in vmalloc()") from Linus' tree and commit: 1d5239111f52 ("coredump: fix spam with zero VMA process") from the akpm-current tree.

linux-next: manual merge of the akpm-current tree with Linus' tree

Hi Andrew, Today's linux-next merge of the akpm-current tree got a conflict in: mm/page_alloc.c between commit: 3e04040df6d4 ("Revert "mm/page_alloc: fix memmap_init_zone pageblock alignment"") from Linus' tree and commit: 45251b0909dc ("mm: remove unused arg from

linux-next: manual merge of the akpm-current tree with Linus' tree

Hi Andrew, Today's linux-next merge of the akpm-current tree got a conflict in: mm/page_alloc.c between commit: 3e04040df6d4 ("Revert "mm/page_alloc: fix memmap_init_zone pageblock alignment"") from Linus' tree and commit: 45251b0909dc ("mm: remove unused arg from

linux-next: manual merge of the akpm-current tree with Linus' tree

Hi Andrew, Today's linux-next merge of the akpm-current tree got a conflict in: net/ipv4/tcp_input.c between commit: c92e8c02fe66 ("tcp/dccp: fix ireq->opt races") from Linus' tree and commit: 8a3e1a11b8af ("kmemcheck: remove annotations") from the akpm-current tree. I fixed it up

linux-next: manual merge of the akpm-current tree with Linus' tree

Hi Andrew, Today's linux-next merge of the akpm-current tree got a conflict in: net/ipv4/tcp_input.c between commit: c92e8c02fe66 ("tcp/dccp: fix ireq->opt races") from Linus' tree and commit: 8a3e1a11b8af ("kmemcheck: remove annotations") from the akpm-current tree. I fixed it up

linux-next: manual merge of the akpm-current tree with Linus' tree

Hi Andrew, Today's linux-next merge of the akpm-current tree got a conflict in: drivers/net/ethernet/netronome/nfp/nfp_net_common.c between commit: 5f0ca2fb71e2 ("nfp: handle page allocation failures") from Linus' tree and commit: 0432d14c45bb ("mm: remove __GFP_COLD") from the

linux-next: manual merge of the akpm-current tree with Linus' tree

Hi Andrew, Today's linux-next merge of the akpm-current tree got a conflict in: drivers/net/ethernet/netronome/nfp/nfp_net_common.c between commit: 5f0ca2fb71e2 ("nfp: handle page allocation failures") from Linus' tree and commit: 0432d14c45bb ("mm: remove __GFP_COLD") from the

linux-next: manual merge of the akpm-current tree with Linus' tree

Hi Andrew, Today's linux-next merge of the akpm-current tree got a conflict in: init/initramfs.c between commit: 17a9be317475 ("initramfs: Always do fput() and load modules after rootfs populate") from Linus' tree and commit: c25cfb52513b ("initramfs: provide a way to ignore image

linux-next: manual merge of the akpm-current tree with Linus' tree

Hi Andrew, Today's linux-next merge of the akpm-current tree got a conflict in: init/initramfs.c between commit: 17a9be317475 ("initramfs: Always do fput() and load modules after rootfs populate") from Linus' tree and commit: c25cfb52513b ("initramfs: provide a way to ignore image

Re: linux-next: manual merge of the akpm-current tree with Linus' tree

On Mon, Apr 24, 2017 at 05:25:02PM +1000, Stephen Rothwell wrote: > Hi Andrew, > > Today's linux-next merge of the akpm-current tree got a conflict in: > > mm/page_alloc.c > > between commit: > > d34b0733b452 ("Revert "mm, page_alloc: only use per-cpu allocator for > irq-safe requests"")

Re: linux-next: manual merge of the akpm-current tree with Linus' tree

On Mon, Apr 24, 2017 at 05:25:02PM +1000, Stephen Rothwell wrote: > Hi Andrew, > > Today's linux-next merge of the akpm-current tree got a conflict in: > > mm/page_alloc.c > > between commit: > > d34b0733b452 ("Revert "mm, page_alloc: only use per-cpu allocator for > irq-safe requests"")

linux-next: manual merge of the akpm-current tree with Linus' tree

Hi Andrew, Today's linux-next merge of the akpm-current tree got a conflict in: mm/page_alloc.c between commit: d34b0733b452 ("Revert "mm, page_alloc: only use per-cpu allocator for irq-safe requests"") from Linus' tree and commit: f4881295a79e ("mm, page_alloc: re-enable softirq use

linux-next: manual merge of the akpm-current tree with Linus' tree

Hi Andrew, Today's linux-next merge of the akpm-current tree got a conflict in: mm/page_alloc.c between commit: d34b0733b452 ("Revert "mm, page_alloc: only use per-cpu allocator for irq-safe requests"") from Linus' tree and commit: f4881295a79e ("mm, page_alloc: re-enable softirq use

Re: linux-next: manual merge of the akpm-current tree with Linus' tree

Hi Michal, On Mon, 5 Dec 2016 06:56:56 +0100 Michal Hocko wrote: > > FWIW this resolution is correct Thanks, good to know. > > but any non trivial > > conflicts should be mentioned to your upstream maintainer when your tree > > is submitted for merging. You may also want to

Re: linux-next: manual merge of the akpm-current tree with Linus' tree

Hi Michal, On Mon, 5 Dec 2016 06:56:56 +0100 Michal Hocko wrote: > > FWIW this resolution is correct Thanks, good to know. > > but any non trivial > > conflicts should be mentioned to your upstream maintainer when your tree > > is submitted for merging. You may also want to consider

Re: linux-next: manual merge of the akpm-current tree with Linus' tree

On Mon 05-12-16 16:38:08, Stephen Rothwell wrote: > Hi Andrew, > > Today's linux-next merge of the akpm-current tree got a conflict in: > > mm/workingset.c > > between commit: > > 20ab67a563f5 ("mm: workingset: fix NULL ptr in count_shadow_nodes") > > from Linus' tree and commit: > >

Re: linux-next: manual merge of the akpm-current tree with Linus' tree

On Mon 05-12-16 16:38:08, Stephen Rothwell wrote: > Hi Andrew, > > Today's linux-next merge of the akpm-current tree got a conflict in: > > mm/workingset.c > > between commit: > > 20ab67a563f5 ("mm: workingset: fix NULL ptr in count_shadow_nodes") > > from Linus' tree and commit: > >

linux-next: manual merge of the akpm-current tree with Linus' tree

Hi Andrew, Today's linux-next merge of the akpm-current tree got a conflict in: mm/workingset.c between commit: 20ab67a563f5 ("mm: workingset: fix NULL ptr in count_shadow_nodes") from Linus' tree and commit: 8b6983cf8ca6 ("mm: workingset: update shadow limit to reflect bigger active

linux-next: manual merge of the akpm-current tree with Linus' tree

Hi Andrew, Today's linux-next merge of the akpm-current tree got a conflict in: mm/workingset.c between commit: 20ab67a563f5 ("mm: workingset: fix NULL ptr in count_shadow_nodes") from Linus' tree and commit: 8b6983cf8ca6 ("mm: workingset: update shadow limit to reflect bigger active

linux-next: manual merge of the akpm-current tree with Linus' tree

Hi Andrew, Today's linux-next merge of the akpm-current tree got a conflict in: arch/arm/mm/dma-mapping.c drivers/iommu/intel-iommu.c drivers/staging/android/ion/ion_chunk_heap.c between commit: 3e6110fd5480 ("Revert "scatterlist: use sg_phys()"") from Linus' tree and commit:

linux-next: manual merge of the akpm-current tree with Linus' tree

Hi Andrew, Today's linux-next merge of the akpm-current tree got a conflict in: arch/arm/mm/dma-mapping.c drivers/iommu/intel-iommu.c drivers/staging/android/ion/ion_chunk_heap.c between commit: 3e6110fd5480 ("Revert "scatterlist: use sg_phys()"") from Linus' tree and commit:

linux-next: manual merge of the akpm-current tree with Linus' tree

Hi Andrew, Today's linux-next merge of the akpm-current tree got conflicts in: arch/mips/include/uapi/asm/unistd.h arch/mips/kernel/scall32-o32.S arch/mips/kernel/scall64-n32.S arch/mips/kernel/scall64-64.S arch/mips/kernel/scall64-o32.S between commit: 96fc7a9cee67 ("MIPS: Wire up

linux-next: manual merge of the akpm-current tree with Linus' tree

Hi Andrew, Today's linux-next merge of the akpm-current tree got conflicts in: arch/mips/include/uapi/asm/unistd.h arch/mips/kernel/scall32-o32.S arch/mips/kernel/scall64-n32.S arch/mips/kernel/scall64-64.S arch/mips/kernel/scall64-o32.S between commit: 96fc7a9cee67 ("MIPS: Wire up

linux-next: manual merge of the akpm-current tree with Linus' tree

Hi Andrew, Today's linux-next merge of the akpm-current tree got a conflict in: arch/x86/Kconfig between commit: 5aaeb5c01c5b ("x86/fpu, sched: Introduce CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT and use it on x86") from Linus' tree and commit: caf50fadb4de ("mm: send one IPI per CPU to

linux-next: manual merge of the akpm-current tree with Linus' tree

Hi Andrew, Today's linux-next merge of the akpm-current tree got a conflict in: arch/x86/Kconfig between commit: 5aaeb5c01c5b (x86/fpu, sched: Introduce CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT and use it on x86) from Linus' tree and commit: caf50fadb4de (mm: send one IPI per CPU to TLB

linux-next: manual merge of the akpm-current tree with Linus' tree

Hi Andrew, Today's linux-next merge of the akpm-current tree got a conflict in kernel/watchdog.c between commit ab992dc38f9a ("watchdog: Fix merge 'conflict'") from Linus' tree and commit fbfec4606e07 ("kernel/watchdog.c: fix watchdog_nmi_enable_all()") from the akpm-current tree. I fixed it up

linux-next: manual merge of the akpm-current tree with Linus' tree

Hi Andrew, Today's linux-next merge of the akpm-current tree got a conflict in kernel/watchdog.c between commit ab992dc38f9a (watchdog: Fix merge 'conflict') from Linus' tree and commit fbfec4606e07 (kernel/watchdog.c: fix watchdog_nmi_enable_all()) from the akpm-current tree. I fixed it up (the

linux-next: manual merge of the akpm-current tree with Linus' tree

Hi Andrew, Today's linux-next merge of the akpm-current tree got a conflict in mm/memcontrol.c between commit 61e02c745721 ("mm: memcontrol: clean up reclaim size variable use in try_charge()") from Linus' tree and various commits from the akpm-current tree. I fixed it up (I think) and can carry

linux-next: manual merge of the akpm-current tree with Linus' tree

Hi Andrew, Today's linux-next merge of the akpm-current tree got a conflict in net/batman-adv/fragmentation.c between commit d9124268d84a ("batman-adv: Fix out-of-order fragmentation support") from Linus' tree and commit ffe04af00b27 ("list: fix order of arguments for hlist_add_after(_rcu)") from

linux-next: manual merge of the akpm-current tree with Linus' tree

Hi Andrew, Today's linux-next merge of the akpm-current tree got a conflict in net/batman-adv/fragmentation.c between commit d9124268d84a (batman-adv: Fix out-of-order fragmentation support) from Linus' tree and commit ffe04af00b27 (list: fix order of arguments for hlist_add_after(_rcu)) from the

linux-next: manual merge of the akpm-current tree with Linus' tree

Hi Andrew, Today's linux-next merge of the akpm-current tree got a conflict in mm/memcontrol.c between commit 61e02c745721 (mm: memcontrol: clean up reclaim size variable use in try_charge()) from Linus' tree and various commits from the akpm-current tree. I fixed it up (I think) and can carry

linux-next: manual merge of the akpm-current tree with Linus' tree

Hi Andrew, Today's linux-next merge of the akpm-current tree got a conflict in kernel/kexec.c between commit 011e4b02f1da ("powerpc, kexec: Fix "Processor X is stuck" issue during kexec from ST mode") from Linus' tree and commit 51950fcb6d27 ("kernel/kexec.c: convert printk to pr_foo()") from the

linux-next: manual merge of the akpm-current tree with Linus' tree

Hi Andrew, Today's linux-next merge of the akpm-current tree got a conflict in kernel/kexec.c between commit 011e4b02f1da (powerpc, kexec: Fix Processor X is stuck issue during kexec from ST mode) from Linus' tree and commit 51950fcb6d27 (kernel/kexec.c: convert printk to pr_foo()) from the

linux-next: manual merge of the akpm-current tree with Linus' tree

Hi Andrew, Today's linux-next merge of the akpm-current tree got a conflict in mm/vmacache.c between commit 50f5aa8a9b24 ("mm: don't pointlessly use BUG_ON() for sanity check") from Linus' tree and commit 8beba5473820 ("mm,vmacache: add debug data") from the akpm-current tree. I fixed it up (see

linux-next: manual merge of the akpm-current tree with Linus' tree

Hi Andrew, Today's linux-next merge of the akpm-current tree got a conflict in mm/vmacache.c between commit 50f5aa8a9b24 (mm: don't pointlessly use BUG_ON() for sanity check) from Linus' tree and commit 8beba5473820 (mm,vmacache: add debug data) from the akpm-current tree. I fixed it up (see

linux-next: manual merge of the akpm-current tree with Linus' tree

Hi Andrew, Today's linux-next merge of the akpm-current tree got a conflict in mm/memory.c between commit 1b17844b29ae ("mm: make fixup_user_fault() check the vma access rights too") from Linus' tree and commit 0d84be787c23 ("mm: move get_user_pages()-related code to separate file") from the

linux-next: manual merge of the akpm-current tree with Linus' tree

Hi Andrew, Today's linux-next merge of the akpm-current tree got a conflict in mm/memory.c between commit 1b17844b29ae (mm: make fixup_user_fault() check the vma access rights too) from Linus' tree and commit 0d84be787c23 (mm: move get_user_pages()-related code to separate file) from the

linux-next: manual merge of the akpm-current tree with Linus' tree

Hi Andrew, Today's linux-next merge of the akpm-current tree got lots of conflicts with Linus' tree. I tried to fix things up, but it was a real mess and in the end I have just dropped your patch series until you can clean out what went to Linus. -- Cheers, Stephen Rothwell

linux-next: manual merge of the akpm-current tree with Linus' tree

Hi Andrew, Today's linux-next merge of the akpm-current tree got lots of conflicts with Linus' tree. I tried to fix things up, but it was a real mess and in the end I have just dropped your patch series until you can clean out what went to Linus. -- Cheers, Stephen Rothwell

linux-next: manual merge of the akpm-current tree with Linus' tree

Hi Andrew, Today's linux-next merge of the akpm-current tree got a conflict in fs/afs/proc.c between commit b42d570c9fbe ("afs: get rid of junk in fs/afs/proc.c") from Linus' tree and commit 1a3459681f5c ("afs: proc cells and rootcell are writeable") from the akpm-current tree. I fixed it up

linux-next: manual merge of the akpm-current tree with Linus' tree

Hi Andrew, Today's linux-next merge of the akpm-current tree got a conflict in fs/afs/proc.c between commit b42d570c9fbe (afs: get rid of junk in fs/afs/proc.c) from Linus' tree and commit 1a3459681f5c (afs: proc cells and rootcell are writeable) from the akpm-current tree. I fixed it up (see

linux-next: manual merge of the akpm-current tree with Linus' tree

Hi Andrew, Today's linux-next merge of the akpm-current tree got conflicts in include/linux/mm.h and mm/memory.c between commit 597d795a2a78 ("mm: do not allocate page->ptl dynamically, if spinlock_t fits to long") from the tree and commit 489bd4be2d70 ("mm: create a separate slab for page->ptl

linux-next: manual merge of the akpm-current tree with Linus' tree

Hi Andrew, Today's linux-next merge of the akpm-current tree got conflicts in include/linux/mm.h and mm/memory.c between commit 597d795a2a78 (mm: do not allocate page-ptl dynamically, if spinlock_t fits to long) from the tree and commit 489bd4be2d70 (mm: create a separate slab for page-ptl

Re: linux-next: manual merge of the akpm-current tree with Linus' tree

Am Montag, 2. Dezember 2013, 23:31:31 schrieb Andrew Morton: > On Tue, 03 Dec 2013 08:16:04 +0100 Richard Weinberger wrote: > > Andrew, > > > > Am Dienstag, 3. Dezember 2013, 12:52:19 schrieb Stephen Rothwell: > > > Hi Andrew, > > > > > > Today's linux-next merge of the akpm-current tree got a

Re: linux-next: manual merge of the akpm-current tree with Linus' tree

On Tue, 03 Dec 2013 08:16:04 +0100 Richard Weinberger wrote: > Andrew, > > Am Dienstag, 3. Dezember 2013, 12:52:19 schrieb Stephen Rothwell: > > Hi Andrew, > > > > Today's linux-next merge of the akpm-current tree got a conflict in > > arch/um/kernel/sysrq.c between commit 8ed12fcc194d ("um:

Re: linux-next: manual merge of the akpm-current tree with Linus' tree

Andrew, Am Dienstag, 3. Dezember 2013, 12:52:19 schrieb Stephen Rothwell: > Hi Andrew, > > Today's linux-next merge of the akpm-current tree got a conflict in > arch/um/kernel/sysrq.c between commit 8ed12fcc194d ("um: Rename > print_stack_trace to do_stack_trace") from Linus' tree and commit >

linux-next: manual merge of the akpm-current tree with Linus' tree

Hi Andrew, Today's linux-next merge of the akpm-current tree got a conflict in arch/um/kernel/sysrq.c between commit 8ed12fcc194d ("um: Rename print_stack_trace to do_stack_trace") from Linus' tree and commit ce89e7878311 ("arch/um/kernel/sysrq.c: rename print_stack_trace()") from the

linux-next: manual merge of the akpm-current tree with Linus' tree

Hi Andrew, Today's linux-next merge of the akpm-current tree got a conflict in arch/um/kernel/sysrq.c between commit 8ed12fcc194d (um: Rename print_stack_trace to do_stack_trace) from Linus' tree and commit ce89e7878311 (arch/um/kernel/sysrq.c: rename print_stack_trace()) from the akpm-current

Re: linux-next: manual merge of the akpm-current tree with Linus' tree

Andrew, Am Dienstag, 3. Dezember 2013, 12:52:19 schrieb Stephen Rothwell: Hi Andrew, Today's linux-next merge of the akpm-current tree got a conflict in arch/um/kernel/sysrq.c between commit 8ed12fcc194d (um: Rename print_stack_trace to do_stack_trace) from Linus' tree and commit

Re: linux-next: manual merge of the akpm-current tree with Linus' tree

On Tue, 03 Dec 2013 08:16:04 +0100 Richard Weinberger rich...@nod.at wrote: Andrew, Am Dienstag, 3. Dezember 2013, 12:52:19 schrieb Stephen Rothwell: Hi Andrew, Today's linux-next merge of the akpm-current tree got a conflict in arch/um/kernel/sysrq.c between commit 8ed12fcc194d (um:

Re: linux-next: manual merge of the akpm-current tree with Linus' tree

Am Montag, 2. Dezember 2013, 23:31:31 schrieb Andrew Morton: On Tue, 03 Dec 2013 08:16:04 +0100 Richard Weinberger rich...@nod.at wrote: Andrew, Am Dienstag, 3. Dezember 2013, 12:52:19 schrieb Stephen Rothwell: Hi Andrew, Today's linux-next merge of the akpm-current tree got a

linux-next: manual merge of the akpm-current tree with Linus' tree

Hi Andrew, Today's linux-next merge of the akpm-current tree got a conflict in kernel/smp.c between commit f44310b98ddb ("smp: Fix SMP function call empty cpu mask race") from Linus' tree and commit "smp: make smp_call_function_many() use logic similar to smp_call_function_single()" from the

linux-next: manual merge of the akpm-current tree with Linus' tree

Hi Andrew, Today's linux-next merge of the akpm-current tree got a conflict in kernel/smp.c between commit f44310b98ddb (smp: Fix SMP function call empty cpu mask race) from Linus' tree and commit smp: make smp_call_function_many() use logic similar to smp_call_function_single() from the