]> git.karo-electronics.de Git - karo-tx-linux.git/log
karo-tx-linux.git
10 years agofs: bump inode and dentry counters to long
Glauber Costa [Thu, 18 Jul 2013 23:59:51 +0000 (09:59 +1000)]
fs: bump inode and dentry counters to long

This series reworks our current object cache shrinking infrastructure in
two main ways:

 * Noticing that a lot of users copy and paste their own version of LRU
   lists for objects, we put some effort in providing a generic version.
   It is modeled after the filesystem users: dentries, inodes, and xfs
   (for various tasks), but we expect that other users could benefit in
   the near future with little or no modification.  Let us know if you
   have any issues.

 * The underlying list_lru being proposed automatically and
   transparently keeps the elements in per-node lists, and is able to
   manipulate the node lists individually.  Given this infrastructure, we
   are able to modify the up-to-now hammer called shrink_slab to proceed
   with node-reclaim instead of always searching memory from all over like
   it has been doing.

Per-node lru lists are also expected to lead to less contention in the lru
locks on multi-node scans, since we are now no longer fighting for a
global lock.  The locks usually disappear from the profilers with this
change.

Although we have no official benchmarks for this version - be our guest to
independently evaluate this - earlier versions of this series were
performance tested (details at
http://permalink.gmane.org/gmane.linux.kernel.mm/100537) yielding no
visible performance regressions while yielding a better qualitative
behavior in NUMA machines.

With this infrastructure in place, we can use the list_lru entry point to
provide memcg isolation and per-memcg targeted reclaim.  Historically,
those two pieces of work have been posted together.  This version presents
only the infrastructure work, deferring the memcg work for a later time,
so we can focus on getting this part tested.  You can see more about the
history of such work at http://lwn.net/Articles/552769/

Dave Chinner (18):
  dcache: convert dentry_stat.nr_unused to per-cpu counters
  dentry: move to per-sb LRU locks
  dcache: remove dentries from LRU before putting on dispose list
  mm: new shrinker API
  shrinker: convert superblock shrinkers to new API
  list: add a new LRU list type
  inode: convert inode lru list to generic lru list code.
  dcache: convert to use new lru list infrastructure
  list_lru: per-node list infrastructure
  shrinker: add node awareness
  fs: convert inode and dentry shrinking to be node aware
  xfs: convert buftarg LRU to generic code
  xfs: rework buffer dispose list tracking
  xfs: convert dquot cache lru to list_lru
  fs: convert fs shrinkers to new scan/count API
  drivers: convert shrinkers to new count/scan API
  shrinker: convert remaining shrinkers to count/scan API
  shrinker: Kill old ->shrink API.

Glauber Costa (7):
  fs: bump inode and dentry counters to long
  super: fix calculation of shrinkable objects for small numbers
  list_lru: per-node API
  vmscan: per-node deferred work
  i915: bail out earlier when shrinker cannot acquire mutex
  hugepage: convert huge zero page shrinker to new shrinker API
  list_lru: dynamically adjust node arrays

This patch:

There are situations in very large machines in which we can have a large
quantity of dirty inodes, unused dentries, etc.  This is particularly true
when umounting a filesystem, where eventually since every live object will
eventually be discarded.

Dave Chinner reported a problem with this while experimenting with the
shrinker revamp patchset.  So we believe it is time for a change.  This
patch just moves int to longs.  Machines where it matters should have a
big long anyway.

Signed-off-by: Glauber Costa <glommer@openvz.org>
Cc: Dave Chinner <dchinner@redhat.com>
Cc: "Theodore Ts'o" <tytso@mit.edu>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Cc: Arve Hjønnevåg <arve@android.com>
Cc: Carlos Maiolino <cmaiolino@redhat.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Dave Chinner <dchinner@redhat.com>
Cc: David Rientjes <rientjes@google.com>
Cc: Gleb Natapov <gleb@redhat.com>
Cc: Greg Thelen <gthelen@google.com>
Cc: J. Bruce Fields <bfields@redhat.com>
Cc: Jan Kara <jack@suse.cz>
Cc: Jerome Glisse <jglisse@redhat.com>
Cc: John Stultz <john.stultz@linaro.org>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Kent Overstreet <koverstreet@google.com>
Cc: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Cc: Marcelo Tosatti <mtosatti@redhat.com>
Cc: Mel Gorman <mgorman@suse.de>
Cc: Steven Whitehouse <swhiteho@redhat.com>
Cc: Thomas Hellstrom <thellstrom@vmware.com>
Cc: Trond Myklebust <Trond.Myklebust@netapp.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
10 years agoMerge branch 'akpm-current/current'
Stephen Rothwell [Wed, 31 Jul 2013 06:35:15 +0000 (16:35 +1000)]
Merge branch 'akpm-current/current'

Conflicts:
drivers/staging/lustre/lustre/ldlm/ldlm_pool.c

10 years agoMerge remote-tracking branch 'aio/master'
Stephen Rothwell [Wed, 31 Jul 2013 06:30:58 +0000 (16:30 +1000)]
Merge remote-tracking branch 'aio/master'

10 years agoMerge remote-tracking branch 'ptr-ret/PTR_RET'
Stephen Rothwell [Wed, 31 Jul 2013 06:22:46 +0000 (16:22 +1000)]
Merge remote-tracking branch 'ptr-ret/PTR_RET'

10 years agoMerge remote-tracking branch 'lzo-update/lzo-update'
Stephen Rothwell [Wed, 31 Jul 2013 06:21:06 +0000 (16:21 +1000)]
Merge remote-tracking branch 'lzo-update/lzo-update'

10 years agoMerge remote-tracking branch 'clk/clk-next'
Stephen Rothwell [Wed, 31 Jul 2013 06:19:29 +0000 (16:19 +1000)]
Merge remote-tracking branch 'clk/clk-next'

10 years agoMerge remote-tracking branch 'userns/for-next'
Stephen Rothwell [Wed, 31 Jul 2013 06:17:47 +0000 (16:17 +1000)]
Merge remote-tracking branch 'userns/for-next'

10 years agoMerge remote-tracking branch 'pwm/for-next'
Stephen Rothwell [Wed, 31 Jul 2013 06:16:09 +0000 (16:16 +1000)]
Merge remote-tracking branch 'pwm/for-next'

10 years agoMerge remote-tracking branch 'dma-mapping/dma-mapping-next'
Stephen Rothwell [Wed, 31 Jul 2013 06:16:06 +0000 (16:16 +1000)]
Merge remote-tracking branch 'dma-mapping/dma-mapping-next'

10 years agoMerge remote-tracking branch 'tegra/for-next'
Stephen Rothwell [Wed, 31 Jul 2013 06:14:30 +0000 (16:14 +1000)]
Merge remote-tracking branch 'tegra/for-next'

10 years agoMerge remote-tracking branch 'samsung/for-next'
Stephen Rothwell [Wed, 31 Jul 2013 06:12:54 +0000 (16:12 +1000)]
Merge remote-tracking branch 'samsung/for-next'

10 years agoMerge remote-tracking branch 'renesas/next'
Stephen Rothwell [Wed, 31 Jul 2013 06:11:18 +0000 (16:11 +1000)]
Merge remote-tracking branch 'renesas/next'

10 years agoMerge remote-tracking branch 'mvebu/for-next'
Stephen Rothwell [Wed, 31 Jul 2013 06:09:42 +0000 (16:09 +1000)]
Merge remote-tracking branch 'mvebu/for-next'

10 years agoMerge remote-tracking branch 'msm/for-next'
Stephen Rothwell [Wed, 31 Jul 2013 06:08:06 +0000 (16:08 +1000)]
Merge remote-tracking branch 'msm/for-next'

Conflicts:
arch/arm/Kconfig.debug

10 years agoMerge remote-tracking branch 'imx-mxs/for-next'
Stephen Rothwell [Wed, 31 Jul 2013 04:38:29 +0000 (14:38 +1000)]
Merge remote-tracking branch 'imx-mxs/for-next'

Conflicts:
arch/arm/Kconfig.debug

10 years agoMerge remote-tracking branch 'ep93xx/ep93xx-for-next'
Stephen Rothwell [Wed, 31 Jul 2013 04:36:50 +0000 (14:36 +1000)]
Merge remote-tracking branch 'ep93xx/ep93xx-for-next'

10 years agoMerge remote-tracking branch 'cortex/for-next'
Stephen Rothwell [Wed, 31 Jul 2013 04:35:10 +0000 (14:35 +1000)]
Merge remote-tracking branch 'cortex/for-next'

10 years agoMerge remote-tracking branch 'arm-soc/for-next'
Stephen Rothwell [Wed, 31 Jul 2013 04:33:33 +0000 (14:33 +1000)]
Merge remote-tracking branch 'arm-soc/for-next'

10 years agoMerge remote-tracking branch 'gpio/for-next'
Stephen Rothwell [Wed, 31 Jul 2013 04:31:56 +0000 (14:31 +1000)]
Merge remote-tracking branch 'gpio/for-next'

10 years agoMerge remote-tracking branch 'pinctrl/for-next'
Stephen Rothwell [Wed, 31 Jul 2013 04:30:13 +0000 (14:30 +1000)]
Merge remote-tracking branch 'pinctrl/for-next'

10 years agoMerge remote-tracking branch 'bcon/master'
Stephen Rothwell [Wed, 31 Jul 2013 04:28:02 +0000 (14:28 +1000)]
Merge remote-tracking branch 'bcon/master'

Conflicts:
drivers/block/Kconfig

10 years agoMerge remote-tracking branch 'scsi/for-next'
Stephen Rothwell [Wed, 31 Jul 2013 04:26:14 +0000 (14:26 +1000)]
Merge remote-tracking branch 'scsi/for-next'

10 years agoMerge remote-tracking branch 'char-misc/char-misc-next'
Stephen Rothwell [Wed, 31 Jul 2013 04:24:37 +0000 (14:24 +1000)]
Merge remote-tracking branch 'char-misc/char-misc-next'

10 years agoMerge remote-tracking branch 'staging/staging-next'
Stephen Rothwell [Wed, 31 Jul 2013 04:22:58 +0000 (14:22 +1000)]
Merge remote-tracking branch 'staging/staging-next'

10 years agoMerge remote-tracking branch 'usb/usb-next'
Stephen Rothwell [Wed, 31 Jul 2013 03:46:04 +0000 (13:46 +1000)]
Merge remote-tracking branch 'usb/usb-next'

10 years agoMerge remote-tracking branch 'tty/tty-next'
Stephen Rothwell [Wed, 31 Jul 2013 03:38:02 +0000 (13:38 +1000)]
Merge remote-tracking branch 'tty/tty-next'

10 years agoMerge remote-tracking branch 'driver-core/driver-core-next'
Stephen Rothwell [Wed, 31 Jul 2013 03:29:50 +0000 (13:29 +1000)]
Merge remote-tracking branch 'driver-core/driver-core-next'

10 years agoMerge remote-tracking branch 'leds/for-next'
Stephen Rothwell [Wed, 31 Jul 2013 03:28:13 +0000 (13:28 +1000)]
Merge remote-tracking branch 'leds/for-next'

10 years agoMerge remote-tracking branch 'regmap/for-next'
Stephen Rothwell [Wed, 31 Jul 2013 03:26:28 +0000 (13:26 +1000)]
Merge remote-tracking branch 'regmap/for-next'

10 years agoMerge remote-tracking branch 'drivers-x86/linux-next'
Stephen Rothwell [Wed, 31 Jul 2013 03:26:20 +0000 (13:26 +1000)]
Merge remote-tracking branch 'drivers-x86/linux-next'

10 years agoMerge remote-tracking branch 'workqueues/for-next'
Stephen Rothwell [Wed, 31 Jul 2013 03:18:06 +0000 (13:18 +1000)]
Merge remote-tracking branch 'workqueues/for-next'

10 years agoMerge remote-tracking branch 'xen-arm/linux-next'
Stephen Rothwell [Wed, 31 Jul 2013 03:16:29 +0000 (13:16 +1000)]
Merge remote-tracking branch 'xen-arm/linux-next'

10 years agoMerge remote-tracking branch 'xen-tip/linux-next'
Stephen Rothwell [Wed, 31 Jul 2013 03:14:54 +0000 (13:14 +1000)]
Merge remote-tracking branch 'xen-tip/linux-next'

10 years agoMerge remote-tracking branch 'kvm-ppc/kvm-ppc-next'
Stephen Rothwell [Wed, 31 Jul 2013 03:07:53 +0000 (13:07 +1000)]
Merge remote-tracking branch 'kvm-ppc/kvm-ppc-next'

Conflicts:
mm/Kconfig

10 years agoMerge remote-tracking branch 'kvm/linux-next'
Stephen Rothwell [Wed, 31 Jul 2013 02:59:40 +0000 (12:59 +1000)]
Merge remote-tracking branch 'kvm/linux-next'

10 years agoMerge remote-tracking branch 'rcu/rcu/next'
Stephen Rothwell [Wed, 31 Jul 2013 02:51:21 +0000 (12:51 +1000)]
Merge remote-tracking branch 'rcu/rcu/next'

10 years agoMerge remote-tracking branch 'ftrace/for-next'
Stephen Rothwell [Wed, 31 Jul 2013 02:49:45 +0000 (12:49 +1000)]
Merge remote-tracking branch 'ftrace/for-next'

10 years agoMerge remote-tracking branch 'tip/auto-latest'
Stephen Rothwell [Wed, 31 Jul 2013 02:41:27 +0000 (12:41 +1000)]
Merge remote-tracking branch 'tip/auto-latest'

10 years agoMerge remote-tracking branch 'spi/for-next'
Stephen Rothwell [Wed, 31 Jul 2013 02:39:33 +0000 (12:39 +1000)]
Merge remote-tracking branch 'spi/for-next'

10 years agoMerge remote-tracking branch 'devicetree/devicetree/next'
Stephen Rothwell [Wed, 31 Jul 2013 02:36:25 +0000 (12:36 +1000)]
Merge remote-tracking branch 'devicetree/devicetree/next'

10 years agoMerge remote-tracking branch 'edac-amd/for-next'
Stephen Rothwell [Wed, 31 Jul 2013 02:34:50 +0000 (12:34 +1000)]
Merge remote-tracking branch 'edac-amd/for-next'

10 years agoMerge remote-tracking branch 'trivial/for-next'
Stephen Rothwell [Wed, 31 Jul 2013 02:26:30 +0000 (12:26 +1000)]
Merge remote-tracking branch 'trivial/for-next'

10 years agoMerge remote-tracking branch 'selinux/master'
Stephen Rothwell [Wed, 31 Jul 2013 02:22:00 +0000 (12:22 +1000)]
Merge remote-tracking branch 'selinux/master'

Conflicts:
security/selinux/hooks.c

10 years agoMerge remote-tracking branch 'security/next'
Stephen Rothwell [Wed, 31 Jul 2013 02:17:08 +0000 (12:17 +1000)]
Merge remote-tracking branch 'security/next'

10 years agoMerge remote-tracking branch 'regulator/for-next'
Stephen Rothwell [Wed, 31 Jul 2013 02:15:27 +0000 (12:15 +1000)]
Merge remote-tracking branch 'regulator/for-next'

10 years agoMerge remote-tracking branch 'omap_dss2/for-next'
Stephen Rothwell [Wed, 31 Jul 2013 02:15:23 +0000 (12:15 +1000)]
Merge remote-tracking branch 'omap_dss2/for-next'

10 years agoMerge remote-tracking branch 'fbdev/for-next'
Stephen Rothwell [Wed, 31 Jul 2013 02:13:45 +0000 (12:13 +1000)]
Merge remote-tracking branch 'fbdev/for-next'

10 years agoMerge remote-tracking branch 'md/for-next'
Stephen Rothwell [Wed, 31 Jul 2013 02:12:04 +0000 (12:12 +1000)]
Merge remote-tracking branch 'md/for-next'

10 years agoMerge remote-tracking branch 'slab/for-next'
Stephen Rothwell [Wed, 31 Jul 2013 02:10:25 +0000 (12:10 +1000)]
Merge remote-tracking branch 'slab/for-next'

10 years agoMerge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Wed, 31 Jul 2013 02:10:20 +0000 (12:10 +1000)]
Merge remote-tracking branch 'kgdb/kgdb-next'

