Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5515d998 authored Aug 19, 2013 by Kevin Hilman

Merge tag 'omap-for-v3.12/dra7xx' of...

Merge tag 'omap-for-v3.12/dra7xx' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc

From Tony Lindgren:
Minimal DRA7xx based SoC core support via Rajendra Nayak <rnayak@ti.com>

* tag 'omap-for-v3.12/dra7xx' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap

: (849 commits)
  ARM: DRA7: Add the build support in omap2plus
  ARM: DRA7: hwmod: Reuse the soc_ops used for OMAP4/5
  ARM: DRA7: id: Add cpu detection support for DRA7xx based SoCs'
  ARM: DRA7: Kconfig: Make ARCH_NR_GPIO default to 512
  ARM: DRA7: board-generic: Add basic DT support
  ARM: DRA7: Resue the clocksource, clockevent support
  ARM: DRA7: Reuse io tables and add a new .init_early
  ARM: DRA7: Reuse all of PRCM and MPUSS SMP infra
  Linux 3.11-rc5
  btrfs: don't loop on large offsets in readdir
  Btrfs: check to see if root_list is empty before adding it to dead roots
  Btrfs: release both paths before logging dir/changed extents
  Btrfs: allow splitting of hole em's when dropping extent cache
  Btrfs: make sure the backref walker catches all refs to our extent
  Btrfs: fix backref walking when we hit a compressed extent
  Btrfs: do not offset physical if we're compressed
  Btrfs: fix extent buffer leak after backref walking
  Btrfs: fix a bug of snapshot-aware defrag to make it work on partial extents
  btrfs: fix file truncation if FALLOC_FL_KEEP_SIZE is specified
  dlm: kill the unnecessary and wrong device_close()->recalc_sigpending()
  ...

Signed-off-by: Kevin Hilman <khilman@linaro.org>

parents f668adeb cf470a1b

.gitignore

+1 −0

Original line number	Diff line number	Diff line
		@@ -29,6 +29,7 @@ modules.builtin
		*.bz2
		*.lzma
		*.xz
		*.lz4
		*.lzo
		*.patch
		*.gcno

Documentation/ABI/testing/sysfs-driver-xen-blkback

0 → 100644

+17 −0

Original line number	Diff line number	Diff line
		What: /sys/module/xen_blkback/parameters/max_buffer_pages
		Date: March 2013
		KernelVersion: 3.11
		Contact: Roger Pau Monné <roger.pau@citrix.com>
		Description:
		Maximum number of free pages to keep in each block
		backend buffer.

		What: /sys/module/xen_blkback/parameters/max_persistent_grants
		Date: March 2013
		KernelVersion: 3.11
		Contact: Roger Pau Monné <roger.pau@citrix.com>
		Description:
		Maximum number of grants to map persistently in
		blkback. If the frontend tries to use more than
		max_persistent_grants, the LRU kicks in and starts
		removing 5% of max_persistent_grants every 100ms.

Documentation/ABI/testing/sysfs-driver-xen-blkfront

0 → 100644

+10 −0

Original line number	Diff line number	Diff line
		What: /sys/module/xen_blkfront/parameters/max
		Date: June 2013
		KernelVersion: 3.11
		Contact: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
		Description:
		Maximum number of segments that the frontend will negotiate
		with the backend for indirect descriptors. The default value
		is 32 - higher value means more potential throughput but more
		memory usage. The backend picks the minimum of the frontend
		and its default backend value.

Documentation/DocBook/device-drivers.tmpl

+1 −1

Original line number	Diff line number	Diff line
		@@ -84,7 +84,7 @@ X!Iinclude/linux/kobject.h

		<sect1><title>Kernel utility functions</title>
		!Iinclude/linux/kernel.h
		!Ekernel/printk.c
		!Ekernel/printk/printk.c
		!Ekernel/panic.c
		!Ekernel/sys.c
		!Ekernel/rcupdate.c

Documentation/DocBook/media_api.tmpl

+2 −2

Original line number	Diff line number	Diff line
		<?xml version="1.0"?>
		<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
		"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
		<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
		"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
		<!ENTITY % media-entities SYSTEM "./media-entities.tmpl"> %media-entities;
		<!ENTITY media-indices SYSTEM "./media-indices.tmpl">