]> git.karo-electronics.de Git - karo-tx-linux.git/log
karo-tx-linux.git
11 years agoMerge remote-tracking branch 'selinux/master'
Mark Brown [Fri, 18 Oct 2013 16:24:36 +0000 (17:24 +0100)]
Merge remote-tracking branch 'selinux/master'

11 years agoMerge remote-tracking branch 'security/next'
Mark Brown [Fri, 18 Oct 2013 16:10:06 +0000 (17:10 +0100)]
Merge remote-tracking branch 'security/next'

11 years agoMerge remote-tracking branch 'regulator/for-next'
Mark Brown [Fri, 18 Oct 2013 16:07:49 +0000 (17:07 +0100)]
Merge remote-tracking branch 'regulator/for-next'

11 years agoMerge remote-tracking branch 'omap_dss2/for-next'
Mark Brown [Fri, 18 Oct 2013 16:04:34 +0000 (17:04 +0100)]
Merge remote-tracking branch 'omap_dss2/for-next'

Conflicts:
drivers/video/omap2/dss/hdmi4_core.c
drivers/video/omap2/dss/hdmi4_core.h

11 years agoMerge remote-tracking branch 'fbdev/for-next'
Mark Brown [Fri, 18 Oct 2013 16:00:43 +0000 (17:00 +0100)]
Merge remote-tracking branch 'fbdev/for-next'

11 years agoMerge remote-tracking branch 'mfd-lj/for-mfd-next'
Mark Brown [Fri, 18 Oct 2013 15:57:48 +0000 (16:57 +0100)]
Merge remote-tracking branch 'mfd-lj/for-mfd-next'

11 years agoMerge remote-tracking branch 'mfd/master'
Mark Brown [Fri, 18 Oct 2013 15:55:39 +0000 (16:55 +0100)]
Merge remote-tracking branch 'mfd/master'

11 years agoMerge remote-tracking branch 'md/for-next'
Mark Brown [Fri, 18 Oct 2013 15:40:00 +0000 (16:40 +0100)]
Merge remote-tracking branch 'md/for-next'

11 years agoMerge remote-tracking branch 'kgdb/kgdb-next'
Mark Brown [Fri, 18 Oct 2013 15:36:25 +0000 (16:36 +0100)]
Merge remote-tracking branch 'kgdb/kgdb-next'

11 years agoMerge remote-tracking branch 'mmc/mmc-next'
Mark Brown [Fri, 18 Oct 2013 15:34:15 +0000 (16:34 +0100)]
Merge remote-tracking branch 'mmc/mmc-next'

11 years agoMerge remote-tracking branch 'block/for-next'
Mark Brown [Fri, 18 Oct 2013 15:26:26 +0000 (16:26 +0100)]
Merge remote-tracking branch 'block/for-next'

11 years agoMerge remote-tracking branch 'cgroup/for-next'
Mark Brown [Fri, 18 Oct 2013 15:17:47 +0000 (16:17 +0100)]
Merge remote-tracking branch 'cgroup/for-next'

Conflicts:
mm/memcontrol.c

11 years agoMerge remote-tracking branch 'input/next'
Mark Brown [Fri, 18 Oct 2013 13:47:51 +0000 (14:47 +0100)]
Merge remote-tracking branch 'input/next'

11 years agoMerge remote-tracking branch 'virtio/virtio-next'
Mark Brown [Fri, 18 Oct 2013 13:45:43 +0000 (14:45 +0100)]
Merge remote-tracking branch 'virtio/virtio-next'

11 years agoMerge remote-tracking branch 'modules/modules-next'
Mark Brown [Fri, 18 Oct 2013 13:33:56 +0000 (14:33 +0100)]
Merge remote-tracking branch 'modules/modules-next'

11 years agoMerge remote-tracking branch 'sound-asoc/for-next'
Mark Brown [Fri, 18 Oct 2013 13:31:35 +0000 (14:31 +0100)]
Merge remote-tracking branch 'sound-asoc/for-next'

11 years agoMerge remote-tracking branch 'sound/for-next'
Mark Brown [Fri, 18 Oct 2013 13:29:24 +0000 (14:29 +0100)]
Merge remote-tracking branch 'sound/for-next'

11 years agoMerge remote-tracking branch 'drm-tegra/drm/for-next'
Mark Brown [Fri, 18 Oct 2013 13:26:44 +0000 (14:26 +0100)]
Merge remote-tracking branch 'drm-tegra/drm/for-next'

