From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754271Ab2HQFt4 (ORCPT ); Fri, 17 Aug 2012 01:49:56 -0400 Received: from haggis.pcug.org.au ([203.10.76.10]:58576 "EHLO members.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751740Ab2HQFtv (ORCPT ); Fri, 17 Aug 2012 01:49:51 -0400 Date: Fri, 17 Aug 2012 15:49:40 +1000 From: Stephen Rothwell To: linux-next@vger.kernel.org Cc: LKML Subject: linux-next: Tree for Aug 17 Message-Id: <20120817154940.2156bf42cd076ba649de2e26@canb.auug.org.au> X-Mailer: Sylpheed 3.2.0 (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=_Fri__17_Aug_2012_15_49_40_+1000_7_K+3WogkQfuDSgT" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Signature=_Fri__17_Aug_2012_15_49_40_+1000_7_K+3WogkQfuDSgT Content-Type: text/plain; charset=US-ASCII Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi all, Changes since 20120816: The v4l-dvb tree gained a build failure so I used the version from next-20120816. The infiniband tree lost its build failure. The regulator tree lost its build failure. The hid tree lost its build failure. The tip tree still has its build failure so I used the version from next-20120814. The driver-core tree gained a build failure so I used the version from next-20120816. I have still reverted 3 commits from the signal tree at the request of the arm maintainer. The akpm tree gained a conflict against the slab tree and lost a patch 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 (d987569 Linux 3.6-rc2) 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 (8986873 ARM: 7490/1: Drop duplicate select for G= ENERIC_IRQ_PROBE) Merging m68k-current/for-linus (9e2760d m68k: Make sys_atomic_cmpxchg_32 wo= rk on classic m68k) Merging powerpc-merge/merge (ad36cb0 powerpc/kvm/book3s_32: Fix MTMSR_EERI = macro) Merging sparc/master (2a95e37 scripts/decodecode: Fixup trapping instructio= n marker) Merging net/master (476ad15 net: netprio: fix cgrp create and write priomap= race) Merging sound-current/for-linus (5e68fb3 ALSA: hda - Don't send invalid vol= ume knob command on IDT 92hd75bxx) Merging pci-current/for-linus (9f6445a Merge branch 'pci/rafael-3.6-fixes' = into for-linus) Merging wireless/master (7dd6753 ath5k: fix spin_lock_irqsave/spin_lock_bh = nesting in mesh) Merging driver-core.current/driver-core-linus (7b7e995 extcon: extcon_gpio:= Replace gpio_request_one by devm_gpio_request_one) Merging tty.current/tty-linus (38f8eef pmac_zilog,kdb: Fix console poll hoo= k to return instead of loop) Merging usb.current/usb-linus (731879f USB: qcserial: fix port handling on = Gobi 1K and 2K+) Merging staging.current/staging-linus (3a491ae Merge tag 'v3.6-rc1-iio-fixe= s' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-= linus) Merging char-misc.current/char-misc-linus (f3261df 1-Wire: Add support for = the maxim ds1825 temperature sensor) 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 (22018e9 Merge branches 'fixes' and 'misc' into for-ne= xt) Merging arm-perf/for-next/perf (b90c4b9 Merge branch 'hw-breakpoint' into f= or-next/perf) 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 (01ddd9a C6X: select GENERIC_ATOMIC64) 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 (9e2760d m68k: Make sys_atomic_cmpxchg_32 work on cla= ssic m68k) Merging m68knommu/for-next (c8efcf9 m68k: select CONFIG_GENERIC_ATOMIC64 fo= r all m68k CPU types) Merging microblaze/next (a01ee16 Merge branch 'for-linus' of git://git.open= -osd.org/linux-open-osd) Merging mips/mips-for-linux-next (a9b21c6 Merge branches 'next/for-linus', = 'next/generic', 'next/lantiq' and 'next/trace' into mips-for-linux-next) Merging openrisc/for-upstream (207e715 openrisc: use scratch regs in atomic= syscall) Merging parisc/for-next (5b24c42 [PARISC] fix personality flag check in cop= y_thread()) 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 (ce629a2 powerpc/e5500: Add Power ISA properties to comp= ly with ePAPR 1.1) Merging s390/features (3c011c6 s390/bpf,jit: BPF Just In Time compiler for = s390) Merging sh/sh-latest (fa75ce6 Merge branches 'sh/urgent' and 'sh/gpiolib' i= nto sh-latest) 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 xtensa/for_next (499d9ec xtensa: ISS: exit simulator in case of hal= t or panic) Merging ceph/master (1fe5e99 rbd: create rbd_refresh_helper()) Merging cifs/for-next (30e5913 Remove sparse warning in cifsfs.c) 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 (0d7614f Linux 3.6-rc1) Merging ext3/for_next (68766a2 udf: fix retun value on error path in udf_lo= ad_logicalvol) Merging ext4/dev (03179fe ext4: undo ext4_calc_metadata_amount if we fail t= o claim space) Merging fuse/for-next (fb6ccff fuse: verify all ioctl retry iov elements) Merging gfs2/master (257cd64 GFS2: Use rbm for gfs2_setbit()) Merging logfs/master (9f0bbd8 logfs: query block device for number of pages= to send with bio) Merging nfs/linux-next (d0f6eca7 NFS: return -ENOKEY when the upcall fails = to map the name) Merging nfsd/nfsd-next (2c142ba NFSd: make boot_time variable per network n= amespace) Merging ocfs2/linux-next (4538df6 ocfs2: Don't spam on -EDQUOT.) 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 (643bfc0 xfs: check for possible overflow in xfs_ioc_t= rim) Merging vfs/for-next (dbc6e02 delousing target_core_file a bit) Merging pci/next (960a81c Merge branch 'pci/lance-aer-notice' into next) Merging hid/for-next (86476aa Merge branch 'picolcd' into for-next) Merging quilt/i2c (a918790 i2c: Convert struct i2c_msg initialization to C9= 9 format) Merging i2c-embedded/i2c-embedded/for-next (5db20c4 Revert "i2c: tegra: con= vert normal suspend/resume to *_noirq") Merging quilt/jdelvare-hwmon (4ac1223 hwmon: (coretemp) Use get_online_cpus= to avoid races involving CPU hotplug) Merging hwmon-staging/hwmon-next (c7078d3 hwmon: (adt7410) handle errors fr= om adt7410_update_device()) Merging v4l-dvb/master (8a745a4 Merge /home/v4l/v4l/patchwork) $ git reset --hard HEAD^ Merging refs/next/20120816/v4l-dvb Merging kbuild/for-next (85b170e Merge branches 'kbuild/kconfig' and 'kbuil= d/misc' into kbuild/for-next) Merging kconfig/for-next (45f4c81 localmodconfig: Use my variable for loop = in streamline_config.pl) Merging libata/NEXT (354b2ea libata-acpi: fix up for acpi_pm_device_sleep_s= tate API) Merging infiniband/for-next (c0369b2 Merge branches 'cma', 'ipoib', 'misc',= 'mlx4', 'ocrdma', 'qib' and 'srp' into for-next) Merging acpi/next (9d0b01a Merge branches 'delete-gts-bfs', 'misc', 'novell= -bugzilla-757888-numa' and 'osc-pcie' into base) 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 thermal/next (449488c thermal: Fix potential NULL pointer accesses) Merging ieee1394/for-next (e3cbd92 firewire: core: document is_local sysfs = attribute) Merging ubi/linux-next (a07ade1 arm: sam9_l9260_defconfig: remove non-exist= ing config option) Merging dlm/next (9c5bef5 dlm: cleanup send_to_sock routine) 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 (c87a9fc Merge branch 'fixes_for-3.6' into next) Merging dmaengine/next (a2bd114 netdma: adding alignment check for NETDMA o= ps) Merging net-next/master (02644a1 sctp: fix bogus if statement in sctp_auth_= recv_cid()) Merging wireless-next/master (22c5649 p54: fix powerpc gcc warnings) Merging bluetooth/master (b691f1a Bluetooth: mgmt: Add device disconnect re= ason) Merging mtd/master (4800399 mtd: m25p80: Add support for serial flash STM/M= icron N25Q032) Merging l2-mtd/master (6fc9dbb mtd: nand: rename '_raw' BBT scan functions) 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 (1c86845 ALSA: hda - Add 3stack-automute model to AD= 1882 codec) Merging sound-asoc/for-next (736ad1a Merge branch 'for-3.6' into asoc-next) Merging quilt/rr (d673c23 Make most arch asm/module.h files use asm-generic= /module.h) CONFLICT (content): Merge conflict in arch/xtensa/Kconfig CONFLICT (content): Merge conflict in arch/s390/Kconfig Merging input/next (2b94e25 Input: random formatting fixes) Merging input-mt/for-next (0d7614f Linux 3.6-rc1) Merging cgroup/for-next (4b2ebf0 Merge branch 'for-3.6' into for-next) Merging block/for-next (4004e90 Documentation: update tunable options in bl= ock/cfq-iosched.txt) Merging quilt/device-mapper (0d7614f Linux 3.6-rc1) 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 (72d0f11 mmc: bfin_sdh: Reset SD controller when resum= e from power saving mode.) Merging kgdb/kgdb-next (15d7ea0 kgdboc: Accept either kbd or kdb to activat= e the vga + keyboard kdb shell) Merging slab/for-next (77be4b1 mm/slab: restructure kmem_cache_create() deb= ug checks) Merging uclinux/for-next (5e442a4 Revert "proc: fix races against execve() = of /proc/PID/fd**") Merging md/for-next (7705d0b md: avoid taking the mutex on some ioctls.) 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 (e5b60c1 Merge branch 'regulator-drivers' into r= egulator-next) Merging security/next (9f99798 ptrace: mark __ptrace_may_access() static) 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 (6f286cc Merge branches 'iommu/fixes' and 'arm/tegra' in= to next) Merging vfio/next (a1706d8 vfio: Include vfio.h in installed headers) Merging osd/linux-next (b8017d2 exofs: check for allocation failure in uri_= store()) Merging jc_docs/docs-next (5c050fb docs: update the development process doc= ument) Merging trivial/for-next (ef706fb irqdesc: delete now orphaned references t= o timer_rand_state) Merging audit/for-next (dcd6c92 Linux 3.3-rc1) Merging pm/linux-next (19bf3f1 intel_idle: Check cpu_idle_get_driver() for = NULL before dereferencing it.) 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 (5d61b16 of: Allow busses with #size-cells=3D0) Merging spi/spi/next (d8e328b spi: Add "spi:" prefix to modalias attribute = of spi devices) Merging spi-mb/spi-next (2370345 spi: spi-altera: Use of_match_ptr) Merging tip/auto-latest (bf09da2 Merge branch 'timers/urgent' into auto-lat= est) $ git reset --hard HEAD^ Merging refs/next/20120814/tip Merging rcu/rcu/next (d1d61c1 Merge branches 'bigrt.2012.07.31a', 'doctortu= re.2012.08.03a', 'fixes.2012.08.03a', 'hotplug.2012.08.03a' and 'idle.2012.= 07.31a' into dev.3.7.2012.08.03a) CONFLICT (content): Merge conflict in include/linux/sched.h CONFLICT (content): Merge conflict in arch/x86/Kconfig CONFLICT (content): Merge conflict in arch/Kconfig 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 (dbcb4e7 KVM: VMX: Advertize RDTSC exiting to nested= guests) CONFLICT (content): Merge conflict in arch/s390/include/asm/processor.h Merging kvm-ppc/kvm-ppc-next (e9908a4 KVM: PPC: BookE: Support FPU on non-h= v systems) 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 (7635d2f workqueue: use system_highpri_wq for u= nbind_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 (e0bf121 Merge branch 'regmap-irq' into regmap-next) Merging hsi/for-next (43139a6 HSI: hsi_char: Update ioctl-number.txt) Merging leds/for-next (4e83ac8 leds: delay led_set_brightness if stopping s= oft-blink) Merging driver-core/driver-core-next (9baf322 extcon: Ensure dynamically al= located sysfs attributes are initialised) $ git reset --hard HEAD^ Merging refs/next/20120816/driver-core Merging tty/tty-next (63d4869 firmware: remove computone driver firmware an= d documentation) Merging usb/usb-next (26f944b usb: hcd: use *resource_size_t* for specifyin= g resource data) Merging staging/staging-next (1021bb5 Merge tag 'iio-for-v3.7a' of git://gi= t.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-next) Merging char-misc/char-misc-next (877cdf3 drivers/misc/ti-st: check chip_aw= ake NULL check) CONFLICT (content): Merge conflict in drivers/misc/mei/interrupt.c Merging tmem/linux-next (15773b6 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 (f84b81f Merge branch 'devel' into for-next) Merging vhost/linux-next (e0953c8 tun: experimental zero copy tx support) CONFLICT (content): Merge conflict in drivers/net/tun.c 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 (ddf343f Merge branch 'for-linus' of git://git.kerne= l.org/pub/scm/linux/kernel/git/s390/linux) Merging gpio-lw/for-next (a4b2b71 Merge branch 'devel' into for-next) Merging arm-soc/for-next (e149302 Merge branch 'next/dt' into for-next) CONFLICT (content): Merge conflict in drivers/mtd/nand/Kconfig Merging ep93xx/ep93xx-for-next (fbad878 Merge branch 'ep93xx-cleanup' into = ep93xx-for-next) Merging renesas/next (45c7a01 Merge branch 'renesas-marzen' into renesas-bo= ard) Merging samsung/for-next (c1f9bee Merge branch 'next/board-samsung' into fo= r-next) Merging tegra/for-next (782bbe1 Merge branch 'for-3.7/defconfig' into for-n= ext) Merging kvmtool/master (5237deb kvm tools: Fix segfault on "lkvm run") Merging dma-mapping/dma-mapping-next (d9e0d14 ARM: dma-mapping: fix incorre= ct freeing of atomic allocations) Merging pwm/for-next (026b4d7 pwm: core: Fix coding style issues) Merging dma-buf/for-next (42a579a Merge branches 'timers-urgent-for-linus' = and 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi= t/tip/tip) Merging userns/for-next (898132a ipv6: move dereference after check in fl_f= ree()) 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/x86/kernel/signal.c 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: cs5535-clockevt: typo, it's MFGPT, not MFPGT Applying: mm: change nr_ptes BUG_ON to WARN_ON Applying: Documentation: update mount option in filesystem/vfat.txt 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: 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: pcmcia: move unbind/rebind into dev_pm_ops.complete Applying: timeconst.pl: remove deprecated defined(@array) Applying: time: don't inline EXPORT_SYMBOL functions 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: 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: mm: remove __GFP_NO_KSWAPD Applying: mm: remove __GFP_NO_KSWAPD fixes Applying: remove-__gfp_no_kswapd-fixes-fix Applying: x86, pat: remove the dependency on 'vm_pgoff' in track/untrack pf= n vma routines Applying: x86, pat: separate the pfn attribute tracking for remap_pfn_range= and vm_insert_pfn Applying: x86-pat-separate-the-pfn-attribute-tracking-for-remap_pfn_range-a= nd-vm_insert_pfn-fix Applying: mm, x86, pat: rework linear pfn-mmap tracking Applying: mm: introduce arch-specific vma flag VM_ARCH_1 Applying: mm: kill vma flag VM_INSERTPAGE Applying: mm: kill vma flag VM_CAN_NONLINEAR Applying: mm: use mm->exe_file instead of first VM_EXECUTABLE vma->vm_file Applying: mm: kill vma flag VM_EXECUTABLE and mm->num_exe_file_vmas Applying: mm: prepare VM_DONTDUMP for using in drivers Applying: mm: kill vma flag VM_RESERVED and mm->reserved_vm counter Applying: mm-kill-vma-flag-vm_reserved-and-mm-reserved_vm-counter-fix Applying: frv: kill used but uninitialized variable 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-empty-nodes-have-no-color-fix 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-performance-and-correctness-test-fix 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: drivers/firmware/dmi_scan.c: check dmi version when get system uu= id Applying: drivers-firmware-dmi_scanc-check-dmi-version-when-get-system-uuid= -fix Applying: drivers/firmware/dmi_scan.c: fetch dmi version from SMBIOS if it = exists Applying: drivers-firmware-dmi_scanc-fetch-dmi-version-from-smbios-if-it-ex= ists-checkpatch-fixes Applying: fat (exportfs): move NFS support code Applying: fat (exportfs): fix dentry reconnection Applying: ipc/sem.c: alternatives to preempt_disable() Merging akpm/master (a96005b ipc/sem.c: alternatives to preempt_disable()) --Signature=_Fri__17_Aug_2012_15_49_40_+1000_7_K+3WogkQfuDSgT Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQIcBAEBCAAGBQJQLdt0AAoJEECxmPOUX5FED+gP/0ulu/FUlTd9GS04bkevYV9X t3rSlsy4KuSdqe/Xic91+0OOmTEEIAsBhqwNq+a8BPc+t2dHe6L4NrAz4TURRl/9 Zab+K7rsDcyvF02bLY2kdIc3DYSh28Guo/+eKasWSyjrCDM2XGX1JY7o7QzRY6cv KU1Qk7dcS32upF57b7/KGoE407HXwJF0oPuT3XHmo4LI7wfchdrQe624HYBCDQAL uzwKBCI7SS1/MicMuCM+CO7KR0EqhlgqXD93NCKR0/5PIAdYguZ4DxH5iNy8yXvr eFFHxkN+gMcgKb0cMn6hKdcPXJ5r90mwPHSk0JUjyf8qw5vI21ug5bwwDbRwW+8y EYN6Nv8PzEMbAXhu7XUkTCu1i2Ah09QBdJHxcsXuwYVtMblZC6dRl5NZ7NzMRK7Z n52im58CnD14RODJ3MXTlAKpKpoq9G9asqFkcsWfDdYfGjtHKIlaU+ev3KykVu9j gjAObMBBhmpxlrtHfbsggHaaAms8xdXI8F/S7GAwGkFrc+VgWzLCBeJiZGkDdqiz 7wVbIdlrYoDNMqkG/a/G/+C2oT2Q7bEpDreMfQdr0+jkO1NYoUDBEqM6O/MEhsnx Z9fw7BOJZPVpS5vY3P7PQyWUJNq/sQg8EyWPdp1CG4Aos3+h/cw0K2ec8tYU9G1D uhcYZ1kpA3GuSQktrSKO =1dXL -----END PGP SIGNATURE----- --Signature=_Fri__17_Aug_2012_15_49_40_+1000_7_K+3WogkQfuDSgT--