From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751431Ab2CZE2Z (ORCPT ); Mon, 26 Mar 2012 00:28:25 -0400 Received: from haggis.pcug.org.au ([203.10.76.10]:38361 "EHLO members.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751230Ab2CZE2S (ORCPT ); Mon, 26 Mar 2012 00:28:18 -0400 Date: Mon, 26 Mar 2012 15:28:07 +1100 From: Stephen Rothwell To: linux-next@vger.kernel.org Cc: LKML Subject: linux-next: Tree for Mar 26 Message-Id: <20120326152807.debdb1ec426b3c370c121178@canb.auug.org.au> X-Mailer: Sylpheed 3.2.0beta6 (GTK+ 2.24.10; i486-pc-linux-gnu) Mime-Version: 1.0 Content-Type: multipart/signed; protocol="application/pgp-signature"; micalg="PGP-SHA256"; boundary="Signature=_Mon__26_Mar_2012_15_28_07_+1100_bS8z+OeGuPKv8vFO" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Signature=_Mon__26_Mar_2012_15_28_07_+1100_bS8z+OeGuPKv8vFO Content-Type: text/plain; charset=US-ASCII Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi all, Reminder: please do not add stuff destined for v3.5 to linux-next included trees/branches until after v3.4-rc1 has been released. Changes since 20120323: Lots of conflicts move between trees and disappear as things are merged into Linus' tree. The arm tree gained a conflict against Linus' tree. The ia64 tree lost its conflict. The s390 tree lost its conflict. The xfs tree lost its conflicts. The pci tree lost its conflicts. The scsi tree lost its build failure but gained some more for which I disabled some staging drivers. The isci tree lost its build failure. The cpufreq tree lost its conflicts. The battery tree still had its build failure so I used the version from next-20120314. The device-mapper tree lost its conflict. The fbdev tree lost its conflict. The sysctl tree lost its conflict/ The moduleh tree lost its build failures and conflicts. The arm-soc tree lost several conflicts. The akpm tree lost lots of patches that turned up elsewhere (mostly in Linus' tree) and gained conflict against the tip tree. ---------------------------------------------------------------------------- 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 and sparc64 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 187 trees (counting Linus' and 25 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. 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 (e22057c Merge tag 'stable/for-linus-3.4-tag-two' of = git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen) Merging fixes/master (88ebdda Merge tag 'for-3.3' of git://openrisc.net/jon= as/linux) Merging kbuild-current/rc-fixes (42f1c01 coccicheck: change handling of C= =3D{1,2} when M=3D is set) Merging arm-current/fixes (a0feb6d ARM: 7358/1: perf: add PMU hotplug notif= ier) Merging m68k-current/for-linus (2a35350 m68k: Fix assembler constraint to p= revent overeager gcc optimisation) Merging powerpc-merge/merge (c2ea377 Merge remote-tracking branch 'origin/m= aster' into merge) Merging sparc/master (e0adb99 sparc32: Add -Av8 to assembler command line.) Merging scsi-rc-fixes/master (41f8ad7 [SCSI] osd_uld: Bump MAX_OSD_DEVICES = from 64 to 1,048,576) Merging net/master (50269e1 net: add a truesize parameter to skb_add_rx_fra= g()) Merging sound-current/for-linus (6681bc0 Merge tag 'asoc-3.4' of git://git.= kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus) Merging pci-current/for-linus (4949be1 PCI: ignore pre-1.1 ASPM quirking wh= en ASPM is disabled) Merging wireless/master (c16fa4f Linux 3.3) Merging driver-core.current/driver-core-linus (fde7d90 Linux 3.3-rc7) Merging tty.current/tty-linus (fde7d90 Linux 3.3-rc7) Merging usb.current/usb-linus (fde7d90 Linux 3.3-rc7) Merging staging.current/staging-linus (fde7d90 Linux 3.3-rc7) Merging char-misc.current/char-misc-linus (c16fa4f Linux 3.3) Merging cpufreq-current/fixes (6139b65 Merge branch 'for_3.4/cpufreq' of gi= t://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into fixe= s) Merging input-current/for-linus (10ce3cc Merge branch 'next' into for-linus) Merging md-current/for-linus (ecb178b md: Add judgement bb->unacked_exist i= n function md_ack_all_badblocks().) Merging audit-current/for-linus (c158a35 audit: no leading space in audit_l= og_d_path prefix) Merging crypto-current/master (ff0a70f crypto: twofish-x86_64-3way - module= init/exit functions should be static) Merging ide/master (0ab3d8b cy82c693: fix PCI device selection) Merging dwmw2/master (244dc4e Merge git://git.infradead.org/users/dwmw2/ran= dom-2.6) Merging devicetree-current/devicetree/merge (29f141f Merge branch 'fixes-fo= r-grant' of git://sources.calxeda.com/kernel/linux into devicetree/merge) Merging spi-current/spi/merge (a5ab629 Fix section mismatch in spi-pl022.c) Merging gpio-current/gpio/merge (7e3a70f gpio: Add missing spin_lock_init i= n gpio-ml-ioh driver) Merging arm/for-next (467fa4e Merge branch 'acorn' into for-next) CONFLICT (content): Merge conflict in arch/powerpc/Kconfig CONFLICT (content): Merge conflict in arch/c6x/Kconfig CONFLICT (content): Merge conflict in arch/arm/kernel/process.c CONFLICT (content): Merge conflict in arch/arm/common/gic.c Merging arm-perf/for-next/perf (c16fa4f Linux 3.3) Merging davinci/davinci-next (fe0d422 Linux 3.0-rc6) Merging samsung/next-samsung (9edb240 ARM: H1940/RX1950: Change default LED= triggers) Merging s5p/for-next (d782c13 Merge branch 'next/soc-exynos5250-gpio' into = for-next) Merging tegra/for-next (e8ce8f9 Merge branch 'for-3.4/cleanup-and-fixes' in= to for-next) CONFLICT (content): Merge conflict in arch/arm/mach-tegra/fuse.c Merging xilinx/arm-next (b85a3ef ARM: Xilinx: Adding Xilinx board support) Merging blackfin/for-linus (1762275 blackfin: clean up string bfin_dma_5xx = after rename.) Merging c6x/for-linux-next (fde7d90 Linux 3.3-rc7) Merging cris/for-next (ea78f5b CRIS: Update documentation) Merging quilt/hexagon (110b372 Remove unneeded include of version.h from ar= ch/hexagon/include/asm/spinlock_types.h) CONFLICT (content): Merge conflict in arch/hexagon/Kconfig Merging ia64/next (5cd288c Merge branch 'pstore' into next) Merging m68k/for-next (2a35350 m68k: Fix assembler constraint to prevent ov= ereager gcc optimisation) Merging m68knommu/for-next (ae909ea m68knommu: factor more common ColdFire = cpu reset code) Merging microblaze/next (e02db0a microblaze: Handle TLB skip size dynamical= ly) Merging mips/mips-for-linux-next (2fea377 Merge branch 'fixes-for-linus' in= to mips-for-linux-next) Merging openrisc/for-upstream (fa8d9d7 OpenRISC: Remove memory_start/end pr= ototypes) Merging parisc/for-next (c60dc74 Merge branch 'fixes' into for-next) Merging powerpc/next (dfbc2d7 powerpc/ps3: Do not adjust the wrapper load a= ddress) Merging 4xx/next (b5594a7 powerpc/44x: Add additional device support for AP= M821xx SoC and Bluestone board) Merging mpc5xxx/next (7b6bb64 powerpc/5200: convert mpc5200 to use of_platf= orm_populate()) Merging galak/next (5a0acea powerpc/qe: Update the SNUM table for MPC8569 R= ev2.0) Merging s390/features (5d3b56f [S390] register cpu devices for SMP=3Dn) Merging sparc-next/master (e9b57cc sparc: Use vsprintf extention %pf with b= uiltin_return_address) Merging tile/master (48b25c4 [PATCH v3] ipc: provide generic compat version= s of IPC syscalls) Merging unicore32/unicore32 (0994695 Merge branch 'akpm' (aka "Andrew's pat= ch-bomb, take two")) Merging ceph/master (c666601 rbd: move snap_rwsem to the device, rename to = header_rwsem) Merging cifs/master (934e18b Merge git://git.kernel.org/pub/scm/linux/kerne= l/git/davem/net) 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 (6cfd4b4 ecryptfs: remove the second argument of k[un= ]map_atomic()) CONFLICT (content): Merge conflict in fs/ecryptfs/ecryptfs_kernel.h Merging ext3/for_next (e703c20 ext3: fix start and len arguments handling i= n ext3_trim_fs()) Merging ext4/dev (9d547c3 vfs: remove unused superblock helpers) Merging fuse/for-next (4273b79 fuse: O_DIRECT support for files) Merging gfs2/master (220cca2 GFS2: Change truncate page allocation to be GF= P_NOFS) Merging logfs/master (e22057c Merge tag 'stable/for-linus-3.4-tag-two' of g= it://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen) Merging nfs/linux-next (250f671 Merge tag 'device-for-3.4' of git://git.ker= nel.org/pub/scm/linux/kernel/git/paulg/linux) Merging nfsd/nfsd-next (ab4684d NFSD: Fix nfs4_verifier memory alignment) Merging ocfs2/linux-next (9392557 ocfs2: avoid unaligned access to dqc_bitm= ap) 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 (5bdad93 9p: statfs should not override server f_type) Merging ubifs/linux-next (5a1f36c UBIFS: improve error messages) Merging xfs/for-next (f074211 xfs: fallback to vmalloc for large buffers in= xfs_getbmap) Merging vfs/for-next (07c0c5d ext4: initialization of ext4_li_mtx needs to = be done earlier) Merging pci/linux-next (1488d51 PCI: Bjorn gets PCI hotplug too) Merging hid/for-next (d464c92 Merge branch 'for-linus' of git://git.kernel.= org/pub/scm/linux/kernel/git/jikos/hid) Merging quilt/i2c (6e5318e i2c-algo-bit: Don't resched on clock stretching) Merging bjdooks-i2c/next-i2c (fc84fe1 Merge branch 'for_3.3/i2c/misc' of gi= t://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into for-= 33/i2c/omap) CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-omap.c Merging i2c-embedded/i2c-embedded/for-next (bbceeee i2c-eg20t: Remove write= -only variables) Merging quilt/jdelvare-hwmon (e3a9568 hwmon: Add MCP3021 ADC driver) Merging hwmon-staging/hwmon-next (28c85aa hwmon: (sht15) Fix Kconfig depend= encies) Merging quilt/kernel-doc (719a4df Documentation/kernel-parameters: remove i= nttest parameter) Merging docs/docs-move (5c24d8b Merge branch 'docs/docbook/drm' of git://gi= thub.com/mfwitten/linux into docs-move) Merging v4l-dvb/master (153fb4d Merge /home/v4l/v4l/patchwork) Merging kbuild/for-next (21ea2bf Merge branch 'kbuild/kconfig' into kbuild/= for-next) Merging kconfig/for-next (eae1c36 Merge branch 'kconfig/for-linus-2' into k= config/for-next) Merging libata/NEXT (b8cec3c pata_cmd64x: implement sff_irq_check() method) Merging infiniband/for-next (5ad19b0 Merge branches 'cma', 'cxgb3', 'cxgb4'= , 'ehca', 'iser', 'mad', 'nes', 'qib', 'srp' and 'srpt' into for-next) Merging acpi/next (be6fb23 Merge branch 'acpica' into next) CONFLICT (content): Merge conflict in drivers/cpuidle/cpuidle.c Merging cpupowerutils/master (f166033 cpupower tools: add install target to= the debug tools' makefiles) Merging ieee1394/for-next (19f8399 Merge branch 'iso-flush' into for-next) Merging ubi/linux-next (cc83146 UBI: rename MOVE_CANCEL_BITFLIPS to MOVE_TA= RGET_BITFLIPS) Merging dlm/next (1b189b8 dlm: last element of dlm_local_addr[] never used) Merging scsi/master (7ef79ae [SCSI] vmw_pvscsi: Try setting host->max_id as= suggested by the device.) Applying: scsi: disable broken staging driver Applying: scsi: disable more staging drivers due to scsi breakage Merging target-updates/for-next (187e70a ib_srpt: Fix srpt_handle_cmd send_= ioctx->ioctx_kref leak on exception) Merging target-merge/for-next-merge (06de5ee tcm_qla2xxx: Add >=3D 24xx ser= ies fabric module for target-core) Merging ibft/linux-next (935a9fe ibft: Fix finding IBFT ACPI table on UEFI) Merging isci/all (efb1224 Merge branches 'devel' and 'rnc-devel' into all) Merging slave-dma/next (beeaa10 dmaengine: at_hdmac: add slave config opera= tion) CONFLICT (content): Merge conflict in sound/soc/mxs/mxs-pcm.c CONFLICT (content): Merge conflict in sound/soc/imx/imx-pcm-dma-mx2.c CONFLICT (content): Merge conflict in sound/soc/ep93xx/ep93xx-pcm.c CONFLICT (content): Merge conflict in drivers/mmc/host/atmel-mci.c CONFLICT (modify/delete): arch/arm/include/asm/hardware/pl330.h deleted in = slave-dma/next and modified in HEAD. Version HEAD of arch/arm/include/asm/h= ardware/pl330.h left in tree. CONFLICT (modify/delete): arch/arm/common/pl330.c deleted in slave-dma/next= and modified in HEAD. Version HEAD of arch/arm/common/pl330.c left in tree. $ git rm -f arch/arm/common/pl330.c arch/arm/include/asm/hardware/pl330.h Applying: DMA: PL330: update for code movement Merging dmaengine/next (d07a74a dmaengine: fix missing 'cnt' in ?: in dmate= st) Merging net-next/master (3556485 Merge branch 'next' of git://git.kernel.or= g/pub/scm/linux/kernel/git/jmorris/linux-security) Merging wireless-next/master (3775265 libertas: remove dump_survey implemen= tation) Merging bluetooth/master (1c3b31a Bluetooth: Remove sk parameter from l2cap= _chan_create()) Merging mtd/master (3c3e51d Merge ../linux-2.6 to bring in 3.3-rc fixes alr= eady merged) Merging l2-mtd/master (b118591 mtd: docg3 add protection against concurrenc= y) CONFLICT (content): Merge conflict in sound/soc/mxs/mxs-pcm.h CONFLICT (content): Merge conflict in fs/jffs2/fs.c CONFLICT (content): Merge conflict in fs/jffs2/compr.c CONFLICT (content): Merge conflict in drivers/mtd/nand/gpmi-nand/gpmi-lib.c CONFLICT (content): Merge conflict in drivers/mtd/chips/cfi_cmdset_0002.c CONFLICT (content): Merge conflict in drivers/mmc/host/mxs-mmc.c CONFLICT (content): Merge conflict in drivers/dma/mxs-dma.c Merging crypto/master (2dc9b5d padata: Fix race on sequence number wrap) Merging sound/for-next (6a0d4b2 Merge branch 'topic/hda' into for-next) Merging sound-asoc/for-next (4a163c8 ASoC: Add extra parameter to device_pr= ep_dma_cyclic) Merging cpufreq/next (a7b422c provide disable_cpufreq() function to disable= the API.) Merging quilt/rr (2a22b63 cpumask: remove old cpu_*_map.) CONFLICT (content): Merge conflict in arch/arm/kernel/kprobes.c Merging input/next (d8ee4a1 Input: gpio_keys - add support for interrupt on= ly keys) Merging input-mt/for-next (7491f3d bcm5974: Add pointer and buttonpad prope= rties) Merging block/for-next (bc67f63 cciss: Fix scsi tape io with more than 255 = scatter gather elements) Merging quilt/device-mapper (b911e14 This device-mapper target creates a re= ad-only device that transparently validates the data on one underlying devi= ce against a pre-generated tree of cryptographic checksums stored on a seco= nd device.) 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) CONFLICT (content): Merge conflict in drivers/pcmcia/soc_common.c Merging battery/master (d6a047c max17042_battery: Fix CHARGE_FULL represent= ation.) $ git reset --hard HEAD^ Merging refs/next/20120314/battery Merging mmc/mmc-next (7e9d684 mmc: sh_mmcif: simplify bitmask macros) CONFLICT (content): Merge conflict in include/linux/mmc/host.h CONFLICT (content): Merge conflict in drivers/mmc/host/tmio_mmc_pio.c CONFLICT (content): Merge conflict in drivers/mmc/host/sh_mmcif.c CONFLICT (content): Merge conflict in drivers/mmc/host/sdhci-s3c.c CONFLICT (content): Merge conflict in drivers/mmc/host/atmel-mci.c CONFLICT (content): Merge conflict in drivers/mmc/core/host.h CONFLICT (content): Merge conflict in drivers/mmc/core/core.c Merging kgdb/kgdb-next (53c40f5 kdb: Add message about CONFIG_DEBUG_RODATA = on failure to install breakpoint) Merging slab/for-next (b80b6c0 Merge branch 'slab/next' into for-next) Merging uclinux/for-next (5e442a4 Revert "proc: fix races against execve() = of /proc/PID/fd**") Merging md/for-next (ecb178b md: Add judgement bb->unacked_exist in functio= n md_ack_all_badblocks().) Merging mfd/for-next (b8589e2 gpio/twl: Add DT support to gpio-twl4030 driv= er) CONFLICT (content): Merge conflict in include/linux/mfd/abx500/ab8500.h CONFLICT (content): Merge conflict in drivers/mfd/twl-core.c CONFLICT (content): Merge conflict in drivers/mfd/ab8500-core.c Merging drm/drm-next (5466c7b drm/i915: use DDC_ADDR instead of hard-coding= it) Merging fbdev/fbdev-next (6bff98b Revert "video:uvesafb: Fix oops that uves= afb try to execute NX-protected page") Merging viafb/viafb-next (838ac78 viafb: avoid refresh and mode lookup in s= et_par) Merging omap_dss2/for-next (df01d53 OMAPDSS: APPLY: fix clearing shadow dir= ty flag with manual update) Merging regulator/for-next (4992fa1 Merge tag 'topic/twl' into regulator-ne= xt) Merging security/next (09f61cd Merge branch 'for-security' of git://git.ker= nel.org/pub/scm/linux/kernel/git/jj/linux-apparmor into next) Merging selinux/master (ecf093d SELinux: add default_type statements) Merging lblnet/master (7e27d6e Linux 2.6.35-rc3) Merging watchdog/master (072cbb7 watchdog: txx9wdt: fix timeout) Merging dwmw2-iommu/master (c3b92c8 Linux 3.1) Merging iommu/next (7de4730 Merge branches 'iommu/fixes', 'arm/tegra' and '= x86/amd' into next) Merging osd/linux-next (72749a2 exofs: Cap on the memcpy() size) Merging jc_docs/docs-next (5c050fb docs: update the development process doc= ument) Merging trivial/for-next (f1f996b kcore: fix spelling in read_kcore() comme= nt) Merging audit/for-next (dcd6c92 Linux 3.3-rc1) Merging pm/linux-next (30d73f3 Merge tag 'dlm-3.4' of git://git.kernel.org/= pub/scm/linux/kernel/git/teigland/linux-dlm) Merging apm/for-next (b4a133d Merge branch 'for-linus' of git://git.kernel.= org/pub/scm/linux/kernel/git/jikos/apm) Merging fsnotify/for-next (ef9bf3b fanotify: only destroy a mark if both it= s mask and its ignored_mask are cleared) Merging edac/linux_next (a4b4be3 edac: rename channel_info to rank_info) Merging edac-amd/for-next (305f1c3 Merge branch '3.3-pci_device_id' into ed= ac-for-next) Merging devicetree/devicetree/next (0f22dd3 of: Only compile OF_DYNAMIC on = PowerPC pseries and iseries) Merging spi/spi/next (87bf5ab spi/fsl-espi: Make sure pm is within 2..32) Merging tip/auto-latest (268dd65 Merge branch 'linus') CONFLICT (content): Merge conflict in arch/x86/Kconfig Merging rcu/rcu/next (1cc8596 rcu: Stop spurious warnings from synchronize_= sched_expedited) 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 cgroup/for-next (3ce3230 cgroup: Walk task list under tasklist_lock= in cgroup_enable_task_cg_list) Merging kmemleak/kmemleak (d65b4e9 Linux 3.3-rc3) Merging kvm/linux-next (f8753c5 KVM: Convert intx_mask_lock to spin lock) Merging oprofile/for-next (c16fa4f Linux 3.3) Merging xen/upstream/xen (59e9a6b Merge branch 'upstream/ticketlock-cleanup= ' into upstream/xen) CONFLICT (content): Merge conflict in arch/x86/include/asm/cmpxchg.h Merging xen-two/linux-next (2faaa4d Merge branch 'stable/for-linus-3.4' int= o linux-next) Merging xen-pvhvm/linux-next (b056b6a xen: suspend: remove xen_hvm_suspend) Merging percpu/for-next (adb7950 percpu: fix __this_cpu_{sub,inc,dec}_retur= n() definition) Merging workqueues/for-next (e06ffa1 workqueue: use percpu allocator for cw= q on UP) Merging drivers-x86/linux-next (27aef97 thinkpad-acpi: recognize Lenovo as = version string in newer V-series BIOS) CONFLICT (content): Merge conflict in arch/x86/platform/mrst/mrst.c CONFLICT (content): Merge conflict in arch/x86/platform/geode/Makefile CONFLICT (content): Merge conflict in arch/x86/Kconfig 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 (7d680ba Merge remote-tracking branch 'regmap/topic= /introspection' into regmap-next) Merging hsi/for-next (43139a6 HSI: hsi_char: Update ioctl-number.txt) Merging driver-core/driver-core-next (adc80ae Tools: hv: Support enumeratio= n from all the pools) Merging tty/tty-next (fb8ebec serial: pxa: add clk_prepare/clk_unprepare ca= lls) Merging usb/usb-next (11207b6 net: qmi_wwan: add support for ZTE MF820D) Merging staging/staging-next (bc01caf staging/zmem: Use lockdep_assert_held= instead of spin_is_locked) Merging char-misc/char-misc-next (b222258 misc: bmp085: Use unsigned long t= o store jiffies) Merging tmem/linux-next (16c0cfa Merge branch 'stable/cleancache.v13' into = linux-next) Merging writeback/writeback-for-next (697e6fe writeback: Remove outdated co= mment) 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 (51dddfe ARM: u300: configure some pins as an exam= ple) Merging moduleh/for-sfr (de2272c Merge branch 'device-3.4' into for-sfr) CONFLICT (content): Merge conflict in lib/string.c Merging vhost/linux-next (1e05b62 sh: use the the PCI channels's io_map_bas= e) Merging kmap_atomic/kmap_atomic (317b6e1 feature-removal-schedule.txt: sche= dule the deprecated form of kmap_atomic() for removal) Merging modem-shm/for-next (3cff1cc caif_shm: Add CAIF driver for Shared me= mory for M7400) Merging memblock/memblock-kill-early_node_map (7bd0b0f memblock: Reimplemen= t memblock allocation using reverse free area iterator) Merging remoteproc/for-next (e12bc14 remoteproc: s/big switch/lookup table/) CONFLICT (content): Merge conflict in include/linux/virtio_ids.h Merging irqdomain/irqdomain/next (409a6f6 Merge branch 'irqdomain-for-grant= ' of git://sources.calxeda.com/kernel/linux into irqdomain/next) CONFLICT (content): Merge conflict in arch/arm/Kconfig Merging gpio/gpio/next (8194c7c gpio/sodaville: Mark broken due to core irq= domain migration) CONFLICT (content): Merge conflict in include/linux/mfd/tps65910.h Merging arm-soc/for-next (61689b8 Merge branch 'next/cleanup' into for-next) CONFLICT (content): Merge conflict in drivers/watchdog/ep93xx_wdt.c CONFLICT (content): Merge conflict in drivers/mtd/nand/atmel_nand.c CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-gpio.c CONFLICT (modify/delete): arch/arm/mach-vexpress/include/mach/io.h deleted = in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/mach-vex= press/include/mach/io.h left in tree. CONFLICT (content): Merge conflict in arch/arm/mach-tegra/Makefile CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/setup-sh7377.c CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/setup-sh7367.c CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/setup-r8a7740.c CONFLICT (modify/delete): arch/arm/mach-s3c24xx/common.h deleted in arm-soc= /for-next and modified in HEAD. Version HEAD of arch/arm/mach-s3c24xx/commo= n.h left in tree. CONFLICT (content): Merge conflict in arch/arm/mach-msm/timer.c CONFLICT (content): Merge conflict in arch/arm/mach-ep93xx/include/mach/ep9= 3xx-regs.h CONFLICT (content): Merge conflict in arch/arm/mach-at91/cpuidle.c CONFLICT (content): Merge conflict in arch/arm/Kconfig $ git rm -f arch/arm/mach-vexpress/include/mach/io.h Merging kvmtool/master (20082f5 kvm tools: Fix realpath() error checking) Merging dma-mapping/dma-mapping-next (e749a9f common: DMA-mapping: add NON-= CONSISTENT attribute) Merging dma-buf/for-next (0ee4332 dma-buf: document fd flags and O_CLOEXEC = requirement) Merging ktest/for-next (648a182 ktest: Allow a test to override REBOOT_ON_S= UCCESS) Merging cpuidle-cons/cpuidle_consol_pull (203b52e SH: shmobile: Consolidate= time keeping and irq enable) CONFLICT (content): Merge conflict in drivers/cpuidle/cpuidle.c CONFLICT (content): Merge conflict in arch/arm/mach-davinci/cpuidle.c CONFLICT (content): Merge conflict in arch/arm/mach-at91/cpuidle.c CONFLICT (add/add): Merge conflict in arch/arm/include/asm/cpuidle.h Merging scsi-post-merge/merge-base:master () $ git checkout akpm Applying: net/netfilter/nf_conntrack_netlink.c: fix Oops on container destr= oy Applying: acerhdf: add support for Aspire 1410 BIOS v1.3314 Applying: acerhdf: add support for new hardware Applying: acerhdf: lowered default temp fanon/fanoff values Applying: arch/x86/platform/iris/iris.c: register a platform device and a p= latform driver Applying: intel_mid_powerbtn: mark irq as IRQF_NO_SUSPEND Applying: x86, olpc: add debugfs interface for EC commands Applying: x86-olpc-add-debugfs-interface-for-ec-commands v3 Applying: arch/arm/mach-ux500/mbox-db5500.c: world-writable sysfs fifo file Applying: avr32: don't mask signals in the error path Applying: avr32: use set_current_blocked() in handle_signal/sys_rt_sigreturn Applying: avr32: use block_sigmask() Applying: x86: use this_cpu_xxx to replace percpu_xxx funcs CONFLICT (content): Merge conflict in arch/x86/mm/tlb.c Applying: x86: change percpu_read_stable() to this_cpu_read_stable() Applying: net: use this_cpu_xxx replace percpu_xxx funcs Applying: percpu: remove percpu_xxx() functions Applying: percpu-remove-percpu_xxx-functions-fix Applying: ia64: use set_current_blocked() and block_sigmask() Applying: headers_check: recursively search for linux/types.h inclusion Applying: microblaze: don't reimplement force_sigsegv() Applying: microblaze: no need to reset handler if SA_ONESHOT Applying: microblaze: fix signal masking Applying: microblaze: use set_current_blocked() and block_sigmask() Applying: MIPS: use set_current_blocked() and block_sigmask() Applying: score: don't mask signals if we fail to setup signal stack Applying: score: use set_current_blocked() and block_sigmask() Applying: unicore32: use block_sigmask() Applying: net/netfilter/nfnetlink_acct.c: use linux/atomic.h Applying: blackfin: use set_current_blocked() and block_sigmask() Applying: ocfs2: use find_last_bit() Applying: ocfs2: use bitmap_weight() Applying: parisc: use set_current_blocked() and block_sigmask() Applying: vfs: increment iversion when a file is truncated Applying: brlocks/lglocks: cleanups Applying: vfs: fix dup_mnt_ns Applying: hugetlbfs: lockdep annotate root inode properly Applying: libfs: add simple_open() Applying: scripts/coccinelle/api/simple_open.cocci: semantic patch for simp= le_open() Applying: simple_open: automatically convert to simple_open() Applying: simple_open-automatically-convert-to-simple_open-checkpatch-fixes Applying: fs: symlink restrictions on sticky directories Applying: fs-symlink-restrictions-on-sticky-directories-fix-2 Applying: fs: hardlink creation restrictions Applying: fs-hardlink-creation-restrictions-fix Applying: fs: hardlink creation restriction cleanup Applying: mm: fix page-faults detection in swap-token logic Applying: mm: add extra free kbytes tunable Applying: mm-add-extra-free-kbytes-tunable-update Applying: mm-add-extra-free-kbytes-tunable-update-checkpatch-fixes Applying: frv: use set_current_blocked() and block_sigmask() Applying: sh: no need to reset handler if SA_ONESHOT Applying: sh: use set_current_blocked() and block_sigmask() Applying: h8300: use set_current_blocked() and block_sigmask() Applying: alpha: use set_current_blocked() and block_sigmask() Applying: m32r: use set_current_blocked() and block_sigmask() Applying: m68k: use set_current_blocked() and block_sigmask() Applying: mn10300: use set_current_blocked() and block_sigmask() Applying: C6X: use set_current_blocked() and block_sigmask() Applying: cpuidle: add a sysfs entry to disable specific C state for debug = purpose. Applying: cpuidle-add-a-sysfs-entry-to-disable-specific-c-state-for-debug-p= urpose-fix Applying: cris: use set_current_blocked() and block_sigmask() Applying: cris: select GENERIC_ATOMIC64 Applying: um/kernel/trap.c: port OOM changes to handle_page_fault() Applying: ceph, cifs, nfs, fuse: boolean and / or confusion Applying: powerpc/eeh: remove eeh_event_handler()->daemonize() Applying: arch/powerpc/platforms/pseries/eeh_event.c: slightly fix set_curr= ent_state() wart Applying: MAINTAINERS: fix REMOTEPROC F: typo Applying: checkpatch: suggest pr_ over printk(KERN_ Applying: init/do_mounts.c: create /root if it does not exist Applying: kmod: avoid deadlock from recursive kmod call Applying: kmod-avoid-deadlock-by-recursive-kmod-call-fix Applying: proc: clean up /proc//environ handling Applying: smp: introduce a generic on_each_cpu_mask() function Applying: arm: move arm over to generic on_each_cpu_mask Applying: tile: move tile to use generic on_each_cpu_mask Applying: smp: add func to IPI cpus based on parameter func Applying: smp-add-func-to-ipi-cpus-based-on-parameter-func-fix Applying: smp-add-func-to-ipi-cpus-based-on-parameter-func-update Applying: smp-add-func-to-ipi-cpus-based-on-parameter-func-update-fix Applying: smp: add func to IPI cpus based on parameter func Applying: smp-add-func-to-ipi-cpus-based-on-parameter-func-v9-fix Applying: slub: only IPI CPUs that have per cpu obj to flush Applying: fs: only send IPI to invalidate LRU BH when needed Applying: mm: only IPI CPUs to drain local pages if they exist Applying: mm-only-ipi-cpus-to-drain-local-pages-if-they-exist-update Applying: mm-only-ipi-cpus-to-drain-local-pages-if-they-exist-v9 Applying: lib/cpumask.c: remove __any_online_cpu() Applying: arch/ia64: remove references to cpu_*_map Applying: kexec: crash: don't save swapper_pg_dir for !CONFIG_MMU configura= tions Applying: kexec: add further check to crashkernel Applying: kdump x86: fix total mem size calculation for reservation Applying: ipc/sem.c: alternatives to preempt_disable() Applying: ipmi: decrease the IPMI message transaction time in interrupt mode Applying: ipmi: increase KCS timeouts Applying: ipmi: use a tasklet for handling received messages Applying: ipmi: fix message handling during panics Applying: ipmi: simplify locking Applying: ipmi: use locks on watchdog timeout set on reboot Applying: sysctl: use bitmap library functions Applying: pidns: add reboot_pid_ns() to handle the reboot syscall Applying: pidns-add-reboot_pid_ns-to-handle-the-reboot-syscall-fix Applying: pidns-add-reboot_pid_ns-to-handle-the-reboot-syscall-checkpatch-f= ixes Applying: nbd: rename the nbd_device variable from lo to nbd Applying: fs/proc/namespaces.c: prevent crash when ns_entries[] is empty Applying: radix-tree: introduce bit-optimized iterator Applying: radix-tree-introduce-bit-optimized-iterator-v3 Applying: radix-tree-introduce-bit-optimized-iterator-v3-fix Applying: radix-tree: rewrite gang lookup using iterator Applying: radix-tree: use iterators in find_get_pages* functions Applying: selftests: launch individual selftests from the main Makefile Applying: selftests/Makefile: make `run_tests' depend on `all' Applying: mm: move page-types.c from Documentation to tools/vm Applying: mm: move slabinfo.c to tools/vm Applying: mm: move hugepage test examples to tools/testing/selftests/vm Applying: move-hugepage-test-examples-to-tools-testing-selftests-vm-fix Applying: move-hugepage-test-examples-to-tools-testing-selftests-vm-fix-fix Applying: sysctl: make kernel.ns_last_pid control dependent on CHECKPOINT_R= ESTORE Applying: fs, proc: introduce /proc//task//children entry Applying: syscalls, x86: add __NR_kcmp syscall Applying: syscalls-x86-add-__nr_kcmp-syscall-v8-fix Applying: syscalls-x86-add-__nr_kcmp-syscall-v8-fix-2 Applying: c/r: procfs: add arg_start/end, env_start/end and exit_code membe= rs to /proc/$pid/stat Applying: c/r: prctl: extend PR_SET_MM to set up more mm_struct entries Applying: c/r: prctl: add ability to set new mm_struct::exe_file Applying: c-r-prctl-add-ability-to-set-new-mm_struct-exe_file-v2 Applying: c/r: prctl: add ability to get clear_tid_address Applying: c-r-prctl-add-ability-to-get-clear_tid_address-fix Applying: ramoops: use pstore interface Applying: ramoops: fix printk format warnings Applying: notify_change(): check that i_mutex is held Merging akpm (37bf584 notify_change(): check that i_mutex is held) --Signature=_Mon__26_Mar_2012_15_28_07_+1100_bS8z+OeGuPKv8vFO Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQIcBAEBCAAGBQJPb/BXAAoJEECxmPOUX5FEwBsP/RChbdRS38/3xCpdveqSJBr9 Uhz6TBrMch4hif+ct9/1wafIlPIlFsx72g1yj9vaxBh2PNi8AEjd3ap8LTAknlcM k0/VL37GYA/17TxA7kHbMzvdmF2l56zsjOGxNdkRbJGbkpn1eZy0hv5RQb/OKOMv KBmGBfR43XsQmbMSE4tK/5Dme9DZMI5pMYLgnqwJf6N52O+FGycxpBICdkc1nipL Cdf+rJIM/R8aLrKsWTcciKK6yJKe4Cth2xP6WbJqopp4hRRiFdwUFgbU9I6qcSM6 og+3ilYXNSyJQJh+3pKDKcDXqpYdBqBmw3COxSXkid9zDhEMB3vhTRuNyJAY0MRu d0JBqvkyufW667TQ2Gct4ayjt1qHcZa35g3lkXbFO/EclxZh5xTaLPrAeB6arRf0 Zi8kXB9o91ivWnuQVqFv14hHBXI2KBjNglK9jDxM03hxxDzH00CEzi+ToVGqdBwv F7+MPytnkYBR7ZU1OS13bfRVlaBXfqjB+GGblinM39leWMsQ/koGtTuv0F2/6E7k 4VRMP2OaOkCCRm8RPNLy1OGdVpG1uDw+FHkG0uNjV0OEjoIOoElO0+c8C9vevc9y wWDoc00bM/CnQ69aty5Ilp1II19a3U4QMqwI007WAigre3DLkne2N3dGNIKkT+bk /uoPpZDewYX7VFZZaTvM =2GX5 -----END PGP SIGNATURE----- --Signature=_Mon__26_Mar_2012_15_28_07_+1100_bS8z+OeGuPKv8vFO--