10 years agoMerge remote-tracking branch 'mmc/mmc-next'
Stephen Rothwell [Wed, 31 Jul 2013 02:08:44 +0000 (12:08 +1000)]
Merge remote-tracking branch 'mmc/mmc-next'

10 years agoMerge remote-tracking branch 'block/for-next'
Stephen Rothwell [Wed, 31 Jul 2013 02:08:27 +0000 (12:08 +1000)]
Merge remote-tracking branch 'block/for-next'

10 years agoMerge remote-tracking branch 'cgroup/for-next'
Stephen Rothwell [Wed, 31 Jul 2013 02:06:51 +0000 (12:06 +1000)]
Merge remote-tracking branch 'cgroup/for-next'

10 years agoMerge remote-tracking branch 'virtio/virtio-next'
Stephen Rothwell [Wed, 31 Jul 2013 02:05:12 +0000 (12:05 +1000)]
Merge remote-tracking branch 'virtio/virtio-next'

10 years agoMerge remote-tracking branch 'sound-asoc/for-next'
Stephen Rothwell [Wed, 31 Jul 2013 02:03:31 +0000 (12:03 +1000)]
Merge remote-tracking branch 'sound-asoc/for-next'

10 years agoMerge remote-tracking branch 'sound/for-next'
Stephen Rothwell [Wed, 31 Jul 2013 02:01:53 +0000 (12:01 +1000)]
Merge remote-tracking branch 'sound/for-next'