Conflicts:
drivers/gpu/drm/tegra/Kconfig

11 years agoMerge remote-tracking branch 'drm-intel/for-linux-next'
Mark Brown [Fri, 18 Oct 2013 13:24:17 +0000 (14:24 +0100)]
Merge remote-tracking branch 'drm-intel/for-linux-next'

11 years agodrm/i915: Resolve interaction with drm-fixes tree
Mark Brown [Thu, 3 Oct 2013 17:10:55 +0000 (18:10 +0100)]
drm/i915: Resolve interaction with drm-fixes tree

Signed-off-by: Mark Brown <broonie@linaro.org>
11 years agoMerge remote-tracking branch 'drm/drm-next'
Mark Brown [Fri, 18 Oct 2013 13:22:28 +0000 (14:22 +0100)]
Merge remote-tracking branch 'drm/drm-next'

Conflicts:
drivers/gpu/drm/i915/i915_dma.c
drivers/gpu/drm/i915/intel_dp.c
drivers/gpu/drm/i915/intel_drv.h

11 years agoMerge remote-tracking branch 'crypto/master'
Mark Brown [Fri, 18 Oct 2013 13:19:52 +0000 (14:19 +0100)]
Merge remote-tracking branch 'crypto/master'

11 years agoMerge remote-tracking branch 'l2-mtd/master'
Mark Brown [Fri, 18 Oct 2013 13:17:37 +0000 (14:17 +0100)]
Merge remote-tracking branch 'l2-mtd/master'

11 years agoMerge remote-tracking branch 'bluetooth/master'
Mark Brown [Fri, 18 Oct 2013 13:13:55 +0000 (14:13 +0100)]
Merge remote-tracking branch 'bluetooth/master'

11 years agoMerge remote-tracking branch 'ipsec-next/master'
Mark Brown [Fri, 18 Oct 2013 13:10:53 +0000 (14:10 +0100)]
Merge remote-tracking branch 'ipsec-next/master'

11 years agoMerge remote-tracking branch 'net-next/master'
Mark Brown [Fri, 18 Oct 2013 13:03:26 +0000 (14:03 +0100)]
Merge remote-tracking branch 'net-next/master'

Conflicts:
arch/h8300/include/uapi/asm/socket.h
drivers/net/usb/qmi_wwan.c
include/net/dst.h

11 years agoMerge remote-tracking branch 'slave-dma/next'
Mark Brown [Fri, 18 Oct 2013 12:46:53 +0000 (13:46 +0100)]
Merge remote-tracking branch 'slave-dma/next'

11 years agoMerge remote-tracking branch 'dlm/next'
Mark Brown [Fri, 18 Oct 2013 12:44:01 +0000 (13:44 +0100)]
Merge remote-tracking branch 'dlm/next'

11 years agoMerge remote-tracking branch 'ubi/linux-next'
Mark Brown [Fri, 18 Oct 2013 12:41:51 +0000 (13:41 +0100)]
Merge remote-tracking branch 'ubi/linux-next'

11 years agoMerge remote-tracking branch 'thermal/next'
Mark Brown [Fri, 18 Oct 2013 12:39:00 +0000 (13:39 +0100)]
Merge remote-tracking branch 'thermal/next'

11 years agoMerge remote-tracking branch 'idle/next'
Mark Brown [Fri, 18 Oct 2013 12:21:45 +0000 (13:21 +0100)]
Merge remote-tracking branch 'idle/next'

11 years agoMerge remote-tracking branch 'pm/linux-next'
Mark Brown [Fri, 18 Oct 2013 12:05:57 +0000 (13:05 +0100)]
Merge remote-tracking branch 'pm/linux-next'

Conflicts:
drivers/i2c/i2c-core.c

11 years agoMerge remote-tracking branch 'libata/for-next'
Mark Brown [Fri, 18 Oct 2013 12:02:15 +0000 (13:02 +0100)]
Merge remote-tracking branch 'libata/for-next'

11 years agoMerge remote-tracking branch 'kbuild/for-next'
Mark Brown [Fri, 18 Oct 2013 11:59:23 +0000 (12:59 +0100)]
Merge remote-tracking branch 'kbuild/for-next'

