aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-07-23Add linux-next specific files for 20150723next-20150723Stephen Rothwell
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
2015-07-23Merge branch 'akpm/master'Stephen Rothwell
2015-07-23drivers/w1/w1_int.c: call put_device if device_register failsLevente Kurusa
Currently, memsetting and kfreeing the device is bad behaviour. The device will have a reference count of 1 and hence can cause trouble because it has kfree'd. Proper way to handle a failed device_register is to call put_device right after it fails. Signed-off-by: Levente Kurusa <levex@linux.com> Acked-by: Evgeniy Polyakov <zbr@ioremap.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
2015-07-23fs-seq_file-convert-int-seq_vprint-seq_printf-etc-returns-to-void-fixAndrew Morton
Cc: Al Viro <viro@ZenIV.linux.org.uk> Cc: Joe Perches <joe@perches.com> Cc: Steven Rostedt <rostedt@goodmis.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
2015-07-23fs/seq_file: convert int seq_vprint/seq_printf/etc... returns to voidJoe Perches
The seq_<foo> function return values were frequently misused. See: commit 1f33c41c03da ("seq_file: Rename seq_overflow() to seq_has_overflowed() and make public") All uses of these return values have been removed, so convert the return types to void. Miscellanea: o Move seq_put_decimal_<type> and seq_escape prototypes closer the other seq_vprintf prototypes o Reorder seq_putc and seq_puts to return early on overflow o Add argument names to seq_vprintf and seq_printf o Update the seq_escape kernel-doc o Convert a couple of leading spaces to tabs in seq_escape Signed-off-by: Joe Perches <joe@perches.com> Cc: Al Viro <viro@ZenIV.linux.org.uk> Cc: Steven Rostedt <rostedt@goodmis.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
2015-07-23namei: fix warning while make xmldocs caused by namei.cMasanari Iida
Fix the following warnings: Warning(.//fs/namei.c:2422): No description found for parameter 'nd' Warning(.//fs/namei.c:2422): Excess function parameter 'nameidata' description in 'path_mountpoint' Signed-off-by: Masanari Iida <standby24x7@gmail.com> Acked-by: Randy Dunlap <rdunlap@infradead.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
2015-07-23net/netfilter/ipset: work around gcc-4.4.4 initializer bugAndrew Morton
gcc-4.4.4 (at least) isn't able to handle the mixture of anonymous unions and declaration-time intializers. Work around this. net/netfilter/ipset/ip_set_hash_netnet.c: In function 'hash_netnet4_uadt': net/netfilter/ipset/ip_set_hash_netnet.c:163: error: unknown field 'cidr' specified in initializer net/netfilter/ipset/ip_set_hash_netnet.c:163: warning: missing braces around initializer net/netfilter/ipset/ip_set_hash_netnet.c:163: warning: (near initialization for 'e.<anonymous>.ip') ... Fixes: ea53ac5b630e813ae ("netfilter: ipset: Add hash:net,net module to kernel.) Cc: Oliver Smith <oliver@8.c.9.b.0.7.4.0.1.0.0.2.ip6.arpa> Cc: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
2015-07-23drivers/gpu/drm/i915/intel_tv.c: fix buildAndrew Morton
gcc-4.4.4: cc1: warnings being treated as errors drivers/gpu/drm/i915/intel_tv.c: In function 'intel_tv_detect': drivers/gpu/drm/i915/intel_tv.c:1319: error: 'type' may be used uninitialized in this function Cc: Daniel Vetter <daniel.vetter@intel.com> Acked-by: Jani Nikula <jani.nikula@intel.com> Cc: David Airlie <airlied@linux.ie> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
2015-07-23drivers/gpu/drm/i915/intel_sprite.c: fix buildAndrew Morton
gcc-4.4.4: cc1: warnings being treated as errors drivers/gpu/drm/i915/intel_sprite.c: In function 'intel_check_sprite_plane': drivers/gpu/drm/i915/intel_sprite.c:767: error: 'src_x' may be used uninitialized in this function drivers/gpu/drm/i915/intel_sprite.c:767: error: 'src_y' may be used uninitialized in this function drivers/gpu/drm/i915/intel_sprite.c:767: error: 'src_w' may be used uninitialized in this function drivers/gpu/drm/i915/intel_sprite.c:767: error: 'src_h' may be used uninitialized in this function Fixes: 96d61a7f267f ("drm/i915: split intel_update_plane into check() and commit()") Cc: Gustavo Padovan <gustavo.padovan@collabora.co.uk> Cc: Ville Syrjala <ville.syrjala@linux.intel.com> Cc: Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
2015-07-23Merge branch 'akpm-current/current'Stephen Rothwell
Conflicts: MAINTAINERS arch/arm/include/asm/Kbuild arch/cris/arch-v10/kernel/entry.S arch/cris/arch-v32/kernel/entry.S arch/cris/include/asm/Kbuild arch/x86/Kconfig fs/ext3/super.c
2015-07-23Merge remote-tracking branch 'rtc/rtc-next'Stephen Rothwell
2015-07-23Merge remote-tracking branch 'coresight/next'Stephen Rothwell
2015-07-23Merge remote-tracking branch 'livepatching/for-next'Stephen Rothwell
2015-07-23Merge remote-tracking branch 'y2038/y2038'Stephen Rothwell
Conflicts: drivers/staging/media/lirc/lirc_parallel.c
2015-07-23Merge remote-tracking branch 'llvmlinux/for-next'Stephen Rothwell
2015-07-23Merge remote-tracking branch 'clk/clk-next'Stephen Rothwell
2015-07-23Merge remote-tracking branch 'userns/for-next'Stephen Rothwell
2015-07-23Merge remote-tracking branch 'gpio/for-next'Stephen Rothwell
2015-07-23Merge remote-tracking branch 'vhost/linux-next'Stephen Rothwell
Conflicts: include/uapi/linux/pci_regs.h
2015-07-23Merge remote-tracking branch 'pinctrl/for-next'Stephen Rothwell
2015-07-23Merge remote-tracking branch 'target-updates/for-next'Stephen Rothwell
2015-07-23Merge remote-tracking branch 'cgroup/for-next'Stephen Rothwell
2015-07-23Merge remote-tracking branch 'kdbus/kdbus'Stephen Rothwell
2015-07-23Merge remote-tracking branch 'extcon/extcon-next'Stephen Rothwell
2015-07-23Merge remote-tracking branch 'staging/staging-next'Stephen Rothwell
2015-07-23Merge remote-tracking branch 'usb-serial/usb-next'Stephen Rothwell
2015-07-23Merge remote-tracking branch 'ipmi/for-next'Stephen Rothwell
2015-07-23Merge remote-tracking branch 'leds/for-next'Stephen Rothwell
2015-07-23Merge remote-tracking branch 'regmap/for-next'Stephen Rothwell
2015-07-23Merge remote-tracking branch 'workqueues/for-next'Stephen Rothwell
2015-07-23Merge remote-tracking branch 'percpu/for-next'Stephen Rothwell
2015-07-23Merge remote-tracking branch 'kvms390/next'Stephen Rothwell
Conflicts: arch/s390/kernel/entry.S
2015-07-23Merge remote-tracking branch 'rcu/rcu/next'Stephen Rothwell
Conflicts: arch/x86/kernel/traps.c
2015-07-23Merge remote-tracking branch 'irqchip/irqchip/for-next'Stephen Rothwell
2015-07-23Merge remote-tracking branch 'edac-amd/for-next'Stephen Rothwell
2015-07-23Merge remote-tracking branch 'clockevents/clockevents/next'Stephen Rothwell
2015-07-23Merge remote-tracking branch 'tip/auto-latest'Stephen Rothwell
2015-07-23Merge remote-tracking branch 'spi/for-next'Stephen Rothwell
2015-07-23Merge remote-tracking branch 'jc_docs/docs-next'Stephen Rothwell
2015-07-23Merge remote-tracking branch 'iommu/next'Stephen Rothwell
2015-07-23Merge remote-tracking branch 'selinux/next'Stephen Rothwell
2015-07-23Merge remote-tracking branch 'security/next'Stephen Rothwell
2015-07-23Merge remote-tracking branch 'regulator/for-next'Stephen Rothwell
2015-07-23Merge remote-tracking branch 'battery/master'Stephen Rothwell
2015-07-23Merge remote-tracking branch 'mfd/for-mfd-next'Stephen Rothwell
2015-07-23Merge remote-tracking branch 'md/for-next'Stephen Rothwell
2015-07-23Merge remote-tracking branch 'kgdb/kgdb-next'Stephen Rothwell
2015-07-23Merge remote-tracking branch 'mmc-uh/next'Stephen Rothwell
2015-07-23Merge remote-tracking branch 'device-mapper/for-next'Stephen Rothwell
2015-07-23Merge remote-tracking branch 'block/for-next'Stephen Rothwell