10 years agoMerge remote-tracking branch 'drm-intel/for-linux-next'
Stephen Rothwell [Wed, 31 Jul 2013 02:00:09 +0000 (12:00 +1000)]
Merge remote-tracking branch 'drm-intel/for-linux-next'

Conflicts:
drivers/gpu/drm/i915/i915_dma.c
drivers/gpu/drm/i915/intel_pm.c

10 years agoMerge remote-tracking branch 'drm/drm-next'
Stephen Rothwell [Wed, 31 Jul 2013 01:58:19 +0000 (11:58 +1000)]
Merge remote-tracking branch 'drm/drm-next'

Conflicts:
drivers/gpu/drm/i915/i915_dma.c
drivers/gpu/drm/qxl/qxl_release.c

10 years agoMerge remote-tracking branch 'crypto/master'
Stephen Rothwell [Wed, 31 Jul 2013 01:51:03 +0000 (11:51 +1000)]
Merge remote-tracking branch 'crypto/master'

10 years agoMerge remote-tracking branch 'l2-mtd/master'
Stephen Rothwell [Wed, 31 Jul 2013 01:49:26 +0000 (11:49 +1000)]
Merge remote-tracking branch 'l2-mtd/master'

10 years agoMerge remote-tracking branch 'bluetooth/master'
Stephen Rothwell [Wed, 31 Jul 2013 01:47:45 +0000 (11:47 +1000)]
Merge remote-tracking branch 'bluetooth/master'