11 years agoMerge remote-tracking branch 'v4l-dvb/master'
Mark Brown [Fri, 18 Oct 2013 11:57:08 +0000 (12:57 +0100)]
Merge remote-tracking branch 'v4l-dvb/master'

11 years agoMerge remote-tracking branch 'hwmon-staging/hwmon-next'
Mark Brown [Fri, 18 Oct 2013 11:54:54 +0000 (12:54 +0100)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'

11 years agoMerge remote-tracking branch 'i2c/i2c/for-next'
Mark Brown [Fri, 18 Oct 2013 11:50:38 +0000 (12:50 +0100)]
Merge remote-tracking branch 'i2c/i2c/for-next'

11 years agoMerge remote-tracking branch 'hid/for-next'
Mark Brown [Fri, 18 Oct 2013 11:48:30 +0000 (12:48 +0100)]
Merge remote-tracking branch 'hid/for-next'

11 years agoMerge remote-tracking branch 'pci/next'
Mark Brown [Fri, 18 Oct 2013 11:42:02 +0000 (12:42 +0100)]
Merge remote-tracking branch 'pci/next'

11 years agoMerge remote-tracking branch 'vfs/for-next'
Mark Brown [Fri, 18 Oct 2013 11:27:30 +0000 (12:27 +0100)]
Merge remote-tracking branch 'vfs/for-next'

Conflicts:
fs/nfs/direct.c
fs/nfs/file.c

11 years agoMerge remote-tracking branch 'xfs/for-next'
Mark Brown [Fri, 18 Oct 2013 11:24:54 +0000 (12:24 +0100)]
Merge remote-tracking branch 'xfs/for-next'

11 years agoMerge remote-tracking branch 'nfsd/nfsd-next'
Mark Brown [Fri, 18 Oct 2013 11:19:41 +0000 (12:19 +0100)]
Merge remote-tracking branch 'nfsd/nfsd-next'

11 years agoMerge remote-tracking branch 'nfs/linux-next'
Mark Brown [Fri, 18 Oct 2013 11:17:22 +0000 (12:17 +0100)]
Merge remote-tracking branch 'nfs/linux-next'

11 years agoMerge remote-tracking branch 'logfs/master'
Mark Brown [Fri, 18 Oct 2013 11:15:14 +0000 (12:15 +0100)]
Merge remote-tracking branch 'logfs/master'

11 years agoMerge remote-tracking branch 'jfs/jfs-next'
Mark Brown [Fri, 18 Oct 2013 11:13:09 +0000 (12:13 +0100)]
Merge remote-tracking branch 'jfs/jfs-next'

11 years agoMerge remote-tracking branch 'gfs2/master'
Mark Brown [Fri, 18 Oct 2013 11:11:02 +0000 (12:11 +0100)]
Merge remote-tracking branch 'gfs2/master'

11 years agoMerge remote-tracking branch 'fuse/for-next'
Mark Brown [Fri, 18 Oct 2013 10:56:48 +0000 (11:56 +0100)]
Merge remote-tracking branch 'fuse/for-next'

11 years agoMerge remote-tracking branch 'fscache/fscache'
Mark Brown [Fri, 18 Oct 2013 10:42:44 +0000 (11:42 +0100)]
Merge remote-tracking branch 'fscache/fscache'

11 years agoMerge remote-tracking branch 'f2fs/dev'
Mark Brown [Fri, 18 Oct 2013 10:40:39 +0000 (11:40 +0100)]
Merge remote-tracking branch 'f2fs/dev'

11 years agoMerge remote-tracking branch 'ecryptfs/next'
Mark Brown [Fri, 18 Oct 2013 10:35:35 +0000 (11:35 +0100)]
Merge remote-tracking branch 'ecryptfs/next'

11 years agoMerge remote-tracking branch 'cifs/for-next'
Mark Brown [Fri, 18 Oct 2013 10:32:34 +0000 (11:32 +0100)]
Merge remote-tracking branch 'cifs/for-next'

11 years agoceph: Fix up for iov_iter changes
Mark Brown [Thu, 3 Oct 2013 12:05:20 +0000 (13:05 +0100)]
ceph: Fix up for iov_iter changes

Extend an earlier fixup by Stephen Rothwell.

Signed-off-by: Mark Brown <broonie@linaro.org>
11 years agoMerge remote-tracking branch 'ceph/master'
Mark Brown [Fri, 18 Oct 2013 10:19:11 +0000 (11:19 +0100)]
Merge remote-tracking branch 'ceph/master'

11 years agoMerge remote-tracking branch 'aio-direct/for-next'
Mark Brown [Fri, 18 Oct 2013 10:04:13 +0000 (11:04 +0100)]
Merge remote-tracking branch 'aio-direct/for-next'

11 years agoMerge remote-tracking branch 'sh/sh-latest'
Mark Brown [Fri, 18 Oct 2013 09:58:55 +0000 (10:58 +0100)]
Merge remote-tracking branch 'sh/sh-latest'

Conflicts:
arch/sh/kernel/cpu/sh2a/Makefile
drivers/tty/serial/sh-sci.c
include/linux/serial_sci.h

11 years agoMerge remote-tracking branch 's390/features'
Mark Brown [Fri, 18 Oct 2013 08:09:09 +0000 (09:09 +0100)]
Merge remote-tracking branch 's390/features'

11 years agoMerge remote-tracking branch 'mpc5xxx/next'
Mark Brown [Fri, 18 Oct 2013 08:06:22 +0000 (09:06 +0100)]
Merge remote-tracking branch 'mpc5xxx/next'

11 years agoMerge remote-tracking branch 'powerpc/next'
Mark Brown [Fri, 18 Oct 2013 07:51:00 +0000 (08:51 +0100)]
Merge remote-tracking branch 'powerpc/next'

11 years agoMerge remote-tracking branch 'parisc-hd/for-next'
Mark Brown [Fri, 18 Oct 2013 07:48:57 +0000 (08:48 +0100)]
Merge remote-tracking branch 'parisc-hd/for-next'

11 years agoMerge remote-tracking branch 'mips/mips-for-linux-next'
Mark Brown [Fri, 18 Oct 2013 07:45:27 +0000 (08:45 +0100)]
Merge remote-tracking branch 'mips/mips-for-linux-next'

11 years agoMerge remote-tracking branch 'm68k/for-next'
Mark Brown [Fri, 18 Oct 2013 07:41:15 +0000 (08:41 +0100)]
Merge remote-tracking branch 'm68k/for-next'

11 years agoMerge remote-tracking branch 'ia64/next'
Mark Brown [Fri, 18 Oct 2013 07:39:12 +0000 (08:39 +0100)]
Merge remote-tracking branch 'ia64/next'

11 years agoMerge remote-tracking branch 'h8300-remove/h8300-remove'
Mark Brown [Fri, 18 Oct 2013 07:26:48 +0000 (08:26 +0100)]
Merge remote-tracking branch 'h8300-remove/h8300-remove'

11 years agoMerge remote-tracking branch 'c6x/for-linux-next'
Mark Brown [Fri, 18 Oct 2013 07:24:02 +0000 (08:24 +0100)]
Merge remote-tracking branch 'c6x/for-linux-next'

11 years agoMerge remote-tracking branch 'arm-perf/for-next/perf'
Mark Brown [Fri, 18 Oct 2013 07:20:32 +0000 (08:20 +0100)]
Merge remote-tracking branch 'arm-perf/for-next/perf'

11 years agoMerge remote-tracking branch 'arm/for-next'
Mark Brown [Fri, 18 Oct 2013 07:09:45 +0000 (08:09 +0100)]
Merge remote-tracking branch 'arm/for-next'

11 years agoMerge remote-tracking branch 'arc/for-next'
Mark Brown [Fri, 18 Oct 2013 07:07:42 +0000 (08:07 +0100)]
Merge remote-tracking branch 'arc/for-next'

11 years agoMerge remote-tracking branch 'drm-intel-fixes/for-linux-next-fixes'
Mark Brown [Fri, 18 Oct 2013 07:04:50 +0000 (08:04 +0100)]
Merge remote-tracking branch 'drm-intel-fixes/for-linux-next-fixes'

11 years agoMerge remote-tracking branch 'input-current/for-linus'
Mark Brown [Fri, 18 Oct 2013 06:55:29 +0000 (07:55 +0100)]
Merge remote-tracking branch 'input-current/for-linus'

11 years agoMerge remote-tracking branch 'tty.current/tty-linus'
Mark Brown [Fri, 18 Oct 2013 06:51:16 +0000 (07:51 +0100)]
Merge remote-tracking branch 'tty.current/tty-linus'

11 years agoMerge remote-tracking branch 'net/master'
Mark Brown [Fri, 18 Oct 2013 06:40:07 +0000 (07:40 +0100)]
Merge remote-tracking branch 'net/master'

11 years agonet: Delete trailing semi-colon from definition of netdev_WARN()
Ben Hutchings [Mon, 14 Oct 2013 20:49:21 +0000 (21:49 +0100)]
net: Delete trailing semi-colon from definition of netdev_WARN()

Macro definitions should not normally end with a semi-colon, as this
makes it dangerous to use them an if...else statement.  Happily this
has not happened yet.

Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
11 years agonet: refactor sk_page_frag_refill()
Eric Dumazet [Thu, 17 Oct 2013 23:27:07 +0000 (16:27 -0700)]
net: refactor sk_page_frag_refill()

While working on virtio_net new allocation strategy to increase
payload/truesize ratio, we found that refactoring sk_page_frag_refill()
was needed.

This patch splits sk_page_frag_refill() into two parts, adding
skb_page_frag_refill() which can be used without a socket.

While we are at it, add a minimum frag size of 32 for
sk_page_frag_refill()

Michael will either use netdev_alloc_frag() from softirq context,
or skb_page_frag_refill() from process context in refill_work()
 (GFP_KERNEL allocations)

Signed-off-by: Eric Dumazet <edumazet@google.com>
Cc: Michael Dalton <mwdalton@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
11 years agoMerge branch 'pci_set_drvdata'
David S. Miller [Fri, 18 Oct 2013 04:04:05 +0000 (00:04 -0400)]
Merge branch 'pci_set_drvdata'

Jingoo Han says:

====================
net: ethernet: remove unnecessary pci_set_drvdata() part 1

Since commit 0998d0631001288a5974afc0b2a5f568bcdecb4d
(device-core: Ensure drvdata = NULL when no driver is bound),
the driver core clears the driver data to NULL after device_release
or on probe failure. Thus, it is not needed to manually clear the
device driver data to NULL.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
11 years agonet: enic: remove unnecessary pci_set_drvdata()
Jingoo Han [Fri, 18 Oct 2013 00:25:29 +0000 (09:25 +0900)]
net: enic: remove unnecessary pci_set_drvdata()

The driver core clears the driver data to NULL after device_release
or on probe failure. Thus, it is not needed to manually clear the
device driver data to NULL.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
11 years agonet: cxgb4vf: remove unnecessary pci_set_drvdata()
Jingoo Han [Fri, 18 Oct 2013 00:24:54 +0000 (09:24 +0900)]
net: cxgb4vf: remove unnecessary pci_set_drvdata()

The driver core clears the driver data to NULL after device_release
or on probe failure. Thus, it is not needed to manually clear the
device driver data to NULL.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
11 years agonet: cxgb2: remove unnecessary pci_set_drvdata()
Jingoo Han [Fri, 18 Oct 2013 00:24:07 +0000 (09:24 +0900)]
net: cxgb2: remove unnecessary pci_set_drvdata()

The driver core clears the driver data to NULL after device_release
or on probe failure. Thus, it is not needed to manually clear the
device driver data to NULL.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
11 years agonet: cxgb3: remove unnecessary pci_set_drvdata()
Jingoo Han [Fri, 18 Oct 2013 00:23:27 +0000 (09:23 +0900)]
net: cxgb3: remove unnecessary pci_set_drvdata()

The driver core clears the driver data to NULL after device_release
or on probe failure. Thus, it is not needed to manually clear the
device driver data to NULL.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
11 years agonet: cxgb4: remove unnecessary pci_set_drvdata()
Jingoo Han [Fri, 18 Oct 2013 00:23:00 +0000 (09:23 +0900)]
net: cxgb4: remove unnecessary pci_set_drvdata()

The driver core clears the driver data to NULL after device_release
or on probe failure. Thus, it is not needed to manually clear the
device driver data to NULL.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
11 years agonet: bna: remove unnecessary pci_set_drvdata()
Jingoo Han [Fri, 18 Oct 2013 00:22:22 +0000 (09:22 +0900)]
net: bna: remove unnecessary pci_set_drvdata()

The driver core clears the driver data to NULL after device_release
or on probe failure. Thus, it is not needed to manually clear the
device driver data to NULL.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
11 years agonet: tg3: remove unnecessary pci_set_drvdata()
Jingoo Han [Fri, 18 Oct 2013 00:21:54 +0000 (09:21 +0900)]
net: tg3: remove unnecessary pci_set_drvdata()

The driver core clears the driver data to NULL after device_release
or on probe failure. Thus, it is not needed to manually clear the
device driver data to NULL.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
11 years agonet: bnx2x: remove unnecessary pci_set_drvdata()
Jingoo Han [Fri, 18 Oct 2013 00:21:26 +0000 (09:21 +0900)]
net: bnx2x: remove unnecessary pci_set_drvdata()

The driver core clears the driver data to NULL after device_release
or on probe failure. Thus, it is not needed to manually clear the
device driver data to NULL.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
11 years agonet: bnx2: remove unnecessary pci_set_drvdata()
Jingoo Han [Fri, 18 Oct 2013 00:21:10 +0000 (09:21 +0900)]
net: bnx2: remove unnecessary pci_set_drvdata()

The driver core clears the driver data to NULL after device_release
or on probe failure. Thus, it is not needed to manually clear the
device driver data to NULL.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
11 years agonet: alx: remove unnecessary pci_set_drvdata()
Jingoo Han [Fri, 18 Oct 2013 00:20:24 +0000 (09:20 +0900)]
net: alx: remove unnecessary pci_set_drvdata()

The driver core clears the driver data to NULL after device_release
or on probe failure. Thus, it is not needed to manually clear the
device driver data to NULL.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
11 years agonet: amd8111e: remove unnecessary pci_set_drvdata()
Jingoo Han [Fri, 18 Oct 2013 00:19:54 +0000 (09:19 +0900)]
net: amd8111e: remove unnecessary pci_set_drvdata()

The driver core clears the driver data to NULL after device_release
or on probe failure. Thus, it is not needed to manually clear the
device driver data to NULL.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
11 years agonet: pcnet32: remove unnecessary pci_set_drvdata()
Jingoo Han [Fri, 18 Oct 2013 00:19:23 +0000 (09:19 +0900)]
net: pcnet32: remove unnecessary pci_set_drvdata()

The driver core clears the driver data to NULL after device_release
or on probe failure. Thus, it is not needed to manually clear the
device driver data to NULL.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Acked-by: Don Fry <pcnet32@frontier.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
11 years agonet: starfire: remove unnecessary pci_set_drvdata()
Jingoo Han [Fri, 18 Oct 2013 00:18:53 +0000 (09:18 +0900)]
net: starfire: remove unnecessary pci_set_drvdata()

The driver core clears the driver data to NULL after device_release
or on probe failure. Thus, it is not needed to manually clear the
device driver data to NULL.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
11 years agonet: 8390: remove unnecessary pci_set_drvdata()
Jingoo Han [Fri, 18 Oct 2013 00:18:18 +0000 (09:18 +0900)]
net: 8390: remove unnecessary pci_set_drvdata()

The driver core clears the driver data to NULL after device_release
or on probe failure. Thus, it is not needed to manually clear the
device driver data to NULL.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
11 years agonet: typhoon: remove unnecessary pci_set_drvdata()
Jingoo Han [Fri, 18 Oct 2013 00:17:58 +0000 (09:17 +0900)]
net: typhoon: remove unnecessary pci_set_drvdata()

The driver core clears the driver data to NULL after device_release
or on probe failure. Thus, it is not needed to manually clear the
device driver data to NULL.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Acked-by: David Dillow <dave@thedillows.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
11 years agoMerge branch 'for-linus' of git://git.samba.org/sfrench/cifs-2.6
Linus Torvalds [Fri, 18 Oct 2013 01:49:21 +0000 (18:49 -0700)]
Merge branch 'for-linus' of git://git.samba.org/sfrench/cifs-2.6

Pull CIFS fixes from Steve French:
 "Five small cifs fixes (includes fixes for: unmount hang, 2 security
  related, symlink, large file writes)"

