Date: Thu, 2 Aug 2012 14:15:05 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: linux-next@vger.kernel.org
Cc: LKML <linux-kernel@vger.kernel.org>
Subject: linux-next: Tree for Aug 2
Message-Id: <20120802141505.d30da7f7113e955679383acb@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: multipart/signed; protocol="application/pgp-signature";
 micalg="PGP-SHA256";
 boundary="Signature=_Thu__2_Aug_2012_14_15_05_+1000_MekaBq1_=ByUSOdF"
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 26574
Lines: 532

--Signature=_Thu__2_Aug_2012_14_15_05_+1000_MekaBq1_=ByUSOdF
Content-Type: text/plain; charset=US-ASCII
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Hi all,

Please do not add anything to linux-next included branches/series that is
destined for v3.7 until after v3.6-rc1 is released.

Reminder: do not rebase your branches before asking Linus to pull them ...

Changes since 20120731:

Removed trees: samsung, bjdooks-i2c (unfetchable)

Linus' tree lost its build failure.

The ceph tree lost its conflicts.

The vfs tree lost its conflicts.

The acpi tree gained a build failure for which I reverted a commit.

The battery tree lost its merge fix patch.

The writeback tree lost its conflict.

The tty tree still has its build failures for which I have disabled 2
staging drivers and applied a patch.

I have still reverted 3 commits from the signal tree at the request of the
arm maintainer.

The random tree lost its conflicts.

The akpm tree lost lots of patches that turned up elsewhere.

----------------------------------------------------------------------------

I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/next/ ).  If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one.  You should use "git fetch" as mentioned in the FAQ on the wiki
(see below).

You can see which trees have been included by looking in the Next/Trees
file in the source.  There are also quilt-import.log and merge.log files
in the Next directory.  Between each merge, the tree was built with
a ppc64_defconfig for powerpc and an allmodconfig for x86_64. After the
final fixups (if any), it is also built with powerpc allnoconfig (32 and
64 bit), ppc44x_defconfig and allyesconfig (minus
CONFIG_PROFILE_ALL_BRANCHES - this fails its final link) and i386, sparc,
sparc64 and arm defconfig. These builds also have
CONFIG_ENABLE_WARN_DEPRECATED, CONFIG_ENABLE_MUST_CHECK and
CONFIG_DEBUG_INFO disabled when necessary.

Below is a summary of the state of the merge.