10 years agoMerge remote-tracking branch 'wireless-next/master'
Stephen Rothwell [Wed, 31 Jul 2013 01:45:59 +0000 (11:45 +1000)]
Merge remote-tracking branch 'wireless-next/master'

Conflicts:
drivers/net/ethernet/broadcom/Kconfig

10 years agoMerge remote-tracking branch 'ipsec-next/master'
Stephen Rothwell [Wed, 31 Jul 2013 01:44:17 +0000 (11:44 +1000)]
Merge remote-tracking branch 'ipsec-next/master'

10 years agoMerge remote-tracking branch 'net-next/master'
Stephen Rothwell [Wed, 31 Jul 2013 01:40:11 +0000 (11:40 +1000)]
Merge remote-tracking branch 'net-next/master'

10 years agoMerge remote-tracking branch 'slave-dma/next'
Stephen Rothwell [Wed, 31 Jul 2013 01:35:49 +0000 (11:35 +1000)]
Merge remote-tracking branch 'slave-dma/next'

10 years agoMerge remote-tracking branch 'dlm/next'
Stephen Rothwell [Wed, 31 Jul 2013 01:34:12 +0000 (11:34 +1000)]
Merge remote-tracking branch 'dlm/next'

10 years agoMerge remote-tracking branch 'ieee1394/for-next'
Stephen Rothwell [Wed, 31 Jul 2013 01:32:35 +0000 (11:32 +1000)]
Merge remote-tracking branch 'ieee1394/for-next'