* 'for-linus' of git://git.samba.org/sfrench/cifs-2.6:
  cifs: ntstatus_to_dos_map[] is not terminated
  cifs: Allow LANMAN auth method for servers supporting unencapsulated authentication methods
  cifs: Fix inability to write files >2GB to SMB2/3 shares
  cifs: Avoid umount hangs with smb2 when server is unresponsive
  do not treat non-symlink reparse points as valid symlinks

11 years agof2fs: avoid to write during the recovery
Jaegeuk Kim [Wed, 16 Oct 2013 06:09:26 +0000 (15:09 +0900)]
f2fs: avoid to write during the recovery

This patch enhances the recovery routine not to write any data/node/meta until
its completion.
If any writes are sent to the disk, it could contaminate the written history
that will be used for further recovery.

Signed-off-by: Jaegeuk Kim <jaegeuk.kim@samsung.com>
11 years agof2fs: avoid wait if IO end up when do_checkpoint for better performance
Gu Zheng [Mon, 14 Oct 2013 10:45:56 +0000 (18:45 +0800)]
f2fs: avoid wait if IO end up when do_checkpoint for better performance

Previously, do_checkpoint() will call congestion_wait() for waiting the pages
(previous submitted node/meta/data pages) to be written back.
Because congestion_wait() will set a regular period (e.g. HZ / 50 ) for waiting, and
no additional wake up mechanism was introduced if IO ends up before regular period costed.
Yuan Zhong found there is a situation that after the pages have been written back,
but the checkpoint thread still wait for congestion_wait to exit.

