From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752353Ab3LRHkO (ORCPT ); Wed, 18 Dec 2013 02:40:14 -0500 Received: from ozlabs.org ([203.10.76.45]:34194 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751083Ab3LRHkK (ORCPT ); Wed, 18 Dec 2013 02:40:10 -0500 Date: Wed, 18 Dec 2013 18:40:01 +1100 From: Stephen Rothwell To: Cc: Subject: linux-next: Tree for Dec 18 Message-Id: <20131218184001.2ed2d4b940eeb0053cd477cd@canb.auug.org.au> X-Mailer: Sylpheed 3.4.0beta7 (GTK+ 2.24.22; i486-pc-linux-gnu) Mime-Version: 1.0 Content-Type: multipart/signed; protocol="application/pgp-signature"; micalg="PGP-SHA256"; boundary="Signature=_Wed__18_Dec_2013_18_40_01_+1100_JTSpCy0HYdKDh.GX" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Signature=_Wed__18_Dec_2013_18_40_01_+1100_JTSpCy0HYdKDh.GX Content-Type: text/plain; charset=US-ASCII Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi all, Changes since 20131217: Linus' tree lost its build failure. The powerpc tree still had its build failure for which I applied a supplied patch. The pm tree gained a build failure so I used the version from next-20131217. The net-next tree gained a conflict against Linus' tree and a build failure so I used the version from next-20131217. The drm-intel tree gained a conflict against Linus' tree. The mmc tree still had its build failure so I used the version from next-20131212. The block tree gained a conflict against the f2fs tree. The usb tree gained a conflict against the usb.current tree. The usb-gadget tree gained a conflict against the usb.current tree, but still had its build failure so I used the version from next-20131206. The akpm-current tree still had its build failures for which I applied patches. Non-merge commits (relative to Linus' tree): -l4371 4666 files changed, 211107 insertions(+), 116068 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" 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 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 (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. I am currently merging 209 trees (counting Linus' and 29 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. 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 $ git checkout master $ git reset --hard stable Merging origin/master (b0031f227e47 Merge tag 's2mps11-build' of git://git.= kernel.org/pub/scm/linux/kernel/git/broonie/regulator) Merging fixes/master (b0031f227e47 Merge tag 's2mps11-build' of git://git.k= ernel.org/pub/scm/linux/kernel/git/broonie/regulator) Merging kbuild-current/rc-fixes (19514fc665ff arm, kbuild: make "make insta= ll" not depend on vmlinux) Merging arc-current/for-curr (319e2e3f63c3 Linux 3.13-rc4) Merging arm-current/fixes (b713aa0b1501 ARM: fix asm/memory.h build error) Merging m68k-current/for-linus (77a42796786c m68k: Remove deprecated IRQF_D= ISABLED) Merging metag-fixes/fixes (3b2f64d00c46 Linux 3.11-rc2) Merging powerpc-merge/merge (803c2d2f84da powerpc/powernv: Fix OPAL LPC acc= ess in Little Endian) Merging sparc/master (1de425c7b271 sparc64: Fix build regression) Merging net/master (a7c12639bdf5 Merge branch 'qlcnic') Merging ipsec/master (239c78db9c41 net: clear local_df when passing skb bet= ween namespaces) Merging sound-current/for-linus (ed697e1aaf72 ALSA: Add SNDRV_PCM_STATE_PAU= SED case in wait_for_avail function) Merging pci-current/for-linus (f0b75693cbb2 MAINTAINERS: Add DesignWare, i.= MX6, Armada, R-Car PCI host maintainers) Merging wireless/master (73f0b56a1ff6 ath9k: Fix interrupt handling for the= AR9002 family) Merging driver-core.current/driver-core-linus (a8b14744429f sysfs: give dif= ferent locking key to regular and bin files) Merging tty.current/tty-linus (1075a6e2dc7e n_tty: Fix apparent order of ec= hoed output) Merging usb.current/usb-linus (fb5f1834c322 usb: ohci-at91: fix irq and iom= em resource retrieval) Merging staging.current/staging-linus (c6236c0ce39c staging: comedi: driver= s: fix return value of comedi_load_firmware()) Merging char-misc.current/char-misc-linus (319e2e3f63c3 Linux 3.13-rc4) Merging input-current/for-linus (2a4d81547b88 Input: define KEY_WWAN for Wi= reless WAN) Merging md-current/for-linus (d47648fcf061 raid5: avoid finding "discard" s= tripe) Merging crypto-current/master (389a5390583a crypto: scatterwalk - Use sg_ch= ain_ptr on chain entries) Merging ide/master (c2f7d1e103ef ide: pmac: remove unnecessary pci_set_drvd= ata()) Merging dwmw2/master (5950f0803ca9 pcmcia: remove RPX board stuff) Merging sh-current/sh-fixes-for-linus (44033109e99c SH: Convert out[bwl] ma= cros to inline functions) Merging devicetree-current/devicetree/merge (1931ee143b0a Revert "drivers: = of: add initialization code for dma reserved memory") Merging rr-fixes/fixes (7122c3e9154b scripts/link-vmlinux.sh: only filter k= ernel symbols for arm) Merging mfd-fixes/master (73beb63d290f mfd: rtsx_pcr: Disable interrupts be= fore cancelling delayed works) 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 drm-intel-fixes/for-linux-next-fixes (a885b3ccc74d drm/i915: Use th= e correct GMCH_CTRL register for Sandybridge+) Merging asm-generic/master (fb9de7ebc3a2 xtensa: Use generic asm/mmu.h for = nommu) Merging arc/for-next (e11cbe1fbd91 ARC: [SMP] optimize IPI send and receive) Merging arm/for-next (79f82a866ed4 Merge branches 'amba', 'fixes', 'kees', = 'misc' and 'unstable/sa11x0' into for-next) Merging arm-perf/for-next/perf (6ce4eac1f600 Linux 3.13-rc1) Merging arm-soc/for-next (2a53d68bcdf7 Merge branch 'fixes' into for-next) Merging bcm2835/for-next (5cc686267845 Merge branch 'for-3.14/defconfig' in= to for-next) Merging cortex-m/for-next (9c031a483646 ARM: v7-M: drop using mach/entry-ma= cro.S) Merging ep93xx/ep93xx-for-next (bfb0709fd17b Merge branch 'ep93xx-fixes' in= to ep93xx-for-next) Merging imx-mxs/for-next (6c11ad59bcf7 Merge branch 'imx/dt' into for-next) Merging ixp4xx/next (19f949f52599 Linux 3.8) Merging msm/for-next (81cf1e061d00 ARM: msm: Rename msm devicetrees to have= standard 'qcom' prefix) Merging mvebu/for-next (7df09017fc41 Merge branch 'mvebu/dt' into for-next) Merging renesas/next (833895910f5e Merge branch 'heads/sh-sci' into next) CONFLICT (content): Merge conflict in drivers/clk/Makefile Merging samsung/for-next (adbfd5c138d8 Merge branch 'v3.14-next/soc-exynos'= into for-next) Merging tegra/for-next (fc94f346529a Merge branch for-3.14/defconfig into f= or-next) Merging arm64/upstream (db4ed53cfe9f arm64: mm: Fix PMD_SECT_PROT_NONE defi= nition) Merging blackfin/for-linus (36855dcfc980 blackfin: fix build warning for un= used variable) Merging c6x/for-linux-next (546153d75a48 c6x: fix build failure caused by c= ache.h) Merging cris/for-next (be8cb7f42ab9 CRIS: drop unused Kconfig symbols) Merging hexagon/linux-next (de44443a45e3 HEXAGON: Remove non existent refer= ence to GENERIC_KERNEL_EXECVE & GENERIC_KERNEL_THREAD) Merging ia64/next (d52eefb47d4e ia64/xen: Remove Xen support for ia64) Merging m68k/for-next (27d632d27c4f m68k/atari: Hide RTC_PORT() macro from = rtc-cmos) Merging m68knommu/for-next (a695b9c8911e m68k : Kill CONFIG_MTD_PARTITIONS) Merging metag/for-next (1d61cf121d7d smp, metag: kill SMP single function c= all interrupt) Merging microblaze/next (a1dd107fcafa microblaze: Remove duplicate declarat= ions of _stext[] and _etext[]) Merging mips/mips-for-linux-next (6ca0bf323c14 Merge branch '3.13-fixes' in= to mips-for-linux-next) Merging openrisc/for-upstream (60a9dd5a10a1 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 (dc1ccc48159d Linux 3.13-rc2) Merging powerpc/next (75eb3d9b60c2 powerpc/powernv: Get FSP memory errors a= nd plumb into memory poison infrastructure.) Applying: powerpc: Fix "attempt to move .org backwards" error Merging mpc5xxx/next (17a76e3ca7c9 clk: mpc512x: remove migration support w= orkarounds) Merging galak/next (9e2ecdbba3b0 powerpc/fsl-booke: add the reg prop for pc= i bridge device node for T4/B4) Merging s390/features (f3d7b1131ba3 s390/smp: improve setup of possible cpu= mask) Merging sh/sh-latest (37284bd93103 Merge branches 'sh/hw-breakpoints' and '= sh/serial-of' into sh-latest) CONFLICT (content): Merge conflict in include/linux/serial_sci.h CONFLICT (content): Merge conflict in drivers/tty/serial/sh-sci.c CONFLICT (content): Merge conflict in arch/sh/kernel/cpu/sh2a/Makefile Merging sparc-next/master (049ffa8ab33a Merge branch 'drm-next' of git://pe= ople.freedesktop.org/~airlied/linux) Merging tile/master (5e01dc7b26d9 Linux 3.12) Merging unicore32/unicore32 (c284464658ac arch/unicore32: remove CONFIG_EXP= ERIMENTAL) Merging xtensa/for_next (d30841d27218 xtensa: ISS: avoid simple_strtoul usa= ge) Merging btrfs/next (91aef86f3b8a Btrfs: rename btrfs_start_all_delalloc_ino= des) Merging ceph/master (8eb4efb091c8 ceph: implement readv/preadv for sync ope= ration) Merging cifs/for-next (cfae639783f0 cifs: set FILE_CREATED) 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 (9e78d14a9f64 Use %pd in eCryptFS) Merging ext3/for_next (df4e7ac0bb70 ext2: Fix oops in ext2_get_block() call= ed from ext2_quota_write()) Merging ext4/dev (c25625a1b6a5 ext4: enable punch hole for bigalloc) Merging f2fs/dev (5a6925534112 f2fs: write dirty meta pages collectively) Merging fscache/fscache (7c604e5d6e56 FS-Cache: Fix handling of an attempt = to store a page that is now beyond EOF) Merging fuse/for-next (ce128de6260f fuse: writepages: protect secondary req= uests from fuse file release) Merging gfs2/master (8953e11bb191 GFS2: Fix slab memory leak in gfs2_bufdat= a) Merging jfs/jfs-next (8660998608cf jfs: fix error path in ialloc) Merging logfs/master (339466142b3f Fix the call to BUG() caused by no free = segment found) Merging nfs/linux-next (23e66ba97127 rpc_pipe: fix cleanup of dummy gssd di= rectory when notification fails) Merging nfsd/nfsd-next (a0ef5e19684f nfsd: don't try to reuse an expired DR= C entry off the list) 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 (f94741fd2832 net/9p: remove virtio default hack and = set appropriate bits instead) Merging ubifs/linux-next (58a4e23703b2 UBIFS: correct data corruption range) Merging xfs/for-next (46f23adf7854 Merge branch 'xfs-factor-icluster-macros= ' into for-next) Merging vfs/for-next (27ac0ffeac80 locks: break delegations on any attribut= e modification) Merging pci/next (1d72e71d4542 Merge branch 'pci/yijing-dev_is_pci' into ne= xt) Merging hid/for-next (460d9a348628 Merge branch 'for-3.14/upstream' into fo= r-next) Merging i2c/i2c/for-next (e5bf216a945e i2c: imx: Check the return value fro= m clk_prepare_enable()) Merging jdelvare-hwmon/master (68d5516b35c7 hwmon: (it87) Print proper name= s for the IT8771E and IT8772E) Merging hwmon-staging/hwmon-next (e0425401acaa hwmon: (coretemp) Refine TjM= ax detection) Merging v4l-dvb/master (c4f181f1efc5 Merge branch 'v4l_for_linus' into temp) Merging kbuild/for-next (e6483a58eca6 Merge branch 'kbuild/misc' into kbuil= d/for-next) Merging kconfig/for-next (4eae518d4b01 localmodconfig: Fix localyesconfig t= o set to 'y' not 'm') Merging libata/for-next (d2357f240135 Merge branch 'for-3.13-fixes' into fo= r-next) Merging pstore/master (bd08ec33b5c2 pstore/ram: Restore ecc information blo= ck) Merging pm/linux-next (9a8019dcd077 Merge branch 'acpi-hotplug-next' into l= inux-next) $ git reset --hard HEAD^ Merging next-20131217 version of pm Merging idle/next (1ae2a8af4228 tools/power turbostat: run on HSX) Merging apm/for-next (fb9d78aca709 Merge branch 'for-linus' of git://git.ke= rnel.org/pub/scm/linux/kernel/git/jikos/apm) Merging cpupowerutils/master (f16603386b38 cpupower tools: add install targ= et to the debug tools' makefiles) Merging thermal/next (86e0a0bdf81c Merge branches 'intel_powerclamp', 'tmon= ' and 'misc' of .git into next) Merging ieee1394/for-next (ce027ed98fd1 firewire: sbp2: bring back WRITE SA= ME support) Merging ubi/linux-next (ae0d14695566 UBI: Add some asserts to ubi_attach_fa= stmap()) Merging dlm/next (ece35848c184 dlm: set zero linger time on sctp socket) Merging swiotlb/linux-next (af51a9f1848f swiotlb: Do not export swiotlb_bou= nce since there are no external consumers) Merging slave-dma/next (ec878fec2854 Merge branch 'topic/of' into next) CONFLICT (content): Merge conflict in arch/arm/boot/dts/imx53.dtsi CONFLICT (content): Merge conflict in arch/arm/boot/dts/imx51.dtsi Merging dmaengine/next (8194ee27764b dmaengine: fix sleep in atomic) Merging net-next/master (02d5cb5bb20b qeth: Accurate ethtool output) CONFLICT (content): Merge conflict in drivers/net/macvtap.c CONFLICT (content): Merge conflict in drivers/net/ethernet/intel/i40e/i40e_= main.c $ git reset --hard HEAD^ Merging next-20131217 version of net-next CONFLICT (content): Merge conflict in drivers/net/macvtap.c [master 27a1e149b321] next-20131217/net-next Merging ipsec-next/master (b3c6efbc36e2 xfrm: Add file to document IPsec co= rner case) Merging wireless-next/master (55957fb7a0b6 ath9k: initialize retry chain fl= ags in tx99 code) Merging bluetooth/master (c567c77101f0 6lowpan: cleanup udp compress functi= on) Merging infiniband/for-next (f6533182e247 Merge branches 'cxgb4', 'flowstee= r', 'misc' and 'ocrdma' into for-next) Merging mtd/master (15b540c71cac mtd: nand: pxa3xx: Use info->use_dma to re= lease DMA resources) Merging l2-mtd/master (221ad9921b22 mtd: au1550nd: add missing platform_set= _drvdata()) Merging crypto/master (e37b94ebffdd crypto: memneq - fix for archs without = efficient unaligned access) Merging drm/drm-next (a3483353ca4e drm: check for !kdev in drm_unplug_minor= ()) Merging drm-intel/for-linux-next (820c19803538 drm/i915: s/haswell_update_w= m/ilk_update_wm/) CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_pm.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_display.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_ddi.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_reg.h Merging drm-tegra/drm/for-next (7392d097b763 drm/tegra: Add PRIME support) Merging sound/for-next (f0e9c08065dc ALSA: compress: change the way sample = rates are sent to kernel) Merging sound-asoc/for-next (78e768b63536 Merge remote-tracking branches 'a= soc/topic/ad193x', 'asoc/topic/adav80x', 'asoc/topic/adsp', 'asoc/topic/ak4= 641', 'asoc/topic/ak4642', 'asoc/topic/arizona', 'asoc/topic/axi', 'asoc/to= pic/bcm2835', 'asoc/topic/cs4271', 'asoc/topic/cs42l52', 'asoc/topic/da7210= ', 'asoc/topic/davinci', 'asoc/topic/ep93xx', 'asoc/topic/fsl', 'asoc/topic= /hdmi', 'asoc/topic/jack', 'asoc/topic/jz4740', 'asoc/topic/max98090', 'aso= c/topic/mxs', 'asoc/topic/omap', 'asoc/topic/pxa', 'asoc/topic/rcar', 'asoc= /topic/samsung', 'asoc/topic/sgtl5000', 'asoc/topic/spear', 'asoc/topic/ssm= 2602', 'asoc/topic/tegra', 'asoc/topic/tlv320aic3x', 'asoc/topic/uda1380', = 'asoc/topic/wm8510', 'asoc/topic/wm8523', 'asoc/topic/wm8580', 'asoc/topic/= wm8711', 'asoc/topic/wm8728', 'asoc/topic/wm8731', 'asoc/topic/wm8741', 'as= oc/topic/wm8750', 'asoc/topic/wm8753', 'asoc/topic/wm8776', 'asoc/topic/wm8= 804', 'asoc/topic/wm8900', 'asoc/topic/wm8901', 'asoc/topic/wm8940', 'asoc/= topic/wm8962', 'asoc/topic/wm8974', 'asoc/topic/wm8985', 'asoc/topic/wm8988= ', 'asoc/topic/wm8990', 'asoc/topic/wm8991', 'asoc/topic/wm8994', 'asoc/top= ic/wm8995', 'asoc/topic/wm9081' and 'asoc/topic/x86' into asoc-next) CONFLICT (content): Merge conflict in sound/soc/fsl/fsl_ssi.c Merging modules/modules-next (74e22fac8858 module.h: Remove unnecessary sem= icolon) Merging virtio/virtio-next (7d2dddda5c92 virtio: pci: remove unnecessary pc= i_set_drvdata()) Merging input/next (768d9aa55740 Input: don't call input_dev_release_keys()= in resume) Merging input-mt/for-next (5e01dc7b26d9 Linux 3.12) Merging cgroup/for-next (824960aa4e6c Merge branch 'for-3.13-fixes' into fo= r-next) Merging block/for-next (391b7a7bfb52 Merge branch 'for-3.14/drivers' into f= or-next) CONFLICT (content): Merge conflict in include/trace/events/f2fs.h CONFLICT (content): Merge conflict in fs/logfs/dev_bdev.c CONFLICT (content): Merge conflict in fs/f2fs/segment.c CONFLICT (content): Merge conflict in fs/f2fs/data.c CONFLICT (content): Merge conflict in fs/btrfs/scrub.c CONFLICT (content): Merge conflict in fs/btrfs/extent_io.c CONFLICT (content): Merge conflict in fs/btrfs/check-integrity.c CONFLICT (content): Merge conflict in block/blk-flush.c Merging device-mapper/for-next (44dcd0425890 dm cache policy mq: introduce = three promotion threshold tunables) CONFLICT (content): Merge conflict in drivers/md/dm-thin.c 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 (82793a517714 mmc: sh_mmcif: Fix compilation warning o= n 64-bit platforms) $ git reset --hard HEAD^ Merging next-20131212 version of mmc Merging kgdb/kgdb-next (6bedf31c25dd kdb: Remove unhandled ssb command) CONFLICT (content): Merge conflict in kernel/debug/debug_core.h Merging slab/for-next (a8c0b0837359 Merge branch 'slab/next' into for-next) Merging uclinux/for-next (6dbe51c251a3 Linux 3.9-rc1) Merging md/for-next (6d183de40771 md/raid5: fix newly-broken locking in get= _active_stripe.) Merging mfd/master (90b128ed1557 Merge tag 'mfd-lee-3.13-3' of git://git.li= naro.org/people/ljones/mfd) Merging mfd-lj/for-mfd-next (f54fa6b2c24d mfd: mc13xxx: Simplify probe() & = remove()) Merging battery/master (d36240d26025 power_supply: Add power_supply notifie= r) 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 (46ac29568e63 video: vt8500: fix error handling = in probe()) Merging regulator/for-next (3d12e36e25c7 Merge remote-tracking branches 're= gulator/topic/ab8500', 'regulator/topic/arizona', 'regulator/topic/db8500',= 'regulator/topic/gpio', 'regulator/topic/lp3971', 'regulator/topic/lp3972'= , 'regulator/topic/pcf50633', 'regulator/topic/pfuze100', 'regulator/topic/= s5m8767', 'regulator/topic/stw481x-vmmc' and 'regulator/topic/tps51632' int= o regulator-next) Merging security/next (217091dd7a7a ima: define '_ima' as a builtin 'truste= d' keyring) Merging selinux/master (465954cd649a selinux: selinux_setprocattr()->ptrace= _parent() needs rcu_read_lock()) CONFLICT (content): Merge conflict in security/selinux/hooks.c Merging lblnet/master (07bc9dc1b01b Merge branch 'merge' of git://git.kerne= l.org/pub/scm/linux/kernel/git/benh/powerpc) Merging watchdog/master (28748defa512 watchdog: remove DEFINE_PCI_DEVICE_TA= BLE macro) Merging dwmw2-iommu/master (e5d0c874391a Merge tag 'iommu-updates-v3.12' of= git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu) Merging iommu/next (e6ca48d995e4 Merge branches 'iommu/fixes', 'tracing', '= core', 'arm/tegra' and 'x86/vt-d' into next) Merging vfio/next (15c03dd4859a Linux 3.12-rc3) Merging osd/linux-next (861d66601acd exofs: don't leak io_state and pages o= n read error) Merging jc_docs/docs-next (5c050fb96380 docs: update the development proces= s document) Merging trivial/for-next (b481c2cb3534 staging: usbip: Remove double initia= lization of msg_namelen variable) Merging audit/master (fc582aef7dcc Merge tag 'v3.12') Merging fsnotify/for-next (1ca39ab9d21a inotify: automatically restart sysc= alls) Merging devicetree/devicetree/next (355e62f5ad12 of/irq: Fix potential buff= er overflow) Merging dt-rh/for-next (1b50b0c3330e Merge branch 'for-3.14' into for-next) Merging spi/for-next (e16825ac62a5 Merge remote-tracking branches 'spi/topi= c/atmel', 'spi/topic/bcm63xx-hsspi', 'spi/topic/coldfire', 'spi/topic/davin= ci', 'spi/topic/falcon', 'spi/topic/fsl-espi', 'spi/topic/gpio', 'spi/topic= /msiof', 'spi/topic/omap', 'spi/topic/orion', 'spi/topic/pci', 'spi/topic/r= car', 'spi/topic/s3c64xx', 'spi/topic/sc18is602', 'spi/topic/tegra114', 'sp= i/topic/tegra20-sflash', 'spi/topic/tegra20-slink' and 'spi/topic/xcomm' in= to spi-next) Merging tip/auto-latest (c4372b1b29f2 Merge branch 'x86/urgent') CONFLICT (content): Merge conflict in arch/x86/platform/efi/efi.c Merging edac/linux_next (3e45588825c1 cell_edac: fix missing of_node_put) Merging edac-amd/for-next (0facccc00c7c Merge branch 'ras-for-3.14' into fo= r-next) Merging ftrace/for-next (3ccb01239201 tracing: Only run synchronize_sched()= at instance deletion time) Merging rcu/rcu/next (0d3c55bc9fd5 Merge branches 'doc.2013.12.03a', 'fixes= .2013.12.12a', 'rcutorture.2013.12.03a' and 'sparse.2013.12.12a' into HEAD) Merging uprobes/for-next (0326f5a94dde uprobes/core: Handle breakpoint and = singlestep exceptions) Merging kvm/linux-next (6bb05ef78553 Merge tag 'kvm-s390-20131211' of git:/= /git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into kvm-next) Merging kvm-arm/kvm-arm-next (4fda342cc7f5 arm/arm64: kvm: Use virt_to_idma= p instead of virt_to_phys for idmap mappings) Merging kvm-ppc/kvm-ppc-next (27025a602cb9 powerpc: kvm: optimize "sc 1" as= fast return) 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 (85be9741104f Merge branch 'stable/for-linus-3.1= 3' into linux-next) Merging percpu/for-next (b1a0fbfdde65 percpu: fix spurious sparse warnings = from DEFINE_PER_CPU()) Merging workqueues/for-next (4e8b22bd1a37 workqueue: fix pool ID allocation= leakage and remove BUILD_BUG_ON() in init_workqueues) Merging drivers-x86/linux-next (a80e1053aaa3 x86, wmi fix modalias_show ret= urn values) Merging chrome-platform/for-next (2b8454a75b90 platform/chrome: unregister = platform driver/device when module exit) Merging sysctl/master (4e474a00d7ff sysctl: protect poll() in entries that = may go away) Merging regmap/for-next (057c2d5071eb Merge remote-tracking branch 'regmap/= topic/ack' into regmap-next) Merging hsi/for-next (43139a61fc68 HSI: hsi_char: Update ioctl-number.txt) Merging leds/for-next (da2cbb0f96cb leds: pwm: Remove a warning on non-DT p= latforms) Merging driver-core/driver-core-next (80b9bbefc345 kernfs: add kernfs_dir_o= ps) Merging tty/tty-next (8be3da65d922 tty/serial: at91: document clock propert= ies) Merging usb/usb-next (d59abb9325ae Merge branch 3.13-rc4 into usb-next) CONFLICT (content): Merge conflict in drivers/usb/host/ohci-at91.c Merging usb-gadget/next (4a5ee77caad2 usb: gadget: f_sourcesink: Fix sparse= warning) CONFLICT (content): Merge conflict in drivers/usb/phy/Kconfig Applying: merge fix for drivers/usb/phy/phy-keystone.c $ git reset --hard HEAD^ Merging next-20131206 version of usb-gadget Merging staging/staging-next (e56b14010562 staging: comedi: fix result of m= emdup_user for user chanlist) Merging char-misc/char-misc-next (138a6d7ea2de Merge 3.13-rc4 into char-mis= c-next) Merging scsi/for-next (8a09676c242d [SCSI] bfa: Driver version upgrade to 3= .2.23.0) Merging target-updates/for-next (31cf8df68491 target_core_alua: Referrals c= onfigfs integration) Merging target-merge/for-next-merge (374b105797c3 Linux 3.13-rc3) 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 (37ef1d924375 pinctrl: at91: replace clk_prepare += clk_enable by clk_prepare_enable) CONFLICT (content): Merge conflict in drivers/pinctrl/sh-pfc/pfc-sh7372.c CONFLICT (content): Merge conflict in drivers/pinctrl/sh-pfc/pfc-r8a7740.c Merging vhost/linux-next (d3d665a654a3 vhost-scsi: whitespace tweak) Merging remoteproc/for-next (b9777859ec01 remoteproc: fix kconfig dependenc= ies for VIRTIO) Merging rpmsg/for-next (397944df3290 rpmsg: fix kconfig dependencies for VI= RTIO) Merging gpio/for-next (e0f0edc67d07 Merge branch 'devel' into for-next) Merging dma-mapping/dma-mapping-next (5e01dc7b26d9 Linux 3.12) Merging pwm/for-next (3f958fe7d3e3 of: Add Atmel PWM controller device tree= binding) Merging dma-buf/for-next (17b2112f332d Merge branch 'merge' of git://git.ke= rnel.org/pub/scm/linux/kernel/git/benh/powerpc) Merging userns/for-next (41301ae78a99 vfs: Fix a regression in mounting pro= c) Merging ktest/for-next (298a0d1d5750 ktest: Add documentation of CLOSE_CONS= OLE_SIGNAL) 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 (1459c837036a clk: si570: Add a driver for SI570 oscil= lators) Merging random/dev (8ea43ef26598 random: clarify bits/bytes in wakeup thres= holds) Merging lzo-update/lzo-update (42b775abafaf lib/lzo: huge LZO decompression= speedup on ARM by using unaligned access) Merging arm64-hugepages/for-next/hugepages (af07484863e0 ARM64: mm: THP sup= port.) Merging aio/master (374b105797c3 Linux 3.13-rc3) Merging akpm-current/current (3d655d441006 ipc,sem: correct header comment = for perform_atomic_semop) Applying: memblock-make-memblock_set_node-support-different-memblock_type-f= ix Applying: rtc: hym8563: include clkout code only if COMMON_CLK active $ git checkout -b akpm remotes/origin/akpm/master Applying: kernel/kexec.c: use vscnprintf() instead of vsnprintf() in vmcore= info_append_str() Applying: softirq: use ffs() in __do_softirq() Applying: softirq: convert printks to pr_ Applying: softirq: use const char * const for softirq_to_name, whitespace n= eatening Applying: mm/migrate.c: fix set cpupid on page migration twice against thp Applying: mm/migrate.c: fix setting of cpupid on page migration twice again= st normal page Applying: zsmalloc: move it under mm Applying: zram: promote zram from staging Applying: mm: add strictlimit knob Merging akpm/master (197062993f5f mm: add strictlimit knob) --Signature=_Wed__18_Dec_2013_18_40_01_+1100_JTSpCy0HYdKDh.GX Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) iQIcBAEBCAAGBQJSsVFWAAoJEMDTa8Ir7ZwV+rkP/1fIYMXaAYAzqSe412Z6Ww5M 06OQi3veZ1tMn0hC906RBGoo28Px5FWXLYY7YtcobYgzuMIgEUh7fr1YbHH4e6tO GhfNhla0025eCwvXgRtXdqVvBGfxlZqlXC0rC/qSTTkbz8Jcf7/CIwMSg5xMdO5A dMLq35kI5/DTT/CQ4jEmj55JEfLX66MWVrKudSZCndOh2Fj/86uikGT3H8UP/F0G SRJF7Ejr47y/UWv7r1x9/kAtCeA8XIjAhPofNBsDZwzJEOhEnXL7H1JuqM5Z74M2 Y8NC7H+tilvtOvFaSCrLe8gsWSgLpRSHI1aViOqhA5qKGQ+RtALtiEa7twJ3uT11 SwV3n7rB7Hd6xJGEbDivw/71v+mnf90koQuoS7JGho6eHlykIIvuYo+IOMTFm+I2 Q36nRhFXJiDq5E0vHz1fy9RCWy4pzIGa+ksH82ZDDsSZJaj1U8YwHBDwDJMqmXTk WVBIAgLKG4vQrUnmWEZy1aItuAvxHS6YVGHmhCduKhzGuoS6MM3UImaKGL3CXOhU dckYLwBx2yPBFJ8Nt7/raPKOX1tg+meUHh6MikczOqzchOAqHuB3quKbK1Daoc9+ de75u6aTYveMbXnsoiizcZmYqeJgFBREf3RDgGaBuLgCgR52kZVa5Fe9uvK5oiNa MJQ/eXawR+ywXBGI2BKI =WHtX -----END PGP SIGNATURE----- --Signature=_Wed__18_Dec_2013_18_40_01_+1100_JTSpCy0HYdKDh.GX-- From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Rothwell Subject: linux-next: Tree for Dec 18 Date: Wed, 18 Dec 2013 18:40:01 +1100 Message-ID: <20131218184001.2ed2d4b940eeb0053cd477cd@canb.auug.org.au> Mime-Version: 1.0 Content-Type: multipart/signed; protocol="application/pgp-signature"; micalg="PGP-SHA256"; boundary="Signature=_Wed__18_Dec_2013_18_40_01_+1100_JTSpCy0HYdKDh.GX" Return-path: Received: from ozlabs.org ([203.10.76.45]:34194 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751083Ab3LRHkK (ORCPT ); Wed, 18 Dec 2013 02:40:10 -0500 Sender: linux-next-owner@vger.kernel.org List-ID: To: linux-next@vger.kernel.org Cc: linux-kernel@vger.kernel.org --Signature=_Wed__18_Dec_2013_18_40_01_+1100_JTSpCy0HYdKDh.GX Content-Type: text/plain; charset=US-ASCII Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi all, Changes since 20131217: Linus' tree lost its build failure. The powerpc tree still had its build failure for which I applied a supplied patch. The pm tree gained a build failure so I used the version from next-20131217. The net-next tree gained a conflict against Linus' tree and a build failure so I used the version from next-20131217. The drm-intel tree gained a conflict against Linus' tree. The mmc tree still had its build failure so I used the version from next-20131212. The block tree gained a conflict against the f2fs tree. The usb tree gained a conflict against the usb.current tree. The usb-gadget tree gained a conflict against the usb.current tree, but still had its build failure so I used the version from next-20131206. The akpm-current tree still had its build failures for which I applied patches. Non-merge commits (relative to Linus' tree): -l4371 4666 files changed, 211107 insertions(+), 116068 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" 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 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 (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. I am currently merging 209 trees (counting Linus' and 29 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. 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 $ git checkout master $ git reset --hard stable Merging origin/master (b0031f227e47 Merge tag 's2mps11-build' of git://git.= kernel.org/pub/scm/linux/kernel/git/broonie/regulator) Merging fixes/master (b0031f227e47 Merge tag 's2mps11-build' of git://git.k= ernel.org/pub/scm/linux/kernel/git/broonie/regulator) Merging kbuild-current/rc-fixes (19514fc665ff arm, kbuild: make "make insta= ll" not depend on vmlinux) Merging arc-current/for-curr (319e2e3f63c3 Linux 3.13-rc4) Merging arm-current/fixes (b713aa0b1501 ARM: fix asm/memory.h build error) Merging m68k-current/for-linus (77a42796786c m68k: Remove deprecated IRQF_D= ISABLED) Merging metag-fixes/fixes (3b2f64d00c46 Linux 3.11-rc2) Merging powerpc-merge/merge (803c2d2f84da powerpc/powernv: Fix OPAL LPC acc= ess in Little Endian) Merging sparc/master (1de425c7b271 sparc64: Fix build regression) Merging net/master (a7c12639bdf5 Merge branch 'qlcnic') Merging ipsec/master (239c78db9c41 net: clear local_df when passing skb bet= ween namespaces) Merging sound-current/for-linus (ed697e1aaf72 ALSA: Add SNDRV_PCM_STATE_PAU= SED case in wait_for_avail function) Merging pci-current/for-linus (f0b75693cbb2 MAINTAINERS: Add DesignWare, i.= MX6, Armada, R-Car PCI host maintainers) Merging wireless/master (73f0b56a1ff6 ath9k: Fix interrupt handling for the= AR9002 family) Merging driver-core.current/driver-core-linus (a8b14744429f sysfs: give dif= ferent locking key to regular and bin files) Merging tty.current/tty-linus (1075a6e2dc7e n_tty: Fix apparent order of ec= hoed output) Merging usb.current/usb-linus (fb5f1834c322 usb: ohci-at91: fix irq and iom= em resource retrieval) Merging staging.current/staging-linus (c6236c0ce39c staging: comedi: driver= s: fix return value of comedi_load_firmware()) Merging char-misc.current/char-misc-linus (319e2e3f63c3 Linux 3.13-rc4) Merging input-current/for-linus (2a4d81547b88 Input: define KEY_WWAN for Wi= reless WAN) Merging md-current/for-linus (d47648fcf061 raid5: avoid finding "discard" s= tripe) Merging crypto-current/master (389a5390583a crypto: scatterwalk - Use sg_ch= ain_ptr on chain entries) Merging ide/master (c2f7d1e103ef ide: pmac: remove unnecessary pci_set_drvd= ata()) Merging dwmw2/master (5950f0803ca9 pcmcia: remove RPX board stuff) Merging sh-current/sh-fixes-for-linus (44033109e99c SH: Convert out[bwl] ma= cros to inline functions) Merging devicetree-current/devicetree/merge (1931ee143b0a Revert "drivers: = of: add initialization code for dma reserved memory") Merging rr-fixes/fixes (7122c3e9154b scripts/link-vmlinux.sh: only filter k= ernel symbols for arm) Merging mfd-fixes/master (73beb63d290f mfd: rtsx_pcr: Disable interrupts be= fore cancelling delayed works) 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 drm-intel-fixes/for-linux-next-fixes (a885b3ccc74d drm/i915: Use th= e correct GMCH_CTRL register for Sandybridge+) Merging asm-generic/master (fb9de7ebc3a2 xtensa: Use generic asm/mmu.h for = nommu) Merging arc/for-next (e11cbe1fbd91 ARC: [SMP] optimize IPI send and receive) Merging arm/for-next (79f82a866ed4 Merge branches 'amba', 'fixes', 'kees', = 'misc' and 'unstable/sa11x0' into for-next) Merging arm-perf/for-next/perf (6ce4eac1f600 Linux 3.13-rc1) Merging arm-soc/for-next (2a53d68bcdf7 Merge branch 'fixes' into for-next) Merging bcm2835/for-next (5cc686267845 Merge branch 'for-3.14/defconfig' in= to for-next) Merging cortex-m/for-next (9c031a483646 ARM: v7-M: drop using mach/entry-ma= cro.S) Merging ep93xx/ep93xx-for-next (bfb0709fd17b Merge branch 'ep93xx-fixes' in= to ep93xx-for-next) Merging imx-mxs/for-next (6c11ad59bcf7 Merge branch 'imx/dt' into for-next) Merging ixp4xx/next (19f949f52599 Linux 3.8) Merging msm/for-next (81cf1e061d00 ARM: msm: Rename msm devicetrees to have= standard 'qcom' prefix) Merging mvebu/for-next (7df09017fc41 Merge branch 'mvebu/dt' into for-next) Merging renesas/next (833895910f5e Merge branch 'heads/sh-sci' into next) CONFLICT (content): Merge conflict in drivers/clk/Makefile Merging samsung/for-next (adbfd5c138d8 Merge branch 'v3.14-next/soc-exynos'= into for-next) Merging tegra/for-next (fc94f346529a Merge branch for-3.14/defconfig into f= or-next) Merging arm64/upstream (db4ed53cfe9f arm64: mm: Fix PMD_SECT_PROT_NONE defi= nition) Merging blackfin/for-linus (36855dcfc980 blackfin: fix build warning for un= used variable) Merging c6x/for-linux-next (546153d75a48 c6x: fix build failure caused by c= ache.h) Merging cris/for-next (be8cb7f42ab9 CRIS: drop unused Kconfig symbols) Merging hexagon/linux-next (de44443a45e3 HEXAGON: Remove non existent refer= ence to GENERIC_KERNEL_EXECVE & GENERIC_KERNEL_THREAD) Merging ia64/next (d52eefb47d4e ia64/xen: Remove Xen support for ia64) Merging m68k/for-next (27d632d27c4f m68k/atari: Hide RTC_PORT() macro from = rtc-cmos) Merging m68knommu/for-next (a695b9c8911e m68k : Kill CONFIG_MTD_PARTITIONS) Merging metag/for-next (1d61cf121d7d smp, metag: kill SMP single function c= all interrupt) Merging microblaze/next (a1dd107fcafa microblaze: Remove duplicate declarat= ions of _stext[] and _etext[]) Merging mips/mips-for-linux-next (6ca0bf323c14 Merge branch '3.13-fixes' in= to mips-for-linux-next) Merging openrisc/for-upstream (60a9dd5a10a1 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 (dc1ccc48159d Linux 3.13-rc2) Merging powerpc/next (75eb3d9b60c2 powerpc/powernv: Get FSP memory errors a= nd plumb into memory poison infrastructure.) Applying: powerpc: Fix "attempt to move .org backwards" error Merging mpc5xxx/next (17a76e3ca7c9 clk: mpc512x: remove migration support w= orkarounds) Merging galak/next (9e2ecdbba3b0 powerpc/fsl-booke: add the reg prop for pc= i bridge device node for T4/B4) Merging s390/features (f3d7b1131ba3 s390/smp: improve setup of possible cpu= mask) Merging sh/sh-latest (37284bd93103 Merge branches 'sh/hw-breakpoints' and '= sh/serial-of' into sh-latest) CONFLICT (content): Merge conflict in include/linux/serial_sci.h CONFLICT (content): Merge conflict in drivers/tty/serial/sh-sci.c CONFLICT (content): Merge conflict in arch/sh/kernel/cpu/sh2a/Makefile Merging sparc-next/master (049ffa8ab33a Merge branch 'drm-next' of git://pe= ople.freedesktop.org/~airlied/linux) Merging tile/master (5e01dc7b26d9 Linux 3.12) Merging unicore32/unicore32 (c284464658ac arch/unicore32: remove CONFIG_EXP= ERIMENTAL) Merging xtensa/for_next (d30841d27218 xtensa: ISS: avoid simple_strtoul usa= ge) Merging btrfs/next (91aef86f3b8a Btrfs: rename btrfs_start_all_delalloc_ino= des) Merging ceph/master (8eb4efb091c8 ceph: implement readv/preadv for sync ope= ration) Merging cifs/for-next (cfae639783f0 cifs: set FILE_CREATED) 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 (9e78d14a9f64 Use %pd in eCryptFS) Merging ext3/for_next (df4e7ac0bb70 ext2: Fix oops in ext2_get_block() call= ed from ext2_quota_write()) Merging ext4/dev (c25625a1b6a5 ext4: enable punch hole for bigalloc) Merging f2fs/dev (5a6925534112 f2fs: write dirty meta pages collectively) Merging fscache/fscache (7c604e5d6e56 FS-Cache: Fix handling of an attempt = to store a page that is now beyond EOF) Merging fuse/for-next (ce128de6260f fuse: writepages: protect secondary req= uests from fuse file release) Merging gfs2/master (8953e11bb191 GFS2: Fix slab memory leak in gfs2_bufdat= a) Merging jfs/jfs-next (8660998608cf jfs: fix error path in ialloc) Merging logfs/master (339466142b3f Fix the call to BUG() caused by no free = segment found) Merging nfs/linux-next (23e66ba97127 rpc_pipe: fix cleanup of dummy gssd di= rectory when notification fails) Merging nfsd/nfsd-next (a0ef5e19684f nfsd: don't try to reuse an expired DR= C entry off the list) 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 (f94741fd2832 net/9p: remove virtio default hack and = set appropriate bits instead) Merging ubifs/linux-next (58a4e23703b2 UBIFS: correct data corruption range) Merging xfs/for-next (46f23adf7854 Merge branch 'xfs-factor-icluster-macros= ' into for-next) Merging vfs/for-next (27ac0ffeac80 locks: break delegations on any attribut= e modification) Merging pci/next (1d72e71d4542 Merge branch 'pci/yijing-dev_is_pci' into ne= xt) Merging hid/for-next (460d9a348628 Merge branch 'for-3.14/upstream' into fo= r-next) Merging i2c/i2c/for-next (e5bf216a945e i2c: imx: Check the return value fro= m clk_prepare_enable()) Merging jdelvare-hwmon/master (68d5516b35c7 hwmon: (it87) Print proper name= s for the IT8771E and IT8772E) Merging hwmon-staging/hwmon-next (e0425401acaa hwmon: (coretemp) Refine TjM= ax detection) Merging v4l-dvb/master (c4f181f1efc5 Merge branch 'v4l_for_linus' into temp) Merging kbuild/for-next (e6483a58eca6 Merge branch 'kbuild/misc' into kbuil= d/for-next) Merging kconfig/for-next (4eae518d4b01 localmodconfig: Fix localyesconfig t= o set to 'y' not 'm') Merging libata/for-next (d2357f240135 Merge branch 'for-3.13-fixes' into fo= r-next) Merging pstore/master (bd08ec33b5c2 pstore/ram: Restore ecc information blo= ck) Merging pm/linux-next (9a8019dcd077 Merge branch 'acpi-hotplug-next' into l= inux-next) $ git reset --hard HEAD^ Merging next-20131217 version of pm Merging idle/next (1ae2a8af4228 tools/power turbostat: run on HSX) Merging apm/for-next (fb9d78aca709 Merge branch 'for-linus' of git://git.ke= rnel.org/pub/scm/linux/kernel/git/jikos/apm) Merging cpupowerutils/master (f16603386b38 cpupower tools: add install targ= et to the debug tools' makefiles) Merging thermal/next (86e0a0bdf81c Merge branches 'intel_powerclamp', 'tmon= ' and 'misc' of .git into next) Merging ieee1394/for-next (ce027ed98fd1 firewire: sbp2: bring back WRITE SA= ME support) Merging ubi/linux-next (ae0d14695566 UBI: Add some asserts to ubi_attach_fa= stmap()) Merging dlm/next (ece35848c184 dlm: set zero linger time on sctp socket) Merging swiotlb/linux-next (af51a9f1848f swiotlb: Do not export swiotlb_bou= nce since there are no external consumers) Merging slave-dma/next (ec878fec2854 Merge branch 'topic/of' into next) CONFLICT (content): Merge conflict in arch/arm/boot/dts/imx53.dtsi CONFLICT (content): Merge conflict in arch/arm/boot/dts/imx51.dtsi Merging dmaengine/next (8194ee27764b dmaengine: fix sleep in atomic) Merging net-next/master (02d5cb5bb20b qeth: Accurate ethtool output) CONFLICT (content): Merge conflict in drivers/net/macvtap.c CONFLICT (content): Merge conflict in drivers/net/ethernet/intel/i40e/i40e_= main.c $ git reset --hard HEAD^ Merging next-20131217 version of net-next CONFLICT (content): Merge conflict in drivers/net/macvtap.c [master 27a1e149b321] next-20131217/net-next Merging ipsec-next/master (b3c6efbc36e2 xfrm: Add file to document IPsec co= rner case) Merging wireless-next/master (55957fb7a0b6 ath9k: initialize retry chain fl= ags in tx99 code) Merging bluetooth/master (c567c77101f0 6lowpan: cleanup udp compress functi= on) Merging infiniband/for-next (f6533182e247 Merge branches 'cxgb4', 'flowstee= r', 'misc' and 'ocrdma' into for-next) Merging mtd/master (15b540c71cac mtd: nand: pxa3xx: Use info->use_dma to re= lease DMA resources) Merging l2-mtd/master (221ad9921b22 mtd: au1550nd: add missing platform_set= _drvdata()) Merging crypto/master (e37b94ebffdd crypto: memneq - fix for archs without = efficient unaligned access) Merging drm/drm-next (a3483353ca4e drm: check for !kdev in drm_unplug_minor= ()) Merging drm-intel/for-linux-next (820c19803538 drm/i915: s/haswell_update_w= m/ilk_update_wm/) CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_pm.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_display.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_ddi.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_reg.h Merging drm-tegra/drm/for-next (7392d097b763 drm/tegra: Add PRIME support) Merging sound/for-next (f0e9c08065dc ALSA: compress: change the way sample = rates are sent to kernel) Merging sound-asoc/for-next (78e768b63536 Merge remote-tracking branches 'a= soc/topic/ad193x', 'asoc/topic/adav80x', 'asoc/topic/adsp', 'asoc/topic/ak4= 641', 'asoc/topic/ak4642', 'asoc/topic/arizona', 'asoc/topic/axi', 'asoc/to= pic/bcm2835', 'asoc/topic/cs4271', 'asoc/topic/cs42l52', 'asoc/topic/da7210= ', 'asoc/topic/davinci', 'asoc/topic/ep93xx', 'asoc/topic/fsl', 'asoc/topic= /hdmi', 'asoc/topic/jack', 'asoc/topic/jz4740', 'asoc/topic/max98090', 'aso= c/topic/mxs', 'asoc/topic/omap', 'asoc/topic/pxa', 'asoc/topic/rcar', 'asoc= /topic/samsung', 'asoc/topic/sgtl5000', 'asoc/topic/spear', 'asoc/topic/ssm= 2602', 'asoc/topic/tegra', 'asoc/topic/tlv320aic3x', 'asoc/topic/uda1380', = 'asoc/topic/wm8510', 'asoc/topic/wm8523', 'asoc/topic/wm8580', 'asoc/topic/= wm8711', 'asoc/topic/wm8728', 'asoc/topic/wm8731', 'asoc/topic/wm8741', 'as= oc/topic/wm8750', 'asoc/topic/wm8753', 'asoc/topic/wm8776', 'asoc/topic/wm8= 804', 'asoc/topic/wm8900', 'asoc/topic/wm8901', 'asoc/topic/wm8940', 'asoc/= topic/wm8962', 'asoc/topic/wm8974', 'asoc/topic/wm8985', 'asoc/topic/wm8988= ', 'asoc/topic/wm8990', 'asoc/topic/wm8991', 'asoc/topic/wm8994', 'asoc/top= ic/wm8995', 'asoc/topic/wm9081' and 'asoc/topic/x86' into asoc-next) CONFLICT (content): Merge conflict in sound/soc/fsl/fsl_ssi.c Merging modules/modules-next (74e22fac8858 module.h: Remove unnecessary sem= icolon) Merging virtio/virtio-next (7d2dddda5c92 virtio: pci: remove unnecessary pc= i_set_drvdata()) Merging input/next (768d9aa55740 Input: don't call input_dev_release_keys()= in resume) Merging input-mt/for-next (5e01dc7b26d9 Linux 3.12) Merging cgroup/for-next (824960aa4e6c Merge branch 'for-3.13-fixes' into fo= r-next) Merging block/for-next (391b7a7bfb52 Merge branch 'for-3.14/drivers' into f= or-next) CONFLICT (content): Merge conflict in include/trace/events/f2fs.h CONFLICT (content): Merge conflict in fs/logfs/dev_bdev.c CONFLICT (content): Merge conflict in fs/f2fs/segment.c CONFLICT (content): Merge conflict in fs/f2fs/data.c CONFLICT (content): Merge conflict in fs/btrfs/scrub.c CONFLICT (content): Merge conflict in fs/btrfs/extent_io.c CONFLICT (content): Merge conflict in fs/btrfs/check-integrity.c CONFLICT (content): Merge conflict in block/blk-flush.c Merging device-mapper/for-next (44dcd0425890 dm cache policy mq: introduce = three promotion threshold tunables) CONFLICT (content): Merge conflict in drivers/md/dm-thin.c 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 (82793a517714 mmc: sh_mmcif: Fix compilation warning o= n 64-bit platforms) $ git reset --hard HEAD^ Merging next-20131212 version of mmc Merging kgdb/kgdb-next (6bedf31c25dd kdb: Remove unhandled ssb command) CONFLICT (content): Merge conflict in kernel/debug/debug_core.h Merging slab/for-next (a8c0b0837359 Merge branch 'slab/next' into for-next) Merging uclinux/for-next (6dbe51c251a3 Linux 3.9-rc1) Merging md/for-next (6d183de40771 md/raid5: fix newly-broken locking in get= _active_stripe.) Merging mfd/master (90b128ed1557 Merge tag 'mfd-lee-3.13-3' of git://git.li= naro.org/people/ljones/mfd) Merging mfd-lj/for-mfd-next (f54fa6b2c24d mfd: mc13xxx: Simplify probe() & = remove()) Merging battery/master (d36240d26025 power_supply: Add power_supply notifie= r) 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 (46ac29568e63 video: vt8500: fix error handling = in probe()) Merging regulator/for-next (3d12e36e25c7 Merge remote-tracking branches 're= gulator/topic/ab8500', 'regulator/topic/arizona', 'regulator/topic/db8500',= 'regulator/topic/gpio', 'regulator/topic/lp3971', 'regulator/topic/lp3972'= , 'regulator/topic/pcf50633', 'regulator/topic/pfuze100', 'regulator/topic/= s5m8767', 'regulator/topic/stw481x-vmmc' and 'regulator/topic/tps51632' int= o regulator-next) Merging security/next (217091dd7a7a ima: define '_ima' as a builtin 'truste= d' keyring) Merging selinux/master (465954cd649a selinux: selinux_setprocattr()->ptrace= _parent() needs rcu_read_lock()) CONFLICT (content): Merge conflict in security/selinux/hooks.c Merging lblnet/master (07bc9dc1b01b Merge branch 'merge' of git://git.kerne= l.org/pub/scm/linux/kernel/git/benh/powerpc) Merging watchdog/master (28748defa512 watchdog: remove DEFINE_PCI_DEVICE_TA= BLE macro) Merging dwmw2-iommu/master (e5d0c874391a Merge tag 'iommu-updates-v3.12' of= git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu) Merging iommu/next (e6ca48d995e4 Merge branches 'iommu/fixes', 'tracing', '= core', 'arm/tegra' and 'x86/vt-d' into next) Merging vfio/next (15c03dd4859a Linux 3.12-rc3) Merging osd/linux-next (861d66601acd exofs: don't leak io_state and pages o= n read error) Merging jc_docs/docs-next (5c050fb96380 docs: update the development proces= s document) Merging trivial/for-next (b481c2cb3534 staging: usbip: Remove double initia= lization of msg_namelen variable) Merging audit/master (fc582aef7dcc Merge tag 'v3.12') Merging fsnotify/for-next (1ca39ab9d21a inotify: automatically restart sysc= alls) Merging devicetree/devicetree/next (355e62f5ad12 of/irq: Fix potential buff= er overflow) Merging dt-rh/for-next (1b50b0c3330e Merge branch 'for-3.14' into for-next) Merging spi/for-next (e16825ac62a5 Merge remote-tracking branches 'spi/topi= c/atmel', 'spi/topic/bcm63xx-hsspi', 'spi/topic/coldfire', 'spi/topic/davin= ci', 'spi/topic/falcon', 'spi/topic/fsl-espi', 'spi/topic/gpio', 'spi/topic= /msiof', 'spi/topic/omap', 'spi/topic/orion', 'spi/topic/pci', 'spi/topic/r= car', 'spi/topic/s3c64xx', 'spi/topic/sc18is602', 'spi/topic/tegra114', 'sp= i/topic/tegra20-sflash', 'spi/topic/tegra20-slink' and 'spi/topic/xcomm' in= to spi-next) Merging tip/auto-latest (c4372b1b29f2 Merge branch 'x86/urgent') CONFLICT (content): Merge conflict in arch/x86/platform/efi/efi.c Merging edac/linux_next (3e45588825c1 cell_edac: fix missing of_node_put) Merging edac-amd/for-next (0facccc00c7c Merge branch 'ras-for-3.14' into fo= r-next) Merging ftrace/for-next (3ccb01239201 tracing: Only run synchronize_sched()= at instance deletion time) Merging rcu/rcu/next (0d3c55bc9fd5 Merge branches 'doc.2013.12.03a', 'fixes= .2013.12.12a', 'rcutorture.2013.12.03a' and 'sparse.2013.12.12a' into HEAD) Merging uprobes/for-next (0326f5a94dde uprobes/core: Handle breakpoint and = singlestep exceptions) Merging kvm/linux-next (6bb05ef78553 Merge tag 'kvm-s390-20131211' of git:/= /git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into kvm-next) Merging kvm-arm/kvm-arm-next (4fda342cc7f5 arm/arm64: kvm: Use virt_to_idma= p instead of virt_to_phys for idmap mappings) Merging kvm-ppc/kvm-ppc-next (27025a602cb9 powerpc: kvm: optimize "sc 1" as= fast return) 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 (85be9741104f Merge branch 'stable/for-linus-3.1= 3' into linux-next) Merging percpu/for-next (b1a0fbfdde65 percpu: fix spurious sparse warnings = from DEFINE_PER_CPU()) Merging workqueues/for-next (4e8b22bd1a37 workqueue: fix pool ID allocation= leakage and remove BUILD_BUG_ON() in init_workqueues) Merging drivers-x86/linux-next (a80e1053aaa3 x86, wmi fix modalias_show ret= urn values) Merging chrome-platform/for-next (2b8454a75b90 platform/chrome: unregister = platform driver/device when module exit) Merging sysctl/master (4e474a00d7ff sysctl: protect poll() in entries that = may go away) Merging regmap/for-next (057c2d5071eb Merge remote-tracking branch 'regmap/= topic/ack' into regmap-next) Merging hsi/for-next (43139a61fc68 HSI: hsi_char: Update ioctl-number.txt) Merging leds/for-next (da2cbb0f96cb leds: pwm: Remove a warning on non-DT p= latforms) Merging driver-core/driver-core-next (80b9bbefc345 kernfs: add kernfs_dir_o= ps) Merging tty/tty-next (8be3da65d922 tty/serial: at91: document clock propert= ies) Merging usb/usb-next (d59abb9325ae Merge branch 3.13-rc4 into usb-next) CONFLICT (content): Merge conflict in drivers/usb/host/ohci-at91.c Merging usb-gadget/next (4a5ee77caad2 usb: gadget: f_sourcesink: Fix sparse= warning) CONFLICT (content): Merge conflict in drivers/usb/phy/Kconfig Applying: merge fix for drivers/usb/phy/phy-keystone.c $ git reset --hard HEAD^ Merging next-20131206 version of usb-gadget Merging staging/staging-next (e56b14010562 staging: comedi: fix result of m= emdup_user for user chanlist) Merging char-misc/char-misc-next (138a6d7ea2de Merge 3.13-rc4 into char-mis= c-next) Merging scsi/for-next (8a09676c242d [SCSI] bfa: Driver version upgrade to 3= .2.23.0) Merging target-updates/for-next (31cf8df68491 target_core_alua: Referrals c= onfigfs integration) Merging target-merge/for-next-merge (374b105797c3 Linux 3.13-rc3) 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 (37ef1d924375 pinctrl: at91: replace clk_prepare += clk_enable by clk_prepare_enable) CONFLICT (content): Merge conflict in drivers/pinctrl/sh-pfc/pfc-sh7372.c CONFLICT (content): Merge conflict in drivers/pinctrl/sh-pfc/pfc-r8a7740.c Merging vhost/linux-next (d3d665a654a3 vhost-scsi: whitespace tweak) Merging remoteproc/for-next (b9777859ec01 remoteproc: fix kconfig dependenc= ies for VIRTIO) Merging rpmsg/for-next (397944df3290 rpmsg: fix kconfig dependencies for VI= RTIO) Merging gpio/for-next (e0f0edc67d07 Merge branch 'devel' into for-next) Merging dma-mapping/dma-mapping-next (5e01dc7b26d9 Linux 3.12) Merging pwm/for-next (3f958fe7d3e3 of: Add Atmel PWM controller device tree= binding) Merging dma-buf/for-next (17b2112f332d Merge branch 'merge' of git://git.ke= rnel.org/pub/scm/linux/kernel/git/benh/powerpc) Merging userns/for-next (41301ae78a99 vfs: Fix a regression in mounting pro= c) Merging ktest/for-next (298a0d1d5750 ktest: Add documentation of CLOSE_CONS= OLE_SIGNAL) 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 (1459c837036a clk: si570: Add a driver for SI570 oscil= lators) Merging random/dev (8ea43ef26598 random: clarify bits/bytes in wakeup thres= holds) Merging lzo-update/lzo-update (42b775abafaf lib/lzo: huge LZO decompression= speedup on ARM by using unaligned access) Merging arm64-hugepages/for-next/hugepages (af07484863e0 ARM64: mm: THP sup= port.) Merging aio/master (374b105797c3 Linux 3.13-rc3) Merging akpm-current/current (3d655d441006 ipc,sem: correct header comment = for perform_atomic_semop) Applying: memblock-make-memblock_set_node-support-different-memblock_type-f= ix Applying: rtc: hym8563: include clkout code only if COMMON_CLK active $ git checkout -b akpm remotes/origin/akpm/master Applying: kernel/kexec.c: use vscnprintf() instead of vsnprintf() in vmcore= info_append_str() Applying: softirq: use ffs() in __do_softirq() Applying: softirq: convert printks to pr_ Applying: softirq: use const char * const for softirq_to_name, whitespace n= eatening Applying: mm/migrate.c: fix set cpupid on page migration twice against thp Applying: mm/migrate.c: fix setting of cpupid on page migration twice again= st normal page Applying: zsmalloc: move it under mm Applying: zram: promote zram from staging Applying: mm: add strictlimit knob Merging akpm/master (197062993f5f mm: add strictlimit knob) --Signature=_Wed__18_Dec_2013_18_40_01_+1100_JTSpCy0HYdKDh.GX Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) iQIcBAEBCAAGBQJSsVFWAAoJEMDTa8Ir7ZwV+rkP/1fIYMXaAYAzqSe412Z6Ww5M 06OQi3veZ1tMn0hC906RBGoo28Px5FWXLYY7YtcobYgzuMIgEUh7fr1YbHH4e6tO GhfNhla0025eCwvXgRtXdqVvBGfxlZqlXC0rC/qSTTkbz8Jcf7/CIwMSg5xMdO5A dMLq35kI5/DTT/CQ4jEmj55JEfLX66MWVrKudSZCndOh2Fj/86uikGT3H8UP/F0G SRJF7Ejr47y/UWv7r1x9/kAtCeA8XIjAhPofNBsDZwzJEOhEnXL7H1JuqM5Z74M2 Y8NC7H+tilvtOvFaSCrLe8gsWSgLpRSHI1aViOqhA5qKGQ+RtALtiEa7twJ3uT11 SwV3n7rB7Hd6xJGEbDivw/71v+mnf90koQuoS7JGho6eHlykIIvuYo+IOMTFm+I2 Q36nRhFXJiDq5E0vHz1fy9RCWy4pzIGa+ksH82ZDDsSZJaj1U8YwHBDwDJMqmXTk WVBIAgLKG4vQrUnmWEZy1aItuAvxHS6YVGHmhCduKhzGuoS6MM3UImaKGL3CXOhU dckYLwBx2yPBFJ8Nt7/raPKOX1tg+meUHh6MikczOqzchOAqHuB3quKbK1Daoc9+ de75u6aTYveMbXnsoiizcZmYqeJgFBREf3RDgGaBuLgCgR52kZVa5Fe9uvK5oiNa MJQ/eXawR+ywXBGI2BKI =WHtX -----END PGP SIGNATURE----- --Signature=_Wed__18_Dec_2013_18_40_01_+1100_JTSpCy0HYdKDh.GX--