10 years agoMerge remote-tracking branch 'idle/next'
Stephen Rothwell [Wed, 31 Jul 2013 01:30:51 +0000 (11:30 +1000)]
Merge remote-tracking branch 'idle/next'

10 years agoMerge remote-tracking branch 'pm/linux-next'
Stephen Rothwell [Wed, 31 Jul 2013 01:23:53 +0000 (11:23 +1000)]
Merge remote-tracking branch 'pm/linux-next'

10 years agoMerge remote-tracking branch 'libata/for-next'
Stephen Rothwell [Wed, 31 Jul 2013 01:22:06 +0000 (11:22 +1000)]
Merge remote-tracking branch 'libata/for-next'

10 years agoMerge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Wed, 31 Jul 2013 01:20:22 +0000 (11:20 +1000)]
Merge remote-tracking branch 'kbuild/for-next'

10 years agoMerge remote-tracking branch 'v4l-dvb/master'
Stephen Rothwell [Wed, 31 Jul 2013 01:20:20 +0000 (11:20 +1000)]
Merge remote-tracking branch 'v4l-dvb/master'

10 years agoMerge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Wed, 31 Jul 2013 01:18:44 +0000 (11:18 +1000)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'

10 years agoMerge branch 'jdelvare-hwmon/master'
Stephen Rothwell [Wed, 31 Jul 2013 01:17:08 +0000 (11:17 +1000)]
Merge branch 'jdelvare-hwmon/master'