So here we store checkpoint task into f2fs_sb when doing checkpoint, it'll wait for IO completes
if there's IO going on, and in the end IO path, wake up checkpoint task when IO ends up.

Thanks to Yuan Zhong's pre work about this problem.

Reported-by: Yuan Zhong <yuan.mark.zhong@samsung.com>
Signed-off-by: Gu Zheng <guz.fnst@cn.fujitsu.com>
Signed-off-by: Jaegeuk Kim <jaegeuk.kim@samsung.com>
11 years agof2fs: introduce function read_raw_super_block()
Gu Zheng [Mon, 14 Oct 2013 10:47:11 +0000 (18:47 +0800)]
f2fs: introduce function read_raw_super_block()

Introduce function read_raw_super_block() to hide reading raw super block and
the retry routine if the first sb is invalid.

Signed-off-by: Gu Zheng <guz.fnst@cn.fujitsu.com>
Signed-off-by: Jaegeuk Kim <jaegeuk.kim@samsung.com>
11 years agof2fs: fix the starvation problem on cp_rwsem
Jaegeuk Kim [Thu, 10 Oct 2013 05:36:00 +0000 (14:36 +0900)]
f2fs: fix the starvation problem on cp_rwsem

This patch removes the logic previously introduced to address the starvation
on cp_rwsem.

One potential there-in bug is that we should cover the wait.list with spin_lock,
but the previous code broke this rule.

And, actually current rwsem handles this starvation issue reasonably, so that we
didn't need to do this before neither.

Signed-off-by: Jaegeuk Kim <jaegeuk.kim@samsung.com>
11 years agof2fs: fix to store and retrieve i_rdev correctly
Jaegeuk Kim [Tue, 8 Oct 2013 09:01:51 +0000 (18:01 +0900)]
f2fs: fix to store and retrieve i_rdev correctly

When storing i_rdev, we should check its file type.

Signed-off-by: Jaegeuk Kim <jaegeuk.kim@samsung.com>
11 years agoMerge remote-tracking branch 'regulator/topic/tps65910' into regulator-next
Mark Brown [Thu, 17 Oct 2013 23:56:54 +0000 (00:56 +0100)]
Merge remote-tracking branch 'regulator/topic/tps65910' into regulator-next

11 years agoMerge remote-tracking branch 'regulator/topic/tps6586x' into regulator-next
Mark Brown [Thu, 17 Oct 2013 23:56:53 +0000 (00:56 +0100)]
Merge remote-tracking branch 'regulator/topic/tps6586x' into regulator-next

11 years agoMerge remote-tracking branch 'regulator/topic/tps65090' into regulator-next
Mark Brown [Thu, 17 Oct 2013 23:56:53 +0000 (00:56 +0100)]
Merge remote-tracking branch 'regulator/topic/tps65090' into regulator-next

11 years agoMerge remote-tracking branch 'regulator/topic/tps65023' into regulator-next
Mark Brown [Thu, 17 Oct 2013 23:56:53 +0000 (00:56 +0100)]
Merge remote-tracking branch 'regulator/topic/tps65023' into regulator-next

11 years agoMerge remote-tracking branch 'regulator/topic/tps6105x' into regulator-next
Mark Brown [Thu, 17 Oct 2013 23:56:52 +0000 (00:56 +0100)]
Merge remote-tracking branch 'regulator/topic/tps6105x' into regulator-next