From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751905AbaKDGgf (ORCPT ); Tue, 4 Nov 2014 01:36:35 -0500 Received: from ozlabs.org ([103.22.144.67]:40335 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750882AbaKDGgc (ORCPT ); Tue, 4 Nov 2014 01:36:32 -0500 Date: Tue, 4 Nov 2014 17:36:24 +1100 From: Stephen Rothwell To: linux-next@vger.kernel.org Cc: linux-kernel@vger.kernel.org Subject: linux-next: Tree for Nov 4 Message-ID: <20141104173624.67dd3286@canb.auug.org.au> X-Mailer: Claws Mail 3.11.1 (GTK+ 2.24.25; i586-pc-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/s1n2OiwK47Zkm_MX6XxMaAr"; protocol="application/pgp-signature" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/s1n2OiwK47Zkm_MX6XxMaAr Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Changes since 20141103: The mfd tree gained a build failure for which I reverted a commit. The scsi tree lost its build failure, but gained another so I used the version from next-20141031. Non-merge commits (relative to Linus' tree): 3170 2579 files changed, 83652 insertions(+), 106096 deletions(-) ---------------------------------------------------------------------------- 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" and checkout or reset to the new master. 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 and a multi_v7_defconfig for arm. After the final fixups (if any), it is also built with powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig and allyesconfig (this fails its final link) and i386, sparc, sparc64 and arm defconfig. Below is a summary of the state of the merge. I am currently merging 227 trees (counting Linus' and 32 trees of patches pending for Linus' tree). Stats about the size of the tree over time can be seen at http://neuling.org/linux-next-size.html . 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. --=20 Cheers, Stephen Rothwell sfr@canb.auug.org.au $ git checkout master $ git reset --hard stable Merging origin/master (f4ca536f71ad Merge branch 'for-linus' of git://git.k= ernel.org/pub/scm/linux/kernel/git/geert/linux-m68k) Merging fixes/master (b94d525e58dc Merge git://git.kernel.org/pub/scm/linux= /kernel/git/davem/net) Merging kbuild-current/rc-fixes (7d1311b93e58 Linux 3.17-rc1) Merging arc-current/for-curr (2ce7598c9a45 Linux 3.17-rc4) Merging arm-current/fixes (9ff0bb5ba606 ARM: 8180/1: mm: implement no-highm= em fast path in kmap_atomic_pfn()) Merging m68k-current/for-linus (f7bbd12a4b7e m68k: Wire up bpf) Merging metag-fixes/fixes (ffe6902b66aa asm-generic: remove _STK_LIM_MAX) Merging mips-fixes/mips-fixes (1795cd9b3a91 Linux 3.16-rc5) Merging powerpc-merge/merge (396a34340cdf powerpc: Fix endianness of flash_= block_list in rtas_flash) Merging powerpc-merge-mpe/fixes (10ccaf178b2b powerpc: use device_online/of= fline() instead of cpu_up/down()) Merging sparc/master (7da89a2a3776 sparc64: Fix crashes in schizo_pcierr_in= tr_other().) Merging net/master (9fd3d3a43072 sfc: don't BUG_ON efx->max_channels =3D=3D= 0 in probe) Merging ipsec/master (d10845fc85b2 Merge branch 'gso_encap_fixes') Merging sound-current/for-linus (1df8874bfab1 ALSA: hda/realtek - Update In= itial AMP for EAPD control) Merging pci-current/for-linus (d8e7d53a2fc1 PCI: Rename sysfs 'enabled' fil= e back to 'enable') Merging wireless/master (75a916e1944f rtlwifi: rtl8192se: Fix firmware load= ing) Merging driver-core.current/driver-core-linus (0df1f2487d2f Linux 3.18-rc3) Merging tty.current/tty-linus (0df1f2487d2f Linux 3.18-rc3) Merging usb.current/usb-linus (0df1f2487d2f Linux 3.18-rc3) Merging usb-gadget-fixes/fixes (9599815de61d usb: dwc2: gadget: fix enumera= tion issues) Merging usb-serial-fixes/usb-linus (e681286de221 USB: opticon: fix non-atom= ic allocation in write path) Merging staging.current/staging-linus (0df1f2487d2f Linux 3.18-rc3) Merging char-misc.current/char-misc-linus (0df1f2487d2f Linux 3.18-rc3) Merging input-current/for-linus (e55a3366984c Revert "Input: i8042 - disabl= e active multiplexing by default") Merging md-current/for-linus (d47648fcf061 raid5: avoid finding "discard" s= tripe) Merging crypto-current/master (09adc8789c4e crypto: qat - Enforce valid num= a configuration) Merging ide/master (7546e52b5e3d Drivers: ide: Remove typedef atiixp_ide_ti= ming) Merging dwmw2/master (5950f0803ca9 pcmcia: remove RPX board stuff) Merging devicetree-current/devicetree/merge (e66c98c7a0ea of: Fix NULL dere= ference in selftest removal code) Merging rr-fixes/fixes (f49819560f53 virtio-rng: skip reading when we start= to remove the device) Merging vfio-fixes/for-linus (239a87020b26 Merge branch 'for-joerg/arm-smmu= /fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into fo= r-linus) Merging kselftest-fixes/fixes (0df1f2487d2f Linux 3.18-rc3) Merging drm-intel-fixes/for-linux-next-fixes (0df1f2487d2f Linux 3.18-rc3) Merging asm-generic/master (f3670394c29f Revert "x86/efi: Fixup GOT in all = boot code paths") Merging arc/for-next (996bad6cb351 ARC: add power management options) Merging arm/for-next (9ff0bb5ba606 ARM: 8180/1: mm: implement no-highmem fa= st path in kmap_atomic_pfn()) Merging arm-perf/for-next/perf (af66abfe2ec8 arm: perf: fold hotplug notifi= er into arm_pmu) Merging arm-soc/for-next (3d97171519b2 Merge branch 'fixes' into for-next) Merging bcm2835/for-next (fa389e220254 Linux 3.14-rc6) Merging berlin/berlin/for-next (bb3adf0f4627 Merge branch 'berlin/dt' into = berlin/for-next) Merging cortex-m/for-next (f0d7515372ff ARM: v7m: add trivial suspend suppo= rt) Merging ep93xx/ep93xx-for-next (bfb0709fd17b Merge branch 'ep93xx-fixes' in= to ep93xx-for-next) Merging imx-mxs/for-next (809d4af84856 Merge branch 'imx/dt' into for-next) Merging ixp4xx/next (19f949f52599 Linux 3.8) Merging keystone/next (39179cb5b789 soc: ti: knav_qmss_queue: Return proper= error if devm_kzalloc fails) Merging msm/for-next (81cf1e061d00 ARM: msm: Rename msm devicetrees to have= standard 'qcom' prefix) Merging mvebu/for-next (0626430385b7 Merge branch 'mvebu/dt' into mvebu/for= -next) Merging renesas/next (1c43133a8125 Merge branches 'heads/dt-cleanups-for-v3= .19', 'heads/dt-clocksource-for-v3.19', 'heads/kconfig-cleanups-for-v3.19',= 'heads/clocks-for-v3.19' and 'heads/runtime-pm-for-v3.19' into next) Merging samsung/for-next (5d184e4fb69a Merge branch 'v3.19-next/pm-samsung-= 2' into for-next) Merging sunxi/sunxi/for-next (2f38ad8b07ac Merge branch 'sunxi/dt-for-3.19'= into sunxi/for-next) Merging tegra/for-next (5599b9197647 Merge branch for-3.18/defconfig into f= or-next) Merging arm64/for-next/core (0a6479b0ffad arm64: Remove unneeded extern key= word) Merging blackfin/for-linus (275f5a8573e7 blackfin: defconfigs: cleanup unus= ed CONFIG_MTD_CHAR, add MTD_SPI_NOR for BF537-STAMP) Merging c6x/for-linux-next (ae72758f1dd9 c6x: fix build failure caused by c= ache.h) Merging cris/for-next (21bd887cd7c4 CRISv32: Remove last remnants of ETRAX_= SPI_MMC_BOARD) Merging hexagon/linux-next (a9a44fdf3296 Hexagon: update CR year for elf.h) Merging ia64/next (0f33be009b89 Linux 3.17-rc6) Merging m68k/for-next (bcf8eb09b564 nubus: Remove superfluous interrupt dis= able/restore) Merging m68knommu/for-next (cac7f2429872 Linux 3.18-rc2) Merging metag/for-next (f93125ae17d1 metag: cachepart: Fix failure check) Merging microblaze/next (a4f174dee4ae microblaze: Wire up bpf syscall) Merging mips/mips-for-linux-next (2f2a6e421b36 Merge branch '3.18-fixes' in= to mips-for-linux-next) Merging openrisc/for-upstream (548dafe880ad openrisc: Use get_signal() sign= al_setup_done()) Merging parisc/for-next (6c700d71f7fa [PARISC] hpux: Remove obsolete regs p= arameter from do_execve() in hpux_execve()) Merging parisc-hd/for-next (5e40d331bd72 Merge branch 'next' of git://git.k= ernel.org/pub/scm/linux/kernel/git/jmorris/linux-security) Merging powerpc/next (9e813308a5c1 powerpc/thp: Add tracepoints to track hu= gepage invalidate) Merging powerpc-mpe/next (c3351dfabf5c Merge branch 'for-next' of git://git= .kernel.org/pub/scm/linux/kernel/git/nab/target-pending) Merging fsl/next (cb0446c1b625 Revert "powerpc/fsl_msi: spread msi ints acr= oss different MSIRs") Merging mpc5xxx/next (9e813308a5c1 powerpc/thp: Add tracepoints to track hu= gepage invalidate) Merging s390/features (eaf785d51dc6 s390/cpum_sf: Remove initialization of = PMU event index) Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://g= it.kernel.org/pub/scm/linux/kernel/git/dtor/input) Merging tile/master (78410af51146 tile: add clock_gettime support to vDSO) Merging uml/next (989e59fa41c5 um: Include generic barrier.h) CONFLICT (content): Merge conflict in arch/um/include/asm/Kbuild Merging unicore32/unicore32 (d670878e2c9a unicore32: Remove ARCH_HAS_CPUFRE= Q config option) Merging xtensa/for_next (66acb0216d5a Merge tag 'xtensa-for-next-20141021-1= ' of git://github.com/jcmvbkbc/linux-xtensa into for_next) Merging btrfs/next (a43bb39b5c71 btrfs: Fix compile error when CONFIG_SECUR= ITY is not set.) Merging ceph/master (c27a3e4d667f libceph: do not hard code max auth ticket= len) Merging cifs/for-next (6212096bb0a1 [CIFS] Update modinfo cifs version for = cifs.ko) Merging configfs/linux-next (b930c26416c4 Merge branch 'for-linus' of git:/= /git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs) Merging ecryptfs/next (831115af5ca3 eCryptfs: Remove unnecessary casts when= parsing packet lengths) Merging ext3/for_next (3c9cafe05ff0 fs, jbd: use a more generic hash functi= on) Merging ext4/dev (ae9e9c6aeea6 ext4: make ext4_ext_convert_to_initialized()= return proper number of blocks) Merging f2fs/dev (1c000698c138 f2fs: introduce -o fastboot for reducing boo= ting time only) Merging fscache/fscache (1a8ed18fb7db cachefiles: remove two unused pagevec= s.) CONFLICT (content): Merge conflict in fs/fscache/object.c Merging fuse/for-next (d7afaec0b564 fuse: add FUSE_NO_OPEN_SUPPORT flag to = INIT) Merging gfs2/master (1a8550332a7f GFS2: If we use up our block reservation,= request more next time) Merging jfs/jfs-next (bb5e50aaa805 fs/jfs/super.c: convert simple_str to ks= tr) Merging logfs/master (339466142b3f Fix the call to BUG() caused by no free = segment found) Merging nfs/linux-next (cac7f2429872 Linux 3.18-rc2) Merging nfsd/nfsd-next (ccc6398ea5d5 nfsd: clean up comments over nfs4_file= definition) Merging omfs/for-next (976d167615b6 Linux 3.1-rc9) Merging squashfs/master (6d565409503f Squashfs: fix failure to unlock pages= on decompress error) Merging v9fs/for-next (f15844e0777f 9P: fix return value in v9fs_fid_xattr_= set) Merging ubifs/linux-next (91401a34038e UBI: Fastmap: Calc fastmap size corr= ectly) Merging xfs/for-next (5d11fb4b9a1d xfs: rework zero range to prevent invali= d i_size updates) Merging file-locks/linux-next (1b2b32dcdb3d locks: fix fcntl_setlease/getle= ase return when !CONFIG_FILE_LOCKING) Merging vfs/for-next (9c883c360fd0 Merge branch 'for-lustre' into for-next) Merging pci/next (f114040e3ea6 Linux 3.18-rc1) Merging hid/for-next (35c6022b8a7c Merge branch 'for-3.19/logitech' into fo= r-next) Merging i2c/i2c/for-next (f114040e3ea6 Linux 3.18-rc1) Merging jdelvare-hwmon/master (ae530d4403e9 hwmon: (i5500_temp) Convert to = use ATTRIBUTE_GROUPS macro) Merging hwmon-staging/hwmon-next (efe8271c1e1b hwmon: (iio_hwmon) Add suppo= rt for humidity sensors) Merging v4l-dvb/master (7a7f1ab37dc8 [media] v4l2-ctrls: fix sparse warning) Merging kbuild/for-next (e9f717fb534c Merge branch 'kbuild/misc' into kbuil= d/for-next) Merging kconfig/for-next (95edca5c523c localmodconfig: Add config depends b= y default settings) Merging libata/for-next (e35b98849f25 ata: sata_rcar: Add r8a7793 device su= pport) Merging pm/linux-next (e4e1a5936e36 Merge branch 'device-properties' into l= inux-next) Merging idle/next (e7c95ff32d00 tools/power turbostat: tweak whitespace in = output format) Merging apm/for-next (53675abbd1e5 x86, apm: Remove unused variable) Merging cpupowerutils/master (f16603386b38 cpupower tools: add install targ= et to the debug tools' makefiles) Merging thermal/next (6ceaf58abe25 Merge branch 'int340x-thermal' of .git i= nto next) Merging thermal-soc/next (9d020cd1d314 Thermal:Remove usless if(!result) be= fore return tz) Merging ieee1394/for-next (19583ca584d6 Linux 3.16) Merging dlm/next (c07127b48c63 dlm: fix missing endian conversion of rcom_s= tatus flags) Merging swiotlb/linux-next (8e0629c1d4ce swiotlb: don't assume PA 0 is inva= lid) Merging slave-dma/next (f114040e3ea6 Linux 3.18-rc1) Merging net-next/master (56b174256b69 net: add rbnode to struct sk_buff) Merging ipsec-next/master (5c1e9f2c1ff7 xfrm: fix set but not used warning = in xfrm_policy_queue_process()) Merging wireless-next/master (6bc6c49f1e2f mwifiex: add cfg80211 dump_surve= y handler) Merging bluetooth/master (98a18b6ffc79 netdevice: add ieee802154_ptr to net= _device) Merging infiniband/for-next (7b909bb49ac2 Merge branches 'core', 'cxgb4', '= iser', 'mlx5' and 'ocrdma' into for-next) Merging mtd/master (89cf38dd536a mtd: cfi_cmdset_0001.c: fix resume for LH2= 8F640BF chips) Merging l2-mtd/master (1f04a73e2c63 MTD: merge 3.18 development into -next = development) Merging crypto/master (bac68f2c9a43 crypto: caam - add support for rfc4106(= gcm(aes))) Merging drm/drm-next (041df3573d0c Merge tag 'drm-intel-next-2014-10-24' of= git://anongit.freedesktop.org/drm-intel into drm-next) Merging drm-panel/drm/panel/for-next (7d1311b93e58 Linux 3.17-rc1) Merging drm-intel/for-linux-next (9550d321dd2a drm/i915: Add kerneldoc for = intel_pipe_update_{start, end}) Merging drm-tegra/drm/tegra/for-next (8ed05f485498 drm/tegra: Depend on COM= MON_CLK) Merging drm-misc/topic/core-stuff (ba8ce31f438c drm/gma500: Don't destroy D= RM properties in the driver) Merging sound/for-next (31604d35db18 ALSA: emu10k1: Deletion of unnecessary= checks before three function calls) Merging sound-asoc/for-next (aef9453b8e7d Merge remote-tracking branch 'aso= c/topic/wm9713' into asoc-next) Merging modules/modules-next (d3051b489aa8 modules, lock around setting of = MODULE_STATE_UNFORMED) Merging virtio/virtio-next (1bbc26062754 virtio-rng: refactor probe error h= andling) Merging input/next (02b6a58b83b2 Input: touchscreen - use __maybe_unused in= stead of ifdef around suspend/resume) Merging input-mt/for-next (5e01dc7b26d9 Linux 3.12) Merging block/for-next (3ec07b7fd5a4 Merge branch 'for-3.19/core' into for-= next) Merging device-mapper/for-next (937aa00b00a6 Merge branch 'dm-for-3.19' int= o for-next) Merging embedded/master (4744b43431e8 embedded: fix vc_translate operator p= recedence) Merging firmware/master (6e03a201bbe8 firmware: speed up request_firmware()= , v3) Merging pcmcia/master (80af9e6d7ae6 pcmcia at91_cf: fix raw gpio number usa= ge) Merging mmc/mmc-next (11bc9381b277 mmc: sdhci-s3c: use mmc_of_parse and rem= ove the card_tasklet) Merging mmc-uh/next (c22a35ea3e12 mmc: mmc_test: Extend "Badly aligned" tes= ts for 8-byte alignment) Merging kgdb/kgdb-next (662bfa325be1 kernel/debug/debug_core.c: Logging cle= an-up) Merging uclinux/for-next (6dbe51c251a3 Linux 3.9-rc1) Merging md/for-next (b395f75eabb3 lib/raid6: Add log level to printks) Merging mfd/for-mfd-next (dcd3435038b7 mfd: wm8350-core: Fix probable mask = then right shift defect) Merging backlight/for-backlight-next (de3d75dc2311 backlight: Use of_find_b= acklight_by_node stub when backlight class disabled) Merging battery/master (cdaf3e15385d power: charger-manager: Fix accessing = invalidated power supply after charger unbind) Merging fbdev/for-next (718b90ac4c21 video: xilinxfb: Simplify error path) Merging viafb/viafb-next (838ac785d521 viafb: avoid refresh and mode lookup= in set_par) Merging omap_dss2/for-next (f114040e3ea6 Linux 3.18-rc1) Merging regulator/for-next (5b39e1a4efb5 Merge remote-tracking branches 're= gulator/topic/s2mpa01', 'regulator/topic/s2mps11', 'regulator/topic/sky8145= 2', 'regulator/topic/stub' and 'regulator/topic/suspend' into regulator-nex= t) Merging security/next (594081ee7145 integrity: do zero padding of the key i= d) Merging integrity/next (1b68bdf9cded ima: detect violations for mmaped file= s) Merging selinux/next (4093a8443941 selinux: normalize audit log formatting) Merging lblnet/next (d8ec26d7f828 Linux 3.13) Merging watchdog/master (8ae1a57f54af watchdog: s3c2410_wdt: Fix the mask b= it offset for Exynos7) CONFLICT (content): Merge conflict in drivers/watchdog/s3c2410_wdt.c Merging iommu/next (f34b4fa45e28 Merge branches 'arm/omap' and 'arm/msm' in= to next) Merging dwmw2-iommu/master (1860e379875d Linux 3.15) Merging vfio/next (93899a679fd6 vfio-pci: Fix remove path locking) Merging osd/linux-next (1fa3a002b254 Boaz Harrosh - fix email in Documentat= ion) Merging jc_docs/docs-next (4041f42fa17b Merge branch 'docs-3.19' into docs-= next) Merging trivial/for-next (be278e980d95 clocksource: Fix 'clcoksource' typo = in comment) Merging audit/next (915f389d9c52 audit: add Paul Moore to the MAINTAINERS e= ntry) Merging fsnotify/for-next (1ca39ab9d21a inotify: automatically restart sysc= alls) Merging devicetree/devicetree/next (2118f4b8dfc6 of/selftest: Move hash tab= le off stack to fix large frame size) Merging dt-rh/for-next (d22e9131187d of: add vendor prefix for Chipidea) Merging mailbox/mailbox-for-next (9f3e3cacb2ff dt: mailbox: add generic bin= dings) Merging spi/for-next (de0f1a323318 Merge remote-tracking branches 'spi/topi= c/atmel', 'spi/topic/dw' and 'spi/topic/fsl-dspi' into spi-next) Merging tip/auto-latest (ebb9f164eeea Merge branch 'x86/vdso') Merging clockevents/clockevents/next (b0ad5917960c ARM/ARM64: arch-timer: f= ix arch_timer_probed logic) Merging edac/linux_next (d0585cd815fa sb_edac: Claim a different PCI device) Merging edac-amd/for-next (a597d2a5d982 amd64_edac: Add F15h M60h support) Merging irqchip/irqchip/for-next (8fbe8bc2d89b Merge branch 'irqchip/core' = into irqchip/for-next) Merging tiny/tiny/next (d45461ff03ad Merge branches 'tiny/bloat-o-meter-no-= SyS', 'tiny/more-procless', 'tiny/no-advice', 'tiny/tinyconfig' and 'tiny/x= 86-boot-compressed-use-yn' into tiny/next) Merging ftrace/for-next (70c738a64478 Merge branch 'trace/ftrace/testing' i= nto trace/for-next) Merging rcu/rcu/next (f120000b06ab Merge branch 'torture.2014.10.28d' into = HEAD) CONFLICT (content): Merge conflict in drivers/md/dm.c Merging uprobes/for-next (0326f5a94dde uprobes/core: Handle breakpoint and = singlestep exceptions) Merging kvm/linux-next (123b2dd10b46 Merge remote-tracking branch 'origin/m= aster' into HEAD) Merging kvm-arm/next (f62c95fd4041 Merge tag 'kvm-s390-next-20141028' of gi= t://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD) Merging kvm-ppc/kvm-ppc-next (8d0eff638564 KVM: PPC: Pass enum to kvmppc_ge= t_last_inst) Merging oprofile/for-next (6ce4eac1f600 Linux 3.13-rc1) Merging fw-nohz/nohz/next (74876a98a87a printk: Wake up klogd using irq_wor= k) Merging xen-tip/linux-next (63401a5dca18 Merge branch 'hypercall_cache_flus= h_v5' into xentip-linux-next-7) Merging percpu/for-next (56e4dea81a55 percpu: Convert remaining __get_cpu_v= ar uses in 3.18-rcX) Merging workqueues/for-next (e09c2c295468 workqueue: apply __WQ_ORDERED to = create_singlethread_workqueue()) Merging drivers-x86/for-next (725c7f619e20 quirk for Lenovo Yoga 3: no rfki= ll switch) Merging chrome-platform/for-next (5502486a2077 platform/chrome: chromeos_la= ptop - Add a limit for deferred retries) Merging sysctl/master (4e474a00d7ff sysctl: protect poll() in entries that = may go away) Merging regmap/for-next (46f6c620e8a1 Merge remote-tracking branches 'regma= p/topic/cache' and 'regmap/topic/headers' into regmap-next) Merging hsi/for-next (a26a42508157 HSI: remove deprecated IRQF_DISABLED) Merging leds/for-next (a4c84e6aafda leds: gpio: cleanup the leds-gpio drive= r) Merging ipmi/for-next (ef4a48c51321 Merge tag 'locks-v3.18-1' of git://git.= samba.org/jlayton/linux) Merging driver-core/driver-core-next (0df1f2487d2f Linux 3.18-rc3) Merging tty/tty-next (0df1f2487d2f Linux 3.18-rc3) Merging usb/usb-next (0df1f2487d2f Linux 3.18-rc3) Merging usb-gadget/next (72a65a0d19c1 Revert "usb: gadget: composite: deque= ue cdev->req before free its buffer") Merging usb-serial/usb-next (9d3801903851 USB: mos7840: replace unnecessary= atomic allocations) Merging staging/staging-next (7cbe010a5ea7 Merge 3.18-rc3 into staging-next) CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/llite/n= amei.c CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/llite/l= lite_lib.c CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/llite/f= ile.c Merging char-misc/char-misc-next (0df1f2487d2f Linux 3.18-rc3) Merging cgroup/for-next (cea74465e27b cpuset: lock vs unlock typo) Merging scsi/for-next (ab013160e38b drivers: scsi: qla2xxx: Remove redundan= t declaration in 'qla_gbl.h') $ git reset --hard HEAD^ Merging next-20141031 version of scsi Merging target-updates/for-next (cac7f2429872 Linux 3.18-rc2) Merging target-merge/for-next-merge (b28a960c42fc Linux 3.14-rc2) Merging writeback/writeback-for-next (f9b0e058cbd0 writeback: Fix data corr= uption on NFS) Merging hwspinlock/linux-next (8b37fcfc9b34 hwspinlock: add MAINTAINERS ent= ries) Merging pinctrl/for-next (abb2ed922eeb Merge branch 'devel' into for-next) Merging vhost/linux-next (970379f59d81 vhost: move memory pointer to VQs) CONFLICT (content): Merge conflict in drivers/vhost/net.c Merging remoteproc/for-next (9a3c4145af32 Linux 3.16-rc6) Merging rpmsg/for-next (397944df3290 rpmsg: fix kconfig dependencies for VI= RTIO) Merging gpio/for-next (2071d0968e56 Documentation: gpio: guidelines for bin= dings) Merging dma-mapping/dma-mapping-next (dda02fd6278d mm, cma: make parameters= order consistent in func declaration and definition) Merging pwm/for-next (e2e08970100d pwm: atmel: Fix calculation of prescale = value) Merging dma-buf/for-next (101e31050bf1 dma-buf/fence: Fix one more kerneldo= c warning) Merging userns/for-next (a1998908ba46 nfs: fix kernel warning when removing= proc entry) CONFLICT (content): Merge conflict in fs/nfs/client.c Merging ktest/for-next (d832d743385d ktest: Don't bother with bisect good o= r bad on replay) Merging signal/for-next (20b4fb485227 Merge branch 'for-linus' of git://git= .kernel.org/pub/scm/linux/kernel/git/viro/vfs) Merging clk/clk-next (98d147f50eb0 clk: pxa clocks build system fix) Merging random/dev (7185ad2672a7 crypto: memzero_explicit - make sure to cl= ear out sensitive data) Merging lzo-update/lzo-update (42b775abafaf lib/lzo: huge LZO decompression= speedup on ARM by using unaligned access) Merging aio/master (668044a5d632 aio: Make it possible to remap aio ring) Merging llvmlinux/for-next (ec25a590c29c arm: LLVMLinux: Use global stack r= egister variable for percpu) Merging documentation/for-next (0415447aa3b4 Documentation: fix broken v4l-= utils URL) Merging kselftest/next (49296470830a selftests/timers: change test to use k= sft framework) Merging y2038/y2038 (3b34d3a706f5 PM / Hibernate: Migrate to ktime_t) $ git am -3 ../patches/0001-Revert-mfd-max77686-802-Remove-support-for-boar= d-fil.patch Applying: Revert "mfd: max77686/802: Remove support for board files" Merging akpm-current/current (0919fa6ba555 ipc-msg-increase-msgmni-remove-s= caling-checkpatch-fixes) CONFLICT (content): Merge conflict in mm/memcontrol.c CONFLICT (content): Merge conflict in kernel/kmod.c CONFLICT (content): Merge conflict in kernel/gcov/Kconfig $ git checkout -b akpm remotes/origin/akpm/master Applying: drivers/gpio/gpio-zevio.c: fix build Applying: arch/x86/vdso/vma.c: fix build with older gcc Applying: slab: fix cpuset check in fallback_alloc Applying: slub: fix cpuset check in get_any_partial Applying: mm/cma: make kmemleak ignore CMA regions Applying: mm: cma: split cma-reserved in dmesg log Applying: fs: proc: include cma info in proc/meminfo Applying: mm: replace remap_file_pages() syscall with emulation Applying: drivers/w1/w1_int.c: call put_device if device_register fails Applying: mm: add strictlimit knob Applying: lib/show_mem.c: adds cma reserved information Applying: lib-show_mem-this-patch-adds-cma-reserved-infromation-fix Merging akpm/master (ecf0dfea1ec2 lib-show_mem-this-patch-adds-cma-reserved= -infromation-fix) --Sig_/s1n2OiwK47Zkm_MX6XxMaAr Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJUWHPtAAoJEMDTa8Ir7ZwVD2YP/214jFAPKKs/iLI6gbxuq+9Z Y+MvpBjCv5R94db/5bgbin50krL8baxVKi8ghjAftNGWjizUjiN9YX90Lu6W1sPj DqrUO8JkGphFBBBPDj1CfWob0i32WipgJMxE551XEXDlYLJLdC4qvGJaDKajsWrc 0cLkO3QrZbqRNQpxKWHX0sIw93JSs+rfne/O5dSGa6aXZPA54D97AWa5c2NrHY1F d5HcqcRbIJupIhtQgcqOE/LKjEuBwHlO7Vz9N0HV88fmFE+ViKNYWGqJ+pb6fw06 PZ7iMU18/yrIqj0GhFpvgv1592L0ZWaWQNphzPRWMHz/Pp2GUTszfXRzzQx4NqmT CTe64SASdzuOnjdULCUv0sKm2oCWUWjz9svwhqYZ5Lec/MXtr7bRc4PGd4K9PtrJ agdqGvp9nBz2RTvXiVh7x6308P+CAne8r1onMVYJtZh5bg7rIGUbA3wOAHeUc7Si T9lxjPBaeOrFLlWVTawVDZL84a5in0yQUabTPWs5ArGmO0hJYKHvoyriga7TGpma riviNE/96mdAvXw9qedbMxWJXbEpTJEd/1A4qjhV01LXd3mEKSZ6eOB8WjukNyHg 9KRvJqA4sMknV6rKBv2PBJaaYtINUzl9EGqGmBbYuEXCAcY7xO4N3eDIubXBncKQ 5nFhUTZFzCmxY3HPLeOp =tVmx -----END PGP SIGNATURE----- --Sig_/s1n2OiwK47Zkm_MX6XxMaAr--