10 years agoMerge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Wed, 31 Jul 2013 01:15:29 +0000 (11:15 +1000)]
Merge remote-tracking branch 'hid/for-next'

10 years agoMerge remote-tracking branch 'pci/next'
Stephen Rothwell [Wed, 31 Jul 2013 01:13:54 +0000 (11:13 +1000)]
Merge remote-tracking branch 'pci/next'

10 years agoMerge remote-tracking branch 'vfs/for-next'
Stephen Rothwell [Wed, 31 Jul 2013 01:07:58 +0000 (11:07 +1000)]
Merge remote-tracking branch 'vfs/for-next'

Conflicts:
fs/ext4/namei.c

10 years agoMerge remote-tracking branch 'xfs/for-next'
Stephen Rothwell [Wed, 31 Jul 2013 01:06:16 +0000 (11:06 +1000)]
Merge remote-tracking branch 'xfs/for-next'

10 years agoMerge remote-tracking branch 'v9fs/for-next'
Stephen Rothwell [Wed, 31 Jul 2013 01:04:40 +0000 (11:04 +1000)]
Merge remote-tracking branch 'v9fs/for-next'

10 years agoMerge remote-tracking branch 'ocfs2/linux-next'
Stephen Rothwell [Wed, 31 Jul 2013 01:02:26 +0000 (11:02 +1000)]
Merge remote-tracking branch 'ocfs2/linux-next'

10 years agoMerge remote-tracking branch 'nfsd/nfsd-next'
Stephen Rothwell [Wed, 31 Jul 2013 01:00:50 +0000 (11:00 +1000)]
Merge remote-tracking branch 'nfsd/nfsd-next'

10 years agoMerge remote-tracking branch 'nfs/linux-next'
Stephen Rothwell [Wed, 31 Jul 2013 00:59:15 +0000 (10:59 +1000)]
Merge remote-tracking branch 'nfs/linux-next'

10 years agoMerge remote-tracking branch 'logfs/master'
Stephen Rothwell [Wed, 31 Jul 2013 00:57:12 +0000 (10:57 +1000)]
Merge remote-tracking branch 'logfs/master'

10 years agoMerge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Wed, 31 Jul 2013 00:55:36 +0000 (10:55 +1000)]
Merge remote-tracking branch 'gfs2/master'

10 years agoMerge remote-tracking branch 'f2fs/dev'
Stephen Rothwell [Wed, 31 Jul 2013 00:54:01 +0000 (10:54 +1000)]
Merge remote-tracking branch 'f2fs/dev'

10 years agoMerge remote-tracking branch 'cifs/for-next'
Stephen Rothwell [Wed, 31 Jul 2013 00:47:22 +0000 (10:47 +1000)]
Merge remote-tracking branch 'cifs/for-next'

10 years agoMerge remote-tracking branch 'ceph/master'
Stephen Rothwell [Wed, 31 Jul 2013 00:45:47 +0000 (10:45 +1000)]
Merge remote-tracking branch 'ceph/master'

10 years agoMerge remote-tracking branch 'btrfs/next'
Stephen Rothwell [Wed, 31 Jul 2013 00:45:45 +0000 (10:45 +1000)]
Merge remote-tracking branch 'btrfs/next'

10 years agoMerge remote-tracking branch 'tile/master'
Stephen Rothwell [Wed, 31 Jul 2013 00:44:09 +0000 (10:44 +1000)]
Merge remote-tracking branch 'tile/master'

10 years agoMerge remote-tracking branch 'sh/sh-latest'
Stephen Rothwell [Wed, 31 Jul 2013 00:42:34 +0000 (10:42 +1000)]
Merge remote-tracking branch 'sh/sh-latest'

Conflicts:
arch/sh/kernel/cpu/sh2a/Makefile
include/linux/serial_sci.h

10 years agoMerge remote-tracking branch 's390/features'
Stephen Rothwell [Wed, 31 Jul 2013 00:40:58 +0000 (10:40 +1000)]
Merge remote-tracking branch 's390/features'

10 years agoMerge remote-tracking branch 'parisc-hd/for-next'
Stephen Rothwell [Wed, 31 Jul 2013 00:39:21 +0000 (10:39 +1000)]
Merge remote-tracking branch 'parisc-hd/for-next'

10 years agoMerge remote-tracking branch 'mips/mips-for-linux-next'
Stephen Rothwell [Wed, 31 Jul 2013 00:37:46 +0000 (10:37 +1000)]
Merge remote-tracking branch 'mips/mips-for-linux-next'

10 years agoMerge remote-tracking branch 'metag/for-next'
Stephen Rothwell [Wed, 31 Jul 2013 00:36:12 +0000 (10:36 +1000)]
Merge remote-tracking branch 'metag/for-next'

10 years agoMerge remote-tracking branch 'm68knommu/for-next'
Stephen Rothwell [Wed, 31 Jul 2013 00:34:39 +0000 (10:34 +1000)]
Merge remote-tracking branch 'm68knommu/for-next'

10 years agoMerge remote-tracking branch 'ia64/next'
Stephen Rothwell [Wed, 31 Jul 2013 00:33:06 +0000 (10:33 +1000)]
Merge remote-tracking branch 'ia64/next'

Conflicts:
arch/ia64/configs/generic_defconfig
arch/ia64/configs/gensparse_defconfig
arch/ia64/configs/tiger_defconfig
arch/ia64/configs/xen_domu_defconfig

10 years agoMerge remote-tracking branch 'cris/for-next'
Stephen Rothwell [Wed, 31 Jul 2013 00:31:30 +0000 (10:31 +1000)]
Merge remote-tracking branch 'cris/for-next'

Conflicts:
arch/cris/arch-v32/drivers/Kconfig

10 years agoMerge remote-tracking branch 'blackfin/for-linus'
Stephen Rothwell [Wed, 31 Jul 2013 00:31:21 +0000 (10:31 +1000)]
Merge remote-tracking branch 'blackfin/for-linus'

10 years agoMerge remote-tracking branch 'arm/for-next'
Stephen Rothwell [Wed, 31 Jul 2013 00:29:43 +0000 (10:29 +1000)]
Merge remote-tracking branch 'arm/for-next'

10 years agoMerge remote-tracking branch 'arc/for-next'
Stephen Rothwell [Wed, 31 Jul 2013 00:28:11 +0000 (10:28 +1000)]
Merge remote-tracking branch 'arc/for-next'