The patch titled memcg-make-throttle_vm_writeout-memcg-aware-fix has been added to the -mm tree. Its filename is memcg-make-throttle_vm_writeout-memcg-aware-fix.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: memcg-make-throttle_vm_writeout-memcg-aware-fix From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> In file included from include/linux/memcontrol.h:22, from include/linux/swap.h:8, from include/linux/suspend.h:4, from arch/x86/kernel/asm-offsets_64.c:13, from arch/x86/kernel/asm-offsets.c:4: include/linux/writeback.h:102: warning: 'struct mem_cgroup' declared inside parameter list include/linux/writeback.h:102: warning: its scope is only this definition or declaration, which is probably not what you want In file included from include/linux/memcontrol.h:22, from include/linux/swap.h:8, from mm/page-writeback.c:19: include/linux/writeback.h:102: warning: 'struct mem_cgroup' declared inside parameter list include/linux/writeback.h:102: warning: its scope is only this definition or declaration, which is probably not what you want mm/page-writeback.c:700: error: conflicting types for 'throttle_vm_writeout' include/linux/writeback.h:102: error: previous declaration of 'throttle_vm_writeout' was here Cc: Andrea Righi <arighi@xxxxxxxxxxx> Cc: Balbir Singh <balbir@xxxxxxxxxxxxxxxxxx> Cc: Daisuke Nishimura <nishimura@xxxxxxxxxxxxxxxxx> Cc: Dave Young <hidave.darkstar@xxxxxxxxx> Cc: Greg Thelen <gthelen@xxxxxxxxxx> Cc: Johannes Weiner <hannes@xxxxxxxxxxx> Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx> Cc: Minchan Kim <minchan.kim@xxxxxxxxx> Cc: Wu Fengguang <fengguang.wu@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/linux/writeback.h | 1 + 1 file changed, 1 insertion(+) diff -puN include/linux/writeback.h~memcg-make-throttle_vm_writeout-memcg-aware-fix include/linux/writeback.h --- a/include/linux/writeback.h~memcg-make-throttle_vm_writeout-memcg-aware-fix +++ a/include/linux/writeback.h @@ -8,6 +8,7 @@ #include <linux/fs.h> struct backing_dev_info; +struct mem_cgroup; extern spinlock_t inode_lock; _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are origin.patch hpet-factor-timer-allocate-from-open.patch atomic-add-atomic_inc_not_zero_hint-checkpatch-fixes.patch linux-next.patch next-remove-localversion.patch arch-x86-kernel-entry_64s-fix-build-with-gas-2161.patch arch-x86-kernel-entry_32s-i386-too.patch i-need-old-gcc.patch arch-alpha-kernel-systblss-remove-debug-check.patch drivers-misc-isl29020c-dont-ignore-the-i2c_smbus_read_byte_data-return-value.patch drivers-misc-bh1770glcc-error-handling-in-bh1770_power_state_store.patch mm-vmap-area-cache.patch arch-x86-kernel-apic-io_apicc-fix-warning.patch drivers-gpu-drm-radeon-atomc-fix-warning.patch irq-use-per_cpu-kstat_irqs-checkpatch-fixes.patch leds-route-kbd-leds-through-the-generic-leds-layer.patch leds-add-led-trigger-for-input-subsystem-led-events.patch backlight-add-low-threshold-to-pwm-backlight.patch atmel_serial-fix-rts-high-after-initialization-in-rs485-mode-fix.patch drivers-message-fusion-mptsasc-fix-warning.patch mm.patch mm-vmstat-use-a-single-setter-function-and-callback-for-adjusting-percpu-thresholds-fix.patch sync_inode_metadata-fix-comment.patch frv-duplicate-output_buffer-of-e03-checkpatch-fixes.patch memcg-document-cgroup-dirty-memory-interfaces-fix.patch memcg-make-throttle_vm_writeout-memcg-aware-fix.patch fs-proc-basec-kernel-latencytopc-convert-sprintf_symbol-to-%ps-checkpatch-fixes.patch pps-add-async-pps-event-handler-fix.patch memstick-add-driver-for-ricoh-r5c592-card-reader-fix.patch journal_add_journal_head-debug.patch slab-leaks3-default-y.patch put_bh-debug.patch getblk-handle-2tb-devices.patch memblock-add-input-size-checking-to-memblock_find_region.patch memblock-add-input-size-checking-to-memblock_find_region-fix.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html