We are up to 195 trees (counting Linus' and 26 trees of patches pending
for Linus' tree), more are welcome (even if they are currently empty).
Thanks to those who have contributed, and to those who haven't, please do.

Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next .  If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.

Thanks to Randy Dunlap for doing many randconfig builds.  And to Paul
Gortmaker for triage and bug fixes.

There is a wiki covering stuff to do with linux-next at
http://linux.f-seidel.de/linux-next/pmwiki/ .  Thanks to Frank Seidel.

--=20
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

$ git checkout master
$ git reset --hard stable
Merging origin/master (d4fdc32 Merge tag 'fbdev-updates-for-3.6' of git://g=
ithub.com/schandinat/linux-2.6)
Merging fixes/master (9023a40 Merge tag 'mmc-fixes-for-3.5-rc4' of git://gi=
t.kernel.org/pub/scm/linux/kernel/git/cjb/mmc)
Merging kbuild-current/rc-fixes (f8f5701 Linux 3.5-rc1)
Merging arm-current/fixes (b74253f ARM: 7479/1: mm: avoid NULL dereference =
when flushing gate_vma with VIVT caches)
Merging m68k-current/for-linus (1525e06 m68k/apollo: Rename "timer" to "apo=
llo_timer")
Merging powerpc-merge/merge (ad36cb0 powerpc/kvm/book3s_32: Fix MTMSR_EERI =
macro)
Merging sparc/master (b387e41 Merge branch 'merge' of git://git.kernel.org/=
pub/scm/linux/kernel/git/benh/powerpc)
Merging net/master (2d53492 Merge tag 'irqdomain-for-linus' of git://git.se=
cretlab.ca/git/linux-2.6)
Merging sound-current/for-linus (aff252a ALSA: snd-usb: fix clock source va=
lidity index)
Merging pci-current/for-linus (314489b Merge tag 'fixes-for-linus' of git:/=
/git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc)
Merging wireless/master (9dbf5f5 bcma: add missing iounmap on error path)
Merging driver-core.current/driver-core-linus (84a1caf Linux 3.5-rc7)
Merging tty.current/tty-linus (38bd2a1 pch_uart: Fix parity setting issue)
Merging usb.current/usb-linus (84a1caf Linux 3.5-rc7)
Merging staging.current/staging-linus (6887a41 Linux 3.5-rc5)
Merging char-misc.current/char-misc-linus (84a1caf Linux 3.5-rc7)
Merging input-current/for-linus (cf45b5a Merge branch 'next' into for-linus)
Merging md-current/for-linus (58e94ae md/raid1: close some possible races o=
n write errors during resync)
Merging audit-current/for-linus (c158a35 audit: no leading space in audit_l=
og_d_path prefix)
Merging crypto-current/master (76f16f8 crypto: hifn_795x - fix 64bit divisi=
on and undefined __divdi3 on 32bit archs)
Merging ide/master (39a50b4 Merge branch 'hfsplus')
Merging dwmw2/master (244dc4e Merge git://git.infradead.org/users/dwmw2/ran=
dom-2.6)
Merging sh-current/sh-fixes-for-linus (4403310 SH: Convert out[bwl] macros =
to inline functions)
Merging irqdomain-current/irqdomain/merge (15e06bf irqdomain: Fix debugfs f=
ormatting)
Merging devicetree-current/devicetree/merge (4e8383b of: release node fix f=
or of_parse_phandle_with_args)
Merging spi-current/spi/merge (d1c185b of/spi: Fix SPI module loading by us=
ing proper "spi:" modalias prefixes.)
Merging gpio-current/gpio/merge (96b7064 gpio/tca6424: merge I2C transactio=
ns, remove cast)
Merging arm/for-next (3f5e7d4 Merge branches 'audit', 'delay', 'dmaengine',=
 'fixes', 'misc' and 'sta2x11' into for-next)
CONFLICT (content): Merge conflict in drivers/dma/Makefile
CONFLICT (content): Merge conflict in drivers/dma/Kconfig
CONFLICT (content): Merge conflict in Documentation/feature-removal-schedul=
e.txt
Merging arm-perf/for-next/perf (dee8c1b ARM: perf: remove arm_perf_pmu_ids =
global enumeration)
Merging davinci/davinci-next (fe0d422 Linux 3.0-rc6)
Merging xilinx/arm-next (b85a3ef ARM: Xilinx: Adding Xilinx board support)
Merging blackfin/for-linus (719154c bf60x: fix build warning)
Merging c6x/for-linux-next (b9b8722 C6X: clean up compiler warning)
Merging cris/for-next (2608747 CRIS: Remove VCS simulator specific code)
Merging hexagon/linux-next (5042ab9 various Kconfig cleanup and old platfor=
m build code removal)
Merging ia64/next (a119365 [IA64] Redefine ATOMIC_INIT and ATOMIC64_INIT to=
 drop the casts)
Merging m68k/for-next (1525e06 m68k/apollo: Rename "timer" to "apollo_timer=
")
Merging m68knommu/for-next (b1f7735 m68k: allow PCI bus to be enabled for C=
oldFire m54xx CPUs)
Merging microblaze/next (a01ee16 Merge branch 'for-linus' of git://git.open=
-osd.org/linux-open-osd)
Merging mips/mips-for-linux-next (819ab75 Merge branches 'next/for-linus' a=
nd 'next/lantiq' into mips-for-linux-next)
Merging openrisc/for-upstream (207e715 openrisc: use scratch regs in atomic=
 syscall)
Merging parisc/for-next (bba3d8c [PARISC] Redefine ATOMIC_INIT and ATOMIC64=
_INIT to drop the casts)
Merging powerpc/next (bdc0077 Merge tag 'scsi-misc' of git://git.kernel.org=
/pub/scm/linux/kernel/git/jejb/scsi)
Merging 4xx/next (2074b1d powerpc: Fix irq distribution)
Merging mpc5xxx/next (4d2f4e1 powerpc: Option FB_FSL_DIU is not really opti=
onal for mpc512x)
Merging galak/next (0eec5a8 powerpc/85xx: add HOTPLUG_CPU support)
Merging s390/features (7d25617 s390: make use of user_mode() macro where po=
ssible)
Merging sh/sh-latest (f387704 Merge branch 'common/irqdomain' into sh-lates=
t)
Merging sparc-next/master (31a6710 Fix blocking allocations called very ear=
ly during bootup)
Merging tile/master (bdc0077 Merge tag 'scsi-misc' of git://git.kernel.org/=
pub/scm/linux/kernel/git/jejb/scsi)
Merging unicore32/unicore32 (e4baa56 UniCore32-bugfix: Remove definitions i=
n asm/bug.h to solve difference between native and cross compiler)
Merging ceph/master (1fe5e99 rbd: create rbd_refresh_helper())
Merging cifs/for-next (1a500f0 CIFS: Add SMB2 support for rmdir)
Merging configfs/linux-next (b930c26 Merge branch 'for-linus' of git://git.=
kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs)
Merging ecryptfs/next (5f5b331 eCryptfs: check for eCryptfs cipher support =
at mount)
Merging ext3/for_next (0143fc5 udf: avoid info leak on export)
Merging ext4/dev (03179fe ext4: undo ext4_calc_metadata_amount if we fail t=
o claim space)
Merging fuse/for-next (f3840dc fuse: add missing INIT flag descriptions)
Merging gfs2/master (bdc0077 Merge tag 'scsi-misc' of git://git.kernel.org/=
pub/scm/linux/kernel/git/jejb/scsi)
Merging logfs/master (9f0bbd8 logfs: query block device for number of pages=
 to send with bio)
Merging nfs/linux-next (2d53492 Merge tag 'irqdomain-for-linus' of git://gi=
t.secretlab.ca/git/linux-2.6)
Merging nfsd/nfsd-next (2c142ba NFSd: make boot_time variable per network n=
amespace)
Merging ocfs2/linux-next (2dfd060 aio: make kiocb->private NUll in init_syn=
c_kiocb())
Merging omfs/for-next (976d167 Linux 3.1-rc9)
Merging squashfs/master (4b0180a Squashfs: add mount time sanity check for =
block_size and block_log match)
Merging v9fs/for-next (5fcb08b 9p: BUG before corrupting memory)
Merging ubifs/linux-next (7074e5e UBIFS: remove invalid reference to list i=
terator variable)
Merging xfs/for-next (9a57fa8 xfs: wait for the write the superblock on unm=
ount)
Merging vfs/for-next (dbc6e02 delousing target_core_file a bit)
Merging pci/next (63b96f7 Merge branch 'pci/yinghai-pciehp-unused' into nex=
t)
Merging hid/for-next (e8ff13b Merge branch 'for-linus' of git://git.kernel.=
org/pub/scm/linux/kernel/git/jikos/hid)
Merging quilt/i2c (d517a8e i2c-mux: Add support for device auto-detection)
Merging i2c-embedded/i2c-embedded/for-next (5db20c4 Revert "i2c: tegra: con=
vert normal suspend/resume to *_noirq")
Merging quilt/jdelvare-hwmon (2e3ee61 Merge tag 'writeback-proportions' of =
git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux)
Merging hwmon-staging/hwmon-next (829917c hwmon: (applesmc) Decode and act =
on read/write status codes)
Merging v4l-dvb/master (add6e13 Merge /home/v4l/v4l/patchwork)
CONFLICT (content): Merge conflict in Documentation/feature-removal-schedul=
e.txt
Merging kbuild/for-next (85b170e Merge branches 'kbuild/kconfig' and 'kbuil=
d/misc' into kbuild/for-next)
Merging kconfig/for-next (4503379 localmodconfig: Add debug environment var=
iable LOCALMODCONFIG_DEBUG)
Merging libata/NEXT (354b2ea libata-acpi: fix up for acpi_pm_device_sleep_s=
tate API)
Merging infiniband/for-next (1da9b6b Merge branches 'cma', 'ipoib', 'ocrdma=
' and 'qib' into for-next)
Merging acpi/next (a72551d Merge branch 'misc' into next)
[master eb461b4] Revert "ACPI: remove acpi_get_table_with_size() fucntion"
Merging cpuidle/cpuidle-next (3cf7997 acpi: intel_idle : break dependency b=
etween modules)
CONFLICT (add/add): Merge conflict in drivers/cpuidle/coupled.c
Merging cpupowerutils/master (f166033 cpupower tools: add install target to=
 the debug tools' makefiles)
Merging ieee1394/for-next (e3cbd92 firewire: core: document is_local sysfs =
attribute)
Merging ubi/linux-next (87e773c UBI: harmonize the update of ubi->beb_rsvd_=
pebs)
Merging dlm/next (c572b7f dlm: fix deadlock between dlm_send and dlm_contro=
ld)
Merging scsi/for-next (641aa03 Merge branch 'misc' into for-next)
CONFLICT (content): Merge conflict in drivers/ata/libata-core.c
Merging target-updates/for-next (bf6932f iscsi-target: Drop bogus struct fi=
le usage for iSCSI/SCTP)
Merging target-merge/for-next-merge (1247c37 tcm_vhost: Initial merge for v=
host level target fabric driver)
Merging ibft/linux-next (935a9fe ibft: Fix finding IBFT ACPI table on UEFI)
Merging isci/all (6734092 isci: add a couple __iomem annotations)
Merging slave-dma/next (6343325 dmaengine: Cleanup logging messages)
Merging dmaengine/next (a2bd114 netdma: adding alignment check for NETDMA o=
ps)
Merging net-next/master (173f865 Merge tag 'ext4_for_linus' of git://git.ke=
rnel.org/pub/scm/linux/kernel/git/tytso/ext4)
Merging wireless-next/master (173f865 Merge tag 'ext4_for_linus' of git://g=
it.kernel.org/pub/scm/linux/kernel/git/tytso/ext4)
Merging bluetooth/master (8bd38a6 Bluetooth: Added /proc/net/sco via bt_pro=
cfs_init())
Merging mtd/master (4800399 mtd: m25p80: Add support for serial flash STM/M=
icron N25Q032)
Merging l2-mtd/master (cd0a30d mtd: m25p80: Fix the Spansion chip detection)
CONFLICT (content): Merge conflict in arch/arm/mach-imx/clk-imx6q.c
Merging crypto/master (35a1fc1 powerpc/crypto: add 842 crypto driver)
Merging drm/drm-next (e2f895f Merge branch 'exynos-drm-next' of git://git.i=
nfradead.org/users/kmpark/linux-samsung into drm-next)
Merging sound/for-next (aff252a ALSA: snd-usb: fix clock source validity in=
dex)
Merging sound-asoc/for-next (d0e3cce ASoC: AC97 doesn't use regmap by defau=
lt)
Merging quilt/rr (d673c23 Make most arch asm/module.h files use asm-generic=
/module.h)
Merging input/next (2b94e25 Input: random formatting fixes)
Merging input-mt/for-next (c45361a Revert "Input: atmel_mxt_ts - warn if sy=
sfs could not be created")
Merging cgroup/for-next (4b2ebf0 Merge branch 'for-3.6' into for-next)
Merging block/for-next (f45d342 Merge branch 'for-linus' into for-next)
Merging quilt/device-mapper (37cd960 Merge tag 'for-linus-v3.6-rc1' of git:=
//oss.sgi.com/xfs/xfs)
Merging embedded/master (4744b43 embedded: fix vc_translate operator preced=
ence)
Merging firmware/master (6e03a20 firmware: speed up request_firmware(), v3)
Merging pcmcia/master (80af9e6 pcmcia at91_cf: fix raw gpio number usage)
Merging mmc/mmc-next (30b87c6 mmc: sdhci-dove: Prepare for common clock fra=
mework)
Merging kgdb/kgdb-next (27c79c1 USB: echi-dbgp: increase the controller wai=
t time to come out of halt.)
Merging slab/for-next (73a1180 mm: Fix build warning in kmem_cache_create())
Merging uclinux/for-next (5e442a4 Revert "proc: fix races against execve() =
of /proc/PID/fd**")
Merging md/for-next (63f33b8 DM RAID: Add support for MD RAID10)
Merging mfd/for-next (3c1534c mfd: Ensure AB8500 platform data is passed th=
rough db8500-prcmu to MFD Core)
Merging battery/master (ecc2edd olpc-battery: update CHARGE_FULL_DESIGN pro=
perty for BYD LiFe batteries)
Merging fbdev/fbdev-next (a023907 da8xx-fb: fix compile issue due to missin=
g include)
Merging viafb/viafb-next (838ac78 viafb: avoid refresh and mode lookup in s=
et_par)
Merging omap_dss2/for-next (974a658 Merge "Apply LCD manager related parame=
ters" from Archit)
Merging regulator/for-next (d06578b regulator: anatop: Fix wrong mask used =
in anatop_get_voltage_sel)
Merging security/next (6637284 Smack: Maintainer Record)
Merging selinux/master (c2d7b24 Merge tag 'v3.4' into 20120409)
Merging lblnet/master (7e27d6e Linux 2.6.35-rc3)
Merging watchdog/master (06a3fa7 watchdog: fix watchdog-test.c build warnin=
g)
Merging dwmw2-iommu/master (c3b92c8 Linux 3.1)
Merging iommu/next (395e51f Merge branches 'iommu/fixes', 'x86/amd', 'group=
s', 'arm/tegra' and 'api/domain-attr' into next)
Merging vfio/next (a1706d8 vfio: Include vfio.h in installed headers)
Merging osd/linux-next (a7fdf6a exofs: stop using s_dirt)
Merging jc_docs/docs-next (5c050fb docs: update the development process doc=
ument)
Merging trivial/for-next (e1c9ac4 Revert "backlight: fix memory leak on obs=
cure error path")
Merging audit/for-next (dcd6c92 Linux 3.3-rc1)
Merging pm/linux-next (26ba678 Merge branch 'master' into linux-next)
Merging apm/for-next (f283d22 APM: fix deadlock in APM_IOC_SUSPEND ioctl)
Merging fsnotify/for-next (1aec9c0 inotify: automatically restart syscalls)
Merging edac/linux_next (a92cdec Merge branch 'devel' into next)
Merging edac-amd/for-next (305f1c3 Merge branch '3.3-pci_device_id' into ed=
ac-for-next)
CONFLICT (content): Merge conflict in drivers/edac/amd64_edac.c
CONFLICT (content): Merge conflict in Documentation/edac.txt
Merging devicetree/devicetree/next (efd68e7 devicetree: add helper inline f=
or retrieving a node's full name)
Merging dt-rh/for-next (e95d8aa of: mtd: nuke useless const qualifier)
Merging spi/spi/next (d8e328b spi: Add "spi:" prefix to modalias attribute =
of spi devices)
Merging spi-mb/spi-next (8ceffa7 spi/orion: remove uneeded spi_info)
Merging tip/auto-latest (adf18da Merge branch 'perf/core')
Merging rcu/rcu/next (5cf05ad rcu: Fix broken strings in RCU's source code.)
Merging cputime/cputime (c3e0ef9 [S390] fix cputime overflow in uptime_proc=
_show)
Merging uprobes/for-next (0326f5a uprobes/core: Handle breakpoint and singl=
estep exceptions)
Merging kmemleak/kmemleak (4878677 kmemleak: do not leak object after tree =
insertion error)
Merging kvm/linux-next (ade38c3 KVM: s390: Add implementation-specific trac=
e events)
Merging kvm-ppc/kvm-ppc-next (6ad0085 KVM: PPC: Book3S_32: Fix MTMSR_EERI m=
acro)
Merging oprofile/for-next (c16fa4f Linux 3.3)
Merging xen/upstream/xen (af3a3ab Merge git://git.kernel.org/pub/scm/linux/=
kernel/git/steve/gfs2-3.0-fixes)
Merging xen-two/linux-next (64b0a47 Merge commit 'v3.5-rc7' into linux-next)
Merging xen-pvhvm/linux-next (b056b6a xen: suspend: remove xen_hvm_suspend)
Merging percpu/for-next (61011677 Merge tag 'dlm-3.5' of git://git.kernel.o=
rg/pub/scm/linux/kernel/git/teigland/linux-dlm)
Merging workqueues/for-next (6fec10a workqueue: fix spurious CPU locality W=
ARN from process_one_work())
Merging drivers-x86/linux-next (00d3959 thinkpad_acpi: Free hotkey_keycode_=
map after unregistering tpacpi_inputdev)
Merging hwpoison/hwpoison (46e387b Merge branch 'hwpoison-hugepages' into h=
wpoison)
Merging sysctl/master (4e474a0 sysctl: protect poll() in entries that may g=
o away)
Merging regmap/for-next (38e2319 Merge branches 'regmap-core', 'regmap-irq'=
 and 'regmap-page' into regmap-next)
Merging hsi/for-next (43139a6 HSI: hsi_char: Update ioctl-number.txt)
Merging leds/for-next (d45bb11 leds-lp8788: forgotten unlock at lp8788_led_=
work)
Merging driver-core/driver-core-next (6791457 printk: Export struct log siz=
e and member offsets through vmcoreinfo)
Merging tty/tty-next (d155255 tty: Fix race in tty release)
Applying: disable SERIAL_IPOCTAL broken by tty updates
Applying: disable USB_SERIAL_QUATECH2 broken by tty update
Applying: tty: fix up usb serial console for termios change.
Merging usb/usb-next (e387ef5 usb: Add USB_QUIRK_RESET_RESUME for all Logit=
ech UVC webcams)
Merging staging/staging-next (419e926 staging: csr: delete a bunch of unuse=
d library functions)
Merging char-misc/char-misc-next (6078188 mei: use module_pci_driver)
Merging tmem/linux-next (78821b2 Merge branch 'stable/for-linus-3.6' into l=
inux-next)
Merging writeback/writeback-for-next (331cbde writeback: Fix some comment e=
rrors)
Merging arm-dt/devicetree/arm-next (ede338f dt: add documentation of ARM dt=
 boot interface)
Merging hwspinlock/linux-next (8b37fcf hwspinlock: add MAINTAINERS entries)
Merging pinctrl/for-next (c9eebe7 pinctrl/pinctrl-u300: remove unneeded dev=
m_kfree call)
Merging moduleh/for-sfr (6b16351 Linux 3.5-rc4)
Merging vhost/linux-next (e0953c8 tun: experimental zero copy tx support)
CONFLICT (content): Merge conflict in drivers/net/tun.c
Merging kmap_atomic/kmap_atomic (2164d33 pipe: remove KM_USER0 from comment=
s)
Merging memblock/memblock-kill-early_node_map (7bd0b0f memblock: Reimplemen=
t memblock allocation using reverse free area iterator)
Merging remoteproc/for-next (6bb697b MAINTAINERS: add remoteproc's git)
Merging irqdomain/irqdomain/next (f5a1ad0 irqdomain: Improve diagnostics wh=
en a domain mapping fails)
Merging gpio/gpio/next (3e11f7b gpio/generic: initialize basic_mmio_gpio sh=
adow variables properly)
Merging gpio-lw/for-next (4fbb002 gpio: of_get_named_gpio_flags() return -E=
PROBE_DEFER if GPIO not yet available)
Merging arm-soc/for-next (deac1d4 ARM: arm-soc: add arm-soc-for-next-conten=
ts.txt)
CONFLICT (content): Merge conflict in drivers/watchdog/orion_wdt.c
Merging ep93xx/ep93xx-for-next (9b6a359 Merge branch 'ep93xx-fixes' into ep=
93xx-for-next)
Merging renesas/next (45c7a01 Merge branch 'renesas-marzen' into renesas-bo=
ard)
Merging s5p/for-next (6701bca Merge branch 'next/board-samsung-3' into for-=
next)
Merging tegra/for-next (a04ef1f Merge branch 'for-3.6/defconfig' into for-n=
ext)
Merging kvmtool/master (427dad4 kvm tools: use correct error value for virt=
io-9p RLERROR)
Merging dma-mapping/dma-mapping-next (97ef952 ARM: dma-mapping: add support=
 for DMA_ATTR_SKIP_CPU_SYNC attribute)
Merging pwm/for-next (19891b2 pwm: pwm-tiehrpwm: PWM driver support for EHR=
PWM)
Merging dma-buf/for-next (ca24a14 Merge branch 'fixes' of git://git.linaro.=
org/people/rmk/linux-arm)
Merging userns/for-next (491fa9e userns: Allow the usernamespace support to=
 build after the removal of usbfs)
Merging ktest/for-next (648a182 ktest: Allow a test to override REBOOT_ON_S=
UCCESS)
Merging signal/from-sfr (2e117f2 Revert "arm: pull all work_pending logics =
into C function")
CONFLICT (content): Merge conflict in arch/powerpc/kernel/entry_64.S
CONFLICT (content): Merge conflict in arch/arm/include/asm/thread_info.h
Merging clk/clk-next (137f8a7 clk: fix compile for OF && !COMMON_CLK)
Merging random/dev (d2e7c96 random: mix in architectural randomness in extr=
act_buf())
Merging scsi-post-merge/merge-base:master ()
$ git checkout akpm
Applying: cciss: fix incorrect scsi status reporting
Applying: acpi_memhotplug.c: fix memory leak when memory device is unbound =
from the module acpi_memhotplug
Applying: acpi_memhotplug.c: free memory device if acpi_memory_enable_devic=
e() failed
Applying: acpi_memhotplug.c: remove memory info from list before freeing it
Applying: acpi_memhotplug.c: don't allow to eject the memory device if it i=
s being used
Applying: acpi_memhotplug.c: bind the memory device when the driver is bein=
g loaded
Applying: acpi_memhotplug.c: auto bind the memory device which is hotplugge=
d before the driver is loaded
Applying: arch/x86/platform/iris/iris.c: register a platform device and a p=
latform driver
Applying: arch/x86/include/asm/spinlock.h: fix comment
Applying: arch/x86/kernel/cpu/perf_event_intel_uncore.h: make UNCORE_PMU_HR=
TIMER_INTERVAL 64-bit
Applying: mn10300: only add -mmem-funcs to KBUILD_CFLAGS if gcc supports it
Applying: drivers/dma/dmaengine.c: lower the priority of 'failed to get' dm=
a channel message
Applying: timeconst.pl: remove deprecated defined(@array)
Applying: time: don't inline EXPORT_SYMBOL functions
Applying: thermal: fix potential out-of-bounds memory access
Applying: thermal: add Renesas R-Car thermal sensor support
Applying: thermal: add generic cpufreq cooling implementation
Applying: hwmon: exynos4: move thermal sensor driver to driver/thermal dire=
ctory
Applying: thermal: exynos5: add exynos5 thermal sensor driver support
Applying: thermal: exynos: register the tmu sensor with the kernel thermal =
layer
Applying: ARM: exynos: add thermal sensor driver platform data support
Applying: ocfs2: use find_last_bit()
Applying: ocfs2: use bitmap_weight()
Applying: drivers/scsi/atp870u.c: fix bad use of udelay
Applying: vfs: increment iversion when a file is truncated
Applying: fs: push rcu_barrier() from deactivate_locked_super() to filesyst=
ems
Applying: mm/slab: remove duplicate check
Applying: slab: do not call compound_head() in page_get_cache()
Applying: hugetlb: avoid taking i_mmap_mutex in unmap_single_vma() for huge=
tlb
CONFLICT (content): Merge conflict in mm/memory.c
Applying: shmem: provide vm_ops when also providing a mem policy
CONFLICT (content): Merge conflict in mm/shmem.c
Applying: tmpfs: interleave the starting node of /dev/shmem
Applying: frv: kill used but uninitialized variable
Applying: string: introduce memweight()
Applying: string-introduce-memweight-fix
Applying: string: fix build error caused by memweight() introduction
Applying: ipc/mqueue: remove unnecessary rb_init_node() calls
Applying: rbtree: reference Documentation/rbtree.txt for usage instructions
Applying: rbtree: empty nodes have no color
Applying: rbtree: fix incorrect rbtree node insertion in fs/proc/proc_sysct=
l.c
Applying: rbtree: move some implementation details from rbtree.h to rbtree.c
Applying: rbtree: fix jffs2 build issue due to renamed __rb_parent_color fi=
eld
Applying: rbtree: performance and correctness test
Applying: rbtree: break out of rb_insert_color loop after tree rotation
Applying: rbtree: adjust root color in rb_insert_color() only when necessary
Applying: rbtree: low level optimizations in rb_insert_color()
Applying: rbtree: adjust node color in __rb_erase_color() only when necessa=
ry
Applying: rbtree: optimize case selection logic in __rb_erase_color()
Applying: rbtree: low level optimizations in __rb_erase_color()
Applying: rbtree: coding style adjustments
Applying: rbtree: rb_erase updates and comments
Applying: rbtree: optimize fetching of sibling node
Applying: atomic64_test: simplify the #ifdef for atomic64_dec_if_positive()=
 test
Applying: checkpatch: check usleep_range() arguments
Applying: checkpatch: add checks for do {} while (0) macro misuses
Applying: nsproxy: move free_nsproxy() out of do_exit() path
Applying: fat (exportfs): move NFS support code
Applying: fat (exportfs): fix dentry reconnection
Applying: ipc: use Kconfig options for __ARCH_WANT_[COMPAT_]IPC_PARSE_VERSI=
ON
Applying: ipc/sem.c: alternatives to preempt_disable()
Merging quilt/akpm (1fd9e08 ipc/sem.c: alternatives to preempt_disable())
Applying: libceph: remove rb_node initialisation

--Signature=_Thu__2_Aug_2012_14_15_05_+1000_MekaBq1_=ByUSOdF
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)

iQIcBAEBCAAGBQJQGf7JAAoJEECxmPOUX5FEolkP/1X+W5JPV3ClJbexnevf84o0
cajXEh0IJfy/+0if9ZWpq1ab0OjNFzYU+TZEE/oaezr9My782CShtIkQCPaliRp0
NNJu3wJVyemzDG8oa0eQcNeyp6dWIeW8Uh8e6TVH7Cw5BGjseaDAxtKjk6xUapv7
44RRXzp1HSXe05TBk1hw2LK+mTu+U2U/6znJYsy+Duc0tJFtxBBwdqQKau9NsP1H
I/RUUrW+ulIS0YL/AzBR4fit5Xo6lWEp+HYIsnIZWfPx9INJk6xde8Iqny6m2dDS
QRj15dUOsLGA2aCLkwk9032FOFARF6h0Fe028cXbSGTBKDDfeqp3TB+pSmShOUnf
V1GSBnKgU2KObhyWcKKielnEHpcZjt5HvUxSETUTqzmUM8lRjs2CT9ZvwFgX8fLo
GQbAtpa5CO/1hLNSe7NVShO7h8Y//oR2GM/lQBzcoynyldtMmKeZz0/pZxJXn+bu
QhVEaAob4i8rChgUdS5QAn5Q1fWU4KecAb+5cj/Fjp0LYfXS22m5tnigaakevh5T
JTwRMue9IJRVAT7fpZK+qbyt+m9s6pgldFCevb9ue6aY4tqqVeSyqgSvBXvpbbj/
j9uWUwns8AfOOkyAnEKqvFXk60i8eFZhX7xoTX7X9PpimOcjHpQf4xXDcZzfyFMo
Qt1zz/X8qFlpGz8XPd6g
=5M1n
-----END PGP SIGNATURE-----

--Signature=_Thu__2_Aug_2012_14_15_05_+1000_MekaBq1_=ByUSOdF--
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/