* linux-next: Tree for Jun 19
@ 2018-06-19 7:15 Stephen Rothwell
0 siblings, 0 replies; 9+ messages in thread
From: Stephen Rothwell @ 2018-06-19 7:15 UTC (permalink / raw)
To: Linux-Next Mailing List; +Cc: Linux Kernel Mailing List
[-- Attachment #1: Type: text/plain, Size: 28076 bytes --]
Hi all,
Changes since 20180618:
Dropped tree: userns (complex conflicts)
The vfs tree gained conflicts against the overlayfs tree and a build
failure for which I applied a merge fix patch.
The userns tree gained conflicts against the vfs tree for which I dropped
the userns tree.
The akpm-current tree gained a conflict against the vfs tree.
Non-merge commits (relative to Linus' tree): 1220
1216 files changed, 40064 insertions(+), 20562 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, an allmodconfig for x86_64, a
multi_v7_defconfig for arm and a native build of tools/perf. After
the final fixups (if any), I do an x86_64 modules_install followed by
builds for x86_64 allnoconfig, powerpc allnoconfig (32 and 64 bit),
ppc44x_defconfig, allyesconfig and pseries_le_defconfig and i386, sparc
and sparc64 defconfig. And finally, a simple boot test of the powerpc
pseries_le_defconfig kernel in qemu (with and without kvm enabled).
Below is a summary of the state of the merge.
I am currently merging 279 trees (counting Linus' and 64 trees of bug
fix patches pending for the current merge release).
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.
--
Cheers,
Stephen Rothwell
$ git checkout master
$ git reset --hard stable
Merging origin/master (ba4dbdedd3ed Merge tag 'jfs-4.18' of git://github.com/kleikamp/linux-shaggy)
Merging fixes/master (147a89bc71e7 Merge tag 'kconfig-v4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild)
Merging kbuild-current/fixes (ce397d215ccd Linux 4.18-rc1)
Merging arc-current/for-curr (e6c62399504c ARCv2: support manual regfile save on interrupts)
Merging arm-current/fixes (92d44a42af81 ARM: fix kill( ,SIGFPE) breakage)
Merging arm64-fixes/for-next/fixes (839033b85ef7 arm64: make secondary_start_kernel() notrace)
Merging m68k-current/for-linus (b12c8a70643f m68k: Set default dma mask for platform devices)
Merging powerpc-fixes/fixes (faf37c44a105 powerpc/64s: Clear PCR on boot)
Merging sparc/master (1aaccb5fa0ea Merge tag 'rtc-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux)
Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2)
Merging net/master (7e85dc8cb35a net_sched: blackhole: tell upper qdisc about dropped packets)
Merging bpf/master (6d5fc1957989 xdp: Fix handling of devmap in generic XDP)
Merging ipsec/master (d6990976af7c vti6: fix PMTU caching and reporting on xmit)
Merging netfilter/master (ad9852af9758 netfilter: nf_ct_helper: Fix possible panic after nf_conntrack_helper_unregister)
Merging ipvs/master (312564269535 net: netsec: reduce DMA mask to 40 bits)
Merging wireless-drivers/master (755abd247a3d MAINTAINERS: update Xinming's email address)
Merging mac80211/master (bf2b61a6838f cfg80211: fix rcu in cfg80211_unregister_wdev)
Merging rdma-fixes/for-rc (375dc53d032f IB/rxe: Fix missing completion for mem_reg work requests)
Merging sound-current/for-linus (a57a46b93244 ALSA: hda/ca0132: Fix DMic data rate for Alienware M17x R4)
Merging sound-asoc-fixes/for-linus (ab002985a303 Merge branch 'asoc-4.18' into asoc-linus)
Merging regmap-fixes/for-linus (ce397d215ccd Linux 4.18-rc1)
Merging regulator-fixes/for-linus (ce397d215ccd Linux 4.18-rc1)
Merging spi-fixes/for-linus (a92295e1e39b Merge branch 'spi-4.18' into spi-linus)
Merging pci-current/for-linus (ce397d215ccd Linux 4.18-rc1)
Merging driver-core.current/driver-core-linus (ce397d215ccd Linux 4.18-rc1)
Merging tty.current/tty-linus (ce397d215ccd Linux 4.18-rc1)
Merging usb.current/usb-linus (ce397d215ccd Linux 4.18-rc1)
Merging usb-gadget-fixes/fixes (cf727b922031 dwc2: gadget: Fix ISOC IN DDMA PID bitfield value calculation)
Merging usb-serial-fixes/usb-linus (24160628a34a USB: serial: cp210x: add CESINEL device ids)
Merging usb-chipidea-fixes/ci-for-usb-stable (964728f9f407 USB: chipidea: msm: fix ulpi-node lookup)
Merging phy/fixes (60cc43fc8884 Linux 4.17-rc1)
Merging staging.current/staging-linus (ce397d215ccd Linux 4.18-rc1)
Merging char-misc.current/char-misc-linus (ce397d215ccd Linux 4.18-rc1)
Merging input-current/for-linus (01f7e67a053f Merge branch 'next' into for-linus)
Merging crypto-current/master (837bf7cc3b75 hwrng: core - Always drop the RNG in hwrng_unregister())
Merging ide/master (1aaccb5fa0ea Merge tag 'rtc-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux)
Merging vfio-fixes/for-linus (08ca1b52f69b vfio/pci: Make IGD support a configurable option)
Merging kselftest-fixes/fixes (ce397d215ccd Linux 4.18-rc1)
Merging modules-fixes/modules-linus (be71eda5383f module: Fix display of wrong module .text address)
Merging slave-dma-fixes/fixes (ce397d215ccd Linux 4.18-rc1)
Merging backlight-fixes/for-backlight-fixes (8ff5cbc6e3c5 backlight: as3711_bl: fix device-tree node leaks)
Merging mtd-fixes/master (ce397d215ccd Linux 4.18-rc1)
Merging nand-fixes/nand/fixes (ee02f73e04c0 mtd: nand: atmel: Fix EDO mode check)
Merging spi-nor-fixes/spi-nor/fixes (7928b2cbe55b Linux 4.16-rc1)
Merging mfd-fixes/for-mfd-fixes (11799564fc7e mfd: cros_ec: Retry commands when EC is known to be busy)
Merging v4l-dvb-fixes/fixes (e88f5e9ebd54 media: uvcvideo: Prevent setting unavailable flags)
Merging reset-fixes/reset/fixes (e6914365fd28 reset: uniphier: fix USB clock line for LD20)
Merging mips-fixes/mips-fixes (2a027b47dba6 MIPS: BCM47XX: Enable 74K Core ExternalSync for PCIe erratum)
Merging omap-fixes/fixes (41bd6adf3c5d Revert "ARM: dts: logicpd-som-lv: Fix pinmux controller references")
Merging kvm-fixes/master (696ca779a928 KVM: x86: fix #UD address of failed Hyper-V hypercalls)
Merging kvms390-fixes/master (f4a551b72358 KVM: s390: vsie: fix < 8k check for the itdba)
Merging hwmon-fixes/hwmon (91bb8f45f73f hwmon: (nct6775) Fix loop limit)
Merging nvdimm-fixes/libnvdimm-fixes (75bc37fefc44 Linux 4.17-rc4)
Merging btrfs-fixes/next-fixes (ce397d215ccd Linux 4.18-rc1)
Merging vfs-fixes/fixes (b1b94fcbd399 Revert "fs: fold open_check_o_direct into do_dentry_open")
Merging dma-mapping-fixes/for-linus (cf65a0f6f6ff dma-mapping: move all DMA mapping code to kernel/dma)
Merging drivers-x86-fixes/fixes (32ffd6e8d1f6 platform/x86: asus-wmi: Fix NULL pointer dereference)
Merging samsung-krzk-fixes/fixes (ce397d215ccd Linux 4.18-rc1)
Merging pinctrl-samsung-fixes/pinctrl-fixes (ce397d215ccd Linux 4.18-rc1)
Merging devicetree-fixes/dt/linus (737dd8e1a4c4 Documentation: devicetree: tilcdc: fix spelling mistake "suppors" -> "supports")
Merging scsi-fixes/fixes (e6d1dd048cd4 scsi: qla2xxx: Spinlock recursion in qla_target)
Merging drm-intel-fixes/for-linux-next-fixes (ce397d215ccd Linux 4.18-rc1)
Merging mmc-fixes/fixes (ce397d215ccd Linux 4.18-rc1)
Merging rtc-fixes/rtc-fixes (ce397d215ccd Linux 4.18-rc1)
Merging drm-misc-fixes/for-linux-next-fixes (58b3d02f066e Revert "drm/sun4i: Handle DRM_BUS_FLAG_PIXDATA_*EDGE")
Merging kbuild/for-next (ce397d215ccd Linux 4.18-rc1)
Merging leaks/leaks-next (9f84a0f7f1a6 leaking_addresses: check if file name contains address)
Merging uuid/for-next (c0020756315e efi: switch to use new generic UUID API)
Merging dma-mapping/for-next (2550bbfd4952 dma-direct: don't crash on device without dma_mask)
Merging asm-generic/master (a71e7c44ffb7 io: change writeX_relaxed() to remove barriers)
Merging arc/for-next (4fbd8d194f06 Linux 4.15-rc1)
Merging arm/for-next (0ac000e86703 Merge branches 'fixes', 'misc' and 'spectre' into for-linus)
Merging arm-perf/for-next/perf (ce397d215ccd Linux 4.18-rc1)
Merging arm-soc/for-next (c7953e19db50 ARM: Document merges)
Merging actions/for-next (35afadd11222 Merge branch 'v4.19/drivers' into next)
Merging alpine/alpine/for-next (7928b2cbe55b Linux 4.16-rc1)
Merging amlogic/for-next (793d8ab66802 Merge branch 'v4.18/defconfig' into tmp/aml-rebuild)
Merging aspeed/for-next (6534b2d0de36 Merge branch 'dt-for-v4.17' into for-next)
Merging at91/at91-next (20d3f36b0fea Merge tag 'at91-ab-4.17-dt2' into at91-next)
Merging bcm2835/for-next (5c483a0c319c Merge branch anholt/bcm2835-defconfig-64-next into for-next)
Merging imx-mxs/for-next (452daaaf6021 Merge branch 'imx/defconfig' into for-next)
Merging keystone/next (fb5d812c3cb3 Merge branch 'for_4.18/keystone-dts' into next)
Merging mediatek/for-next (9378b3427341 Merge branch 'v4.17-next/soc' into for-next)
Merging mvebu/for-next (78e5d8c26c70 Merge branch 'mvebu/dt64' into mvebu/for-next)
Merging omap/for-next (1b7e42c1dfe8 Merge branch 'omap-for-v4.18/soc' into for-next)
Merging reset/reset/next (d7bab65b1f57 reset: uniphier: add LD11/LD20 stream demux system reset control)
Merging qcom/for-next (509d20563e5d firmware: qcom: scm: Fix crash in qcom_scm_call_atomic1())
Merging realtek/for-next (2b6286eb7ab8 Merge branch 'v4.15/dt64' into next)
Merging renesas/next (55bb9da815fe Merge branches 'arm-defconfig-for-v4.19', 'arm-soc-for-v4.19', 'arm-dt-for-v4.19', 'arm64-defconfig-for-v4.19', 'arm64-dt-for-v4.19' and 'dt-bindings-for-v4.19' into next)
Merging rockchip/for-next (d5a5df7cf0ad Merge branch 'v4.18-armsoc/dts32-fixes' into for-next)
Merging samsung/for-next (bebc6082da0a Linux 4.14)
Merging samsung-krzk/for-next (ce397d215ccd Linux 4.18-rc1)
Merging sunxi/sunxi/for-next (dae42f9df9d9 Merge branches 'sunxi/dt-for-4.19', 'sunxi/dt64-for-4.19' and 'sunxi/h3-h5-for-4.19' into sunxi/for-next)
Merging tegra/for-next (6de9ae597a79 Merge branch for-4.18/clk into for-next)
Merging arm64/for-next/core (0fe42512b2f0 arm64: Fix syscall restarting around signal suppressed by tracer)
Merging clk/clk-next (55913c2d3330 Merge branch 'clk-imx6ul' into clk-next)
Merging clk-samsung/for-next (e8cf870f253b clk: samsung: simplify getting .drvdata)
Merging c6x/for-linux-next (85fa2cc51104 c6x: pass endianness info to sparse)
Merging m68k/for-next (b12c8a70643f m68k: Set default dma mask for platform devices)
Merging m68knommu/for-next (2086e19c7118 m68k: fix "bad page state" oops on ColdFire boot)
Merging microblaze/next (5cf8da7bc035 microblaze: Remove architecture heart beat code)
Merging mips/mips-next (9202ed144c27 mips: ftrace: fix static function graph tracing)
Merging nds32/next (e5dd7e2f8a59 nds32: define __NDS32_E[BL]__ for sparse)
Merging nios2/for-next (3d9644ef9a0f nios2: Use read_persistent_clock64() instead of read_persistent_clock())
Merging openrisc/for-next (d56f3af9e801 openrisc: remove unused __ARCH_HAVE_MMU define)
Merging parisc-hd/for-next (8d40c754fbac parisc: Drop struct sigaction from not exported header file)
Merging powerpc/next (ff5bc793e47b powerpc/64s/radix: Fix missing ptesync in flush_cache_vmap)
Merging fsl/next (c095ff93f901 powerpc/sysdev: change CPM GPIO to platform_device)
Merging risc-v/for-next (29dcea88779c Linux 4.17)
Merging s390/features (ec530174c437 s390/dasd: only use preallocated requests)
Merging sparc-next/master (1aaccb5fa0ea Merge tag 'rtc-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux)
Merging sh/for-next (ac21fc2dcb40 sh: switch to NO_BOOTMEM)
Merging uml/linux-next (5ec9121195a4 um: Fix raw interface options)
Merging xtensa/xtensa-for-next (ae6063c83634 Merge branch 'xtensa-fixes' into xtensa-for-next)
Merging fscrypt/master (e1cc40e5d42a fscrypt: log the crypto algorithm implementations)
Merging befs/for-next (55d945e2e4aa fs: befs: btree: Fixed some coding standard issues)
Merging btrfs/next (29dcea88779c Linux 4.17)
Merging btrfs-kdave/for-next (a160e71dd09e Merge branch 'for-next-next-v4.19-20180618' into for-next-20180618)
Merging ceph/master (23edca864951 rbd: flush rbd_dev->watch_dwork after watch is unregistered)
Merging cifs/for-next (c37bca639c29 smb3: if server does not support posix do not allow posix mount option)
Merging configfs/for-next (6ace4f6bbcfd RDMA/cma: make config_item_type const)
Merging ecryptfs/next (e86281e700cc eCryptfs: don't pass up plaintext names when using filename encryption)
Merging ext3/for_next (20a653d458c3 Merge fsnotify cleanups from Amir into for_next)
Merging ext4/dev (0238a85e379f ext4: add more mount time checks of the superblock)
Merging f2fs/dev (d54d35c501bc Merge tag 'f2fs-for-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs)
Merging fuse/for-next (543b8f8662fe fuse: don't keep dead fuse_conn at fuse_fill_super().)
Merging jfs/jfs-next (92d34134193e jfs: Fix inconsistency between memory allocation and ea_buf->max_size)
Merging nfs/linux-next (c18c5a82d984 pNFS: Don't send layoutreturn if the layout is already invalid)
Merging nfs-anna/linux-next (ffbfa2ce88f1 sunrpc: Fix latency trace point crashes)
Merging nfsd/nfsd-next (5b7b15aee641 nfsd: fix corrupted reply to badly ordered compound)
Merging orangefs/for-next (b1116bc03c00 orangefs: use sparse annotations for holding locks across function calls.)
Merging overlayfs/overlayfs-next (c03e30790cad ovl: Enable metadata only feature)
CONFLICT (content): Merge conflict in fs/read_write.c
CONFLICT (content): Merge conflict in fs/overlayfs/overlayfs.h
CONFLICT (content): Merge conflict in fs/overlayfs/inode.c
CONFLICT (content): Merge conflict in fs/inode.c
CONFLICT (content): Merge conflict in fs/btrfs/ioctl.c
Applying: overlayfs: merge fix for "vfs: change inode times to use struct timespec64"
Merging ubifs/linux-next (f5a926dd5298 mtd: ubi: Update ubi-media.h to dual license)
Merging xfs/for-next (89e9b5c0915a xfs: update incore per-AG inode count)
Merging file-locks/locks-next (1cf8e5de4055 fs/lock: show locks taken by processes from another pidns)
Merging vfs/for-next (1f15c298fa29 Merge branch 'work.mount' into for-next)
CONFLICT (content): Merge conflict in include/uapi/linux/fs.h
CONFLICT (content): Merge conflict in include/linux/fs.h
Applying: overlayfs: fix up for MS_ constants moving
Applying: scsi: cxlflash: update for fs_type->mount API change
Merging vfs-miklos/next (0eb8af4916a5 vfs: use helper for calling f_op->fsync())
Merging printk/for-next (ce041c43f222 lib/test_printf.c: accept "ptrval" as valid result for plain 'p' tests)
Merging pci/next (ce397d215ccd Linux 4.18-rc1)
Merging pstore/for-next/pstore (e698aaf37f9f pstore: fix crypto dependencies without compression)
Merging hid/for-next (f1b6ae6701a7 Merge branch 'for-4.18/rmi' into for-next)
Merging i2c/i2c/for-next (ce397d215ccd Linux 4.18-rc1)
Merging dmi/master (7f73745fec52 firmware: dmi: Add access to the SKU ID string)
Merging hwmon-staging/hwmon-next (06399c395108 hwmon: (nct7904) Fix UNSPECIFIED_INT warning)
Merging jc_docs/docs-next (a49d9c0ae46e Documentation: document hung_task_panic kernel parameter)
Merging v4l-dvb/master (f2809d20b925 media: omap2: fix compile-testing with FB_OMAP2=m)
Merging v4l-dvb-next/master (f10379aad39e media: include/video/omapfb_dss.h: use IS_ENABLED())
Merging fbdev/fbdev-for-next (85ebd164de56 fb_omap2: add gpiolib dependency)
Merging pm/linux-next (a11bc46ec1ba Merge branches 'pm-core' and 'acpi-soc' into linux-next)
Merging cpupower/cpupower (ce397d215ccd Linux 4.18-rc1)
Merging idle/next (8a5776a5f498 Linux 4.14-rc4)
Merging opp/opp/linux-next (9c290c40ad93 PM / OPP: Update voltage in case freq == old_freq)
Merging thermal/next (e9ed3ee61aa6 Merge branches 'thermal-core' and 'thermal-intel' into next)
Merging thermal-soc/next (6d7c70d1cd65 thermal: qcom: tsens: Allow number of sensors to come from DT)
Merging ieee1394/for-next (188775181bc0 firewire-ohci: work around oversized DMA reads on JMicron controllers)
Merging dlm/next (da3627c30d22 dlm: remove O_NONBLOCK flag in sctp_connect_to_sock)
Merging swiotlb/linux-next (4855c92dbb7b xen-swiotlb: fix the check condition for xen_swiotlb_free_coherent)
Merging rdma/for-next (33023fb85a42 IB/core: add max_send_sge and max_recv_sge attributes)
Merging net-next/master (f0dc7f9c6dd9 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging bpf-next/master (f0dc7f9c6dd9 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging ipsec-next/master (f0dc7f9c6dd9 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging mlx5-next/mlx5-next (d2fb9855b533 Merge commit 'shared-part-of-flow-counters' into mlx5-next)
Merging netfilter-next/master (f0dc7f9c6dd9 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging nfc-next/master (1f008cfec5d5 NFC: fdp: Fix unused variable warnings)
Merging ipvs-next/master (e523452ac0e0 netfilter: nf_tables: remove unused variables)
Merging wireless-drivers-next/master (4cf44d525548 Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git)
Merging bluetooth/master (f0dc7f9c6dd9 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging mac80211-next/master (8ba6731ad4c7 rfkill: add header files to MAINTAINERS)
CONFLICT (content): Merge conflict in net/mac80211/scan.c
Merging gfs2/for-next (f0dc7f9c6dd9 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging mtd/mtd/next (ce397d215ccd Linux 4.18-rc1)
Merging nand/nand/next (ce397d215ccd Linux 4.18-rc1)
Merging spi-nor/spi-nor/next (ce397d215ccd Linux 4.18-rc1)
Merging crypto/master (b268b3506d99 crypto: chtls - free beyond end rspq_skb_cache)
Merging drm/drm-next (daf0678c2036 Merge branch 'drm-next-4.18' of git://people.freedesktop.org/~agd5f/linux into drm-next)
Merging drm-panel/drm/panel/for-next (e4bac408b084 drm/panel: simple: Add support for Winstar WF35LTIACD)
Merging drm-intel/for-linux-next (b796b9710fd5 drm/i915/icl: Handle hotplug interrupts for DP over TBT)
Merging drm-tegra/drm/tegra/for-next (6134534ca24f drm/tegra: Add kerneldoc for UAPI)
Merging drm-misc/for-linux-next (069035c5db34 drm: Fix possible race conditions while unplugging DRM device)
Merging drm-msm/msm-next (4dd454c371fd drm/msm/gpu: Increase the pm runtime autosuspend for 5xx)
Merging hdlcd/for-upstream/hdlcd (f73e8b825315 drm/arm: Replace instances of drm_dev_unref with drm_dev_put.)
Merging mali-dp/for-upstream/mali-dp (6e810eb508f4 drm: mali-dp: Add YUV->RGB conversion support for video layers)
Merging sunxi-drm/sunxi-drm/for-next (7dafb83edd32 Merge branches 'sunxi/drm-fixes-for-4.13' and 'sunxi/drm-for-4.14' into sunxi-drm/for-next)
Merging imx-drm/imx-drm/next (518665524272 gpu: ipu-csi: Check for field type alternate)
Merging etnaviv/etnaviv/next (f6ffbd4fc1a1 drm/etnaviv: replace license text with SPDX tags)
Merging kconfig/for-next (bebc6082da0a Linux 4.14)
Merging regmap/for-next (ce397d215ccd Linux 4.18-rc1)
Merging sound/for-next (a8eaad7b04ea ALSA: line6: stop using get_seconds())
Merging sound-asoc/for-next (db67250fe464 Merge branch 'asoc-4.19' into asoc-next)
Merging modules/modules-next (9f2d1e68cf4d module: exclude SHN_UNDEF symbols from kallsyms api)
Merging input/next (5aff29efbec0 Merge branch 'ib/4.17-xen-kbdfront-runtime-config' into next)
Merging block/for-next (28313cee1d4f Merge branch 'for-4.18/block' into for-next)
Merging lightnvm/for-next (1c6286f26301 lightnvm: fix some error code in pblk-init.c)
Merging device-mapper/for-next (8bb82c1c9ad1 dm cache metadata: ensure metadata is committed before writing superblock)
Merging pcmcia/pcmcia-next (c3a5307873d4 pcmcia: Use module_pcmcia_driver for scsi drivers)
Merging mmc/next (ce397d215ccd Linux 4.18-rc1)
Merging kgdb/kgdb-next (2cf2f0d5b91f kdb: use memmove instead of overlapping memcpy)
Merging md/for-next (bfc9dfdcb6e9 MD: cleanup resources in failure)
Merging mfd/for-mfd-next (556c242045f0 mfd: cros_ec: Remove unused __remove function)
Merging backlight/for-backlight-next (980d7812fdb4 dt-bindings: pwm-backlight: Move brightness-levels to optional.)
Merging battery/for-next (ce397d215ccd Linux 4.18-rc1)
Merging regulator/for-next (7bd0c7ba62e8 regulator: Fix typo in comment of struct regulator_linear_range)
Merging security/next-testing (d19289133b1d Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity into next-testing)
Merging apparmor/apparmor-next (338d0be437ef apparmor: fix ptrace read check)
Merging integrity/next-integrity (b5c90a7526fe EVM: unlock on error path in evm_read_xattrs())
Merging keys/keys-next (1e684d3820d8 pkcs7: Set the module licence to prevent tainting)
Merging selinux/next (ce397d215ccd Linux 4.18-rc1)
Merging tpmdd/next (3ac7e6225c0b tpm: migrate tpm2_get_random() to use struct tpm_buf)
Merging watchdog/master (16a7eec2fcd0 watchdog: da9063: remove duplicated timeout_to_sel calls)
Merging iommu/next (1f568357117c Merge branches 'arm/io-pgtable', 'arm/qcom', 'arm/tegra', 'x86/vt-d', 'x86/amd' and 'core' into next)
Merging dwmw2-iommu/master (d8a5b80568a9 Linux 4.15)
Merging vfio/next (c1abca96b252 samples: mbochs: add DMA_SHARED_BUFFER dependency)
Merging trivial/for-next (75a24b822d38 kfifo: fix inaccurate comment)
Merging audit/next (ce397d215ccd Linux 4.18-rc1)
Merging devicetree/for-next (ac840f898808 dt-bindings: Add bitmain vendor prefix)
Merging mailbox/mailbox-for-next (f83d1cfc8bcd mailbox/drivers/hisi: Consolidate the Kconfig for the MAILBOX)
Merging spi/for-next (bc5408181123 Merge branch 'spi-4.19' into spi-next)
Merging tip/auto-latest (cc82cbbdd454 Merge branch 'x86/apic')
Merging clockevents/clockevents/next (6bd9549d8a7d clocksource/drivers/arc_timer: Add comments about locking while read GFRC)
Merging edac/linux_next (345fb0a9a634 Merge tag 'edac_for_4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp)
Merging edac-amd/for-next (6c974d4dfafe EDAC, i7core: Fix memleaks and use-after-free on probe and remove)
Merging irqchip/irq/irqchip-next (6a88c221acba ARM: dts: stm32: Add exti support to stm32mp157 pinctrl)
Merging ftrace/for-next (a9235b544a0a ring-buffer: Fix typo in comment)
Merging rcu/rcu/next (443da8397d9f rcu: Make rcu_seq_diff() more exact)
CONFLICT (content): Merge conflict in drivers/iommu/amd_iommu.c
Merging kvm/linux-next (766d3571d8e5 kvm: fix typo in flag name)
Merging kvm-arm/next (e25028c8ded0 KVM: arm/arm64: Bump VGIC_V3_MAX_CPUS to 512)
Merging kvm-mips/next (dc44abd6aad2 KVM: MIPS/Emulate: Properly implement TLBR for T&E)
Merging kvm-ppc/kvm-ppc-next (ce397d215ccd Linux 4.18-rc1)
Merging kvms390/next (2c8180e885c1 KVM: s390: vsie: simplify < 8k address checks)
Merging xen-tip/linux-next (7f47e1c52d0c xen/PVH: Make GDT selectors PVH-specific)
Merging percpu/for-next (b3a5d1119944 percpu_ref: Update doc to dissuade users from depending on internal RCU grace periods)
Merging workqueues/for-next (66448bc274ca workqueue: move function definitions within CONFIG_SMP block)
Merging drivers-x86/for-next (26ed9d1c07ef platform/x86: silead_dmi: Add entry for Chuwi Hi8 tablet touchscreen)
Merging chrome-platform/for-next (c474e9f2be99 platform/chrome: chromeos_tbmc - fix SPDX identifier)
Merging hsi/for-next (ce397d215ccd Linux 4.18-rc1)
Merging leds/for-next (6d71021ab3b0 leds: class: ensure workqueue is initialized before setting brightness)
Merging ipmi/for-next (ded74ec6b83f ipmi: Change to ktime_get_ts64())
Merging driver-core/driver-core-next (ce397d215ccd Linux 4.18-rc1)
Merging usb/usb-next (ce397d215ccd Linux 4.18-rc1)
Merging usb-gadget/next (47265c067c0d usb: dwc2: gadget: Fix coverity issue)
Merging usb-serial/usb-next (ce397d215ccd Linux 4.18-rc1)
Merging usb-chipidea-next/ci-for-usb-next (8bcf4c0bd7fb usb: chipidea: properly handle host or gadget initialization failure)
Merging phy-next/next (c1eb8f83845b phy: mediatek: add XS-PHY driver)
Merging tty/tty-next (ce397d215ccd Linux 4.18-rc1)
Merging char-misc/char-misc-next (ce397d215ccd Linux 4.18-rc1)
Merging extcon/extcon-next (441492c2256c extcon: Release locking when sending the notification of connector state)
Merging staging/staging-next (3053339b17f8 staging: goldfish: Clear audio read buffer status after each read)
Merging mux/for-next (6a3d4baac84a mux: add mux_control_get_optional() API)
Merging slave-dma/next (ce397d215ccd Linux 4.18-rc1)
Merging cgroup/for-next (d8742e229021 cgroup: css_set_lock should nest inside tasklist_lock)
Merging scsi/for-next (5b10177e2dd8 scsi: qla2xxx: Spinlock recursion in qla_target)
Merging scsi-mkp/for-next (1b5c2cb19668 scsi: lpfc: update driver version to 12.0.0.4)
Merging target-updates/for-next (1c130ae00b76 iscsi-target: make sure to wake up sleeping login worker)
Merging target-bva/for-next (60cc43fc8884 Linux 4.17-rc1)
Merging libata/for-next (03def2fa3e3e Merge branch 'for-4.18-fixes' into for-next)
Merging vhost/linux-next (2eb98105f8c7 virtio: update the comments for transport features)
Merging rpmsg/for-next (ce397d215ccd Linux 4.18-rc1)
Merging gpio/for-next (8968e4ced9b1 Merge branch 'devel' into for-next)
Merging pinctrl/for-next (1fd2a5dce0dc Merge branch 'devel' into for-next)
Merging pinctrl-samsung/for-next (ce397d215ccd Linux 4.18-rc1)
Merging pwm/for-next (414c52b7899a pwm: stm32: Fix build warning with CONFIG_DMA_ENGINE disabled)
Merging userns/for-next (cc8cda3af2ba proc: Simplify and fix proc by removing the kernel mount)
CONFLICT (content): Merge conflict in fs/proc/root.c
CONFLICT (content): Merge conflict in fs/proc/inode.c
$ git reset --hard HEAD
Merging ktest/for-next (6cd110a91f52 ktest: Take submenu into account for grub2 menus)
Merging random/dev (bfe80ed3d7c7 vsprintf: add command line option debug_boot_weak_hash)
Merging aio/master (2a8a98673c13 fs: aio: fix the increment of aio-nr and counting against aio-max-nr)
Merging kselftest/next (eb83d5f7d07e selftests: sparc64: Add missing SPDX License Identifiers)
Merging y2038/y2038 (e264abeaf9da pstore: Remove bogus format string definition)
Merging livepatching/for-next (d7ab8e67aa52 Merge branch 'for-4.18/upstream' into for-next)
Merging coresight/next (dd2e68bb385e coresight: Handle errors in finding input/output ports)
Merging rtc/rtc-next (ce397d215ccd Linux 4.18-rc1)
Merging nvdimm/libnvdimm-for-next (d95363c95705 Merge branch 'for-4.18/dax-memory-failure' into libnvdimm-for-next)
Merging at24/at24/for-next (ce397d215ccd Linux 4.18-rc1)
Merging ntb/ntb-next (b1ce023ae8a2 ntb_netdev: fix sleep time mismatch)
Merging kspp/for-next/kspp (45888b40d2a6 rslib: Allocate decoder buffers to avoid VLAs)
Merging init_task/init_task (e1e871aff3de Expand INIT_STRUCT_PID and remove)
Merging cisco/for-next (5997aab0a11e Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
Merging xarray/xarray (8cfaadd09f30 test_xarray: Add missing MODULE information)
Applying: filesystem-dax: fixups for xaarray changes
Merging akpm-current/current (8b95a15d84a1 bfs: add sanity check at bfs_fill_super())
CONFLICT (content): Merge conflict in kernel/cgroup/cgroup.c
$ git checkout -b akpm remotes/origin/akpm/master
Applying: kernel/kexec_file.c: add walk_system_ram_res_rev()
Applying: kernel/kexec_file.c: load kernel at top of system RAM if required
Applying: drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow
Applying: sparc64: NG4 memset 32 bits overflow
Merging akpm/master (6e204a5b5216 sparc64: NG4 memset 32 bits overflow)
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* linux-next: Tree for Jun 19
@ 2023-06-19 5:40 Stephen Rothwell
0 siblings, 0 replies; 9+ messages in thread
From: Stephen Rothwell @ 2023-06-19 5:40 UTC (permalink / raw)
To: Linux Next Mailing List; +Cc: Linux Kernel Mailing List
[-- Attachment #1: Type: text/plain, Size: 38223 bytes --]
Hi all,
Changes since 20230616:
The mm tree gained a conflict against Linus' tree.
The arm-soc tree lost its build failure.
The net-next tree lopstg its build failure, but gained a conflict against
the net tree.
The bluetooth tree still had its build failure for which I reverted a commit.
The drm tree gained a conflict against Linus' tree.
The kvm-riscv tree gained a conflict against the risc-v tree.
The scsi tree gained a conflict against the block tree.
The scsi-mkp tree lost its build failure.
The slab tree gained a conflict against the mm tree.
Non-merge commits (relative to Linus' tree): 9816
10319 files changed, 450598 insertions(+), 147657 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 is also the merge.log file in the Next
directory. Between each merge, the tree was built with a ppc64_defconfig
for powerpc, an allmodconfig for x86_64, a multi_v7_defconfig for arm
and a native build of tools/perf. After the final fixups (if any), I do
an x86_64 modules_install followed by builds for x86_64 allnoconfig,
powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig
and pseries_le_defconfig and i386, arm64, s390, sparc and sparc64
defconfig and htmldocs. And finally, a simple boot test of the powerpc
pseries_le_defconfig kernel in qemu (with and without kvm enabled).
Below is a summary of the state of the merge.
I am currently merging 363 trees (counting Linus' and 103 trees of bug
fix patches pending for the current merge release).
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.
--
Cheers,
Stephen Rothwell
$ git checkout master
$ git reset --hard stable
Merging origin/master (45a3e24f65e9 Linux 6.4-rc7)
Merging fixes/fixes (ac9a78681b92 Linux 6.4-rc1)
Merging mm-hotfixes/mm-hotfixes-unstable (d9ccc85f8d3d mailmap: add entries for Ben Dooks)
Merging kbuild-current/fixes (f1fcbaa18b28 Linux 6.4-rc2)
Merging arc-current/for-curr (30a0b95b1335 Linux 6.1-rc3)
Merging arm-current/fixes (2b951b0efbaa ARM: 9297/1: vfp: avoid unbalanced stack on 'success' return path)
Merging arm64-fixes/for-next/fixes (0e2aba694866 arm64: mm: pass original fault address to handle_mm_fault() in PER_VMA_LOCK block)
Merging arm-soc-fixes/arm/fixes (5b017b5ed2bc Merge tag 'v6.4-rockchip-dtsfixes1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into arm/fixes)
Merging davinci-current/davinci/for-current (ac9a78681b92 Linux 6.4-rc1)
Merging drivers-memory-fixes/fixes (ac9a78681b92 Linux 6.4-rc1)
Merging tee-fixes/fixes (ceaa837f96ad Linux 6.2-rc8)
Merging m68k-current/for-linus (b845b574f86d m68k: Move signal frame following exception on 68020/030)
Merging powerpc-fixes/fixes (dfaed3e1fa70 powerpc/64s/radix: Fix exit lazy tlb mm switch with irqs enabled)
Merging s390-fixes/fixes (03c5c83b70dc s390/purgatory: disable branch profiling)
Merging sparc/master (2d2b17d08bfc sparc: Unbreak the build)
Merging fscrypt-current/for-current (4bcf6f827a79 fscrypt: check for NULL keyring in fscrypt_put_master_key_activeref())
Merging fsverity-current/for-current (a075bacde257 fsverity: don't drop pagecache at end of FS_IOC_ENABLE_VERITY)
Merging net/main (c938ab4da0eb net: phy: Manual remove LEDs to ensure correct ordering)
Merging bpf/master (b78b34c6043e Merge branch 'bpf: fix NULL dereference during extable search')
Merging ipsec/master (842665a9008a xfrm: Use xfrm_state selector for BEET input)
Merging netfilter/master (7fb0269720d7 Merge tag 'for-net-2022-05-23' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth)
Merging ipvs/main (ab39b113e747 Merge tag 'for-net-2023-06-05' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth)
Merging wireless/for-next (f1a0898b5d6a wifi: iwlwifi: mvm: spin_lock_bh() to fix lockdep regression)
Merging wpan/master (cd9125030689 ieee802154: Replace strlcpy with strscpy)
Merging rdma-fixes/for-rc (0c7e314a6352 RDMA/rxe: Fix rxe_cq_post)
Merging sound-current/for-linus (227d2c3154a9 Merge tag 'asoc-fix-v6.4-rc6-2' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus)
Merging sound-asoc-fixes/for-linus (f9fd804aa0a3 ASoC: tegra: Fix Master Volume Control)
Merging regmap-fixes/for-linus (44e46572f0ba regmap: regcache: Don't sync read-only registers)
Merging regulator-fixes/for-linus (b00de0000a69 regulator: qcom-rpmh: Fix regulators for PM8550)
Merging spi-fixes/for-linus (9d7054fb3ac2 spi: spi-geni-qcom: correctly handle -EPROBE_DEFER from dma_request_chan())
Merging pci-current/for-linus (40994ce0ea01 MAINTAINERS: Add Chuanhua Lei as Intel LGM GW PCIe maintainer)
Merging driver-core.current/driver-core-linus (9561de3a55be Linux 6.4-rc5)
Merging tty.current/tty-linus (a82c3df955f8 tty: serial: fsl_lpuart: reduce RX watermark to 0 on LS1028A)
Merging usb.current/usb-linus (286d9975a838 usb: gadget: udc: core: Prevent soft_connect_store() race)
Merging usb-serial-fixes/usb-linus (f1832e2b5e49 USB: serial: option: add Quectel EM061KGL series)
Merging phy/fixes (9561de3a55be Linux 6.4-rc5)
Merging staging.current/staging-linus (b3dad076a058 staging: octeon: delete my name from TODO contact)
Merging iio-fixes/fixes-togreg (c57fa0037024 meson saradc: fix clock divider mask length)
Merging counter-current/counter-current (ac9a78681b92 Linux 6.4-rc1)
Merging char-misc.current/char-misc-linus (9561de3a55be Linux 6.4-rc5)
Merging soundwire-fixes/fixes (858fd168a95c Linux 6.4-rc6)
Merging thunderbolt-fixes/fixes (9f9666e65359 thunderbolt: Mask ring interrupt on Intel hardware as well)
Merging input-current/for-linus (feee70f45686 Input: xpad - delete a Razer DeathAdder mouse VID/PID entry)
Merging crypto-current/master (6ab39f99927e crypto: x86/aria - Use 16 byte alignment for GFNI constant vectors)
Merging vfio-fixes/for-linus (4752354af710 vfio/type1: check pfn valid before converting to struct page)
Merging kselftest-fixes/fixes (dbcf76390eb9 selftests/ftrace: Improve integration with kselftest runner)
Merging modules-fixes/modules-linus (f412eef03938 Documentation: livepatch: module-elf-format: Remove local klp_modinfo definition)
Merging dmaengine-fixes/fixes (e14fd2af7a1d dmaengine: at_hdmac: Extend the Flow Controller bitfield to three bits)
Merging backlight-fixes/for-backlight-fixes (88603b6dc419 Linux 6.2-rc2)
Merging mtd-fixes/mtd/fixes (c4d28e30a8d0 mtd: rawnand: marvell: don't set the NAND frequency select)
Merging mfd-fixes/for-mfd-fixes (88603b6dc419 Linux 6.2-rc2)
Merging v4l-dvb-fixes/fixes (ec21a38df77a Revert "media: dvb-core: Fix use-after-free on race condition at dvb_frontend")
Merging reset-fixes/reset/fixes (3a2390c6777e reset: uniphier-glue: Fix possible null-ptr-deref)
Merging mips-fixes/mips-fixes (4897a898a216 mips: Move initrd_start check after initrd address sanitisation.)
Merging at91-fixes/at91-fixes (6b0db163ff92 ARM: dts: at91: sama7g5ek: fix debounce delay property for shdwc)
Merging omap-fixes/fixes (2a906db2824b Merge branch 'am5748-fix' into fixes)
Merging kvm-fixes/master (f211b45057d8 Merge tag 'kvm-x86-fixes-6.4' of https://github.com/kvm-x86/linux into HEAD)
Merging kvms390-fixes/master (21f27df85400 KVM: s390: pv: fix external interruption loop not always detected)
Merging hwmon-fixes/hwmon (b153a0bb4199 hwmon: (pmbus/adm1275) Fix problems with temperature monitoring on ADM1272)
Merging nvdimm-fixes/libnvdimm-fixes (e98d14fa7315 tools/testing/nvdimm: Drop empty platform remove function)
Merging cxl-fixes/fixes (a70fc4ed20a6 cxl/port: Fix NULL pointer access in devm_cxl_add_port())
Merging btrfs-fixes/next-fixes (02a8f929f7d8 Merge branch 'misc-6.4' into next-fixes)
Merging vfs-fixes/fixes (609d54441493 fs: prevent out-of-bounds array speculation when closing a file descriptor)
Merging dma-mapping-fixes/for-linus (bbb73a103fbb swiotlb: fix a braino in the alignment check fix)
Merging drivers-x86-fixes/fixes (fb109fba7284 platform/x86: int3472: Avoid crash in unregistering regulator gpio)
Merging samsung-krzk-fixes/fixes (ac9a78681b92 Linux 6.4-rc1)
Merging pinctrl-samsung-fixes/fixes (ac9a78681b92 Linux 6.4-rc1)
Merging devicetree-fixes/dt/linus (c7753ed71c16 dt-bindings: pinctrl: qcom,pmic-mpp: Fix schema for "qcom,paired")
Merging dt-krzk-fixes/fixes (8bbec86ce6d6 dt-bindings: PCI: fsl,imx6q: fix assigned-clocks warning)
Merging scsi-fixes/fixes (9cefd6e7e0a7 scsi: lpfc: Fix incorrect big endian type assignment in bsg loopback path)
Merging drm-fixes/drm-fixes (9930f518b6a8 Merge tag 'drm-misc-fixes-2023-06-16' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes)
Merging drm-intel-fixes/for-linux-next-fixes (858fd168a95c Linux 6.4-rc6)
Merging mmc-fixes/fixes (3c40eb814532 mmc: meson-gx: remove redundant mmc_request_done() call from irq context)
Merging rtc-fixes/rtc-fixes (08279468a294 rtc: sunplus: fix format string for printing resource)
Merging gnss-fixes/gnss-linus (44c026a73be8 Linux 6.4-rc3)
Merging hyperv-fixes/hyperv-fixes (067d6ec7ed5b PCI: hv: Add a per-bus mutex state_lock)
Merging soc-fsl-fixes/fix (4b0986a3613c Linux 5.18)
Merging risc-v-fixes/fixes (b104dbedbe61 Documentation: RISC-V: patch-acceptance: mention patchwork's role)
Merging riscv-dt-fixes/riscv-dt-fixes (ac9a78681b92 Linux 6.4-rc1)
Merging riscv-soc-fixes/riscv-soc-fixes (a7a041f2ddf3 soc: microchip: mpfs: handle failed system service requests)
Merging fpga-fixes/fixes (44c026a73be8 Linux 6.4-rc3)
Merging spdx/spdx-linus (9561de3a55be Linux 6.4-rc5)
Merging gpio-brgl-fixes/gpio/for-current (c1bcb976d8fe gpio: sifive: add missing check for platform_get_irq)
Merging gpio-intel-fixes/fixes (ac9a78681b92 Linux 6.4-rc1)
Merging pinctrl-intel-fixes/fixes (7877cb91f108 Linux 6.4-rc4)
Merging erofs-fixes/fixes (7877cb91f108 Linux 6.4-rc4)
Merging kunit-fixes/kunit-fixes (ac9a78681b92 Linux 6.4-rc1)
Merging ubifs-fixes/fixes (2241ab53cbb5 Linux 6.2-rc5)
Merging memblock-fixes/fixes (647037adcad0 Revert "mm: Always release pages to the buddy allocator in memblock_free_late().")
Merging nfsd-fixes/nfsd-fixes (c034203b6a9d nfsd: fix double fget() bug in __write_ports_addfd())
Merging irqchip-fixes/irq/irqchip-fixes (91539341a3b6 irqchip/gic: Correctly validate OF quirk descriptors)
Merging renesas-fixes/fixes (ab2866f12ca1 arm64: dts: renesas: r8a779g0: Fix HSCIF0 interrupt number)
Merging broadcom-fixes/fixes (9abf2313adc1 Linux 6.1-rc1)
Merging perf-current/perf-tools (b6dad5178cea Merge tag 'nios2_fix_v6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux)
Merging efi-fixes/urgent (36e4fc57fc16 efi: Bump stub image version for macOS HVF compatibility)
Merging zstd-fixes/zstd-linus (6906598f1ce9 zstd: Fix definition of assert())
Merging battery-fixes/fixes (95339f40a8b6 power: supply: Fix logic checking if system is running from battery)
Merging uml-fixes/fixes (73a23d771033 um: harddog: fix modular build)
Merging asahi-soc-fixes/asahi-soc/fixes (568035b01cfb Linux 6.0-rc1)
Merging iommufd-fixes/for-rc (f1fcbaa18b28 Linux 6.4-rc2)
Merging rust-fixes/rust-fixes (ac9a78681b92 Linux 6.4-rc1)
Merging v9fs-fixes/fixes/next (36896bc97c0e fs/9p: Fix a datatype used with V9FS_DIRECT_IO)
Merging w1-fixes/fixes (ac9a78681b92 Linux 6.4-rc1)
Merging drm-misc-fixes/for-linux-next-fixes (55b94bb8c424 drm/nouveau: add nv_encoder pointer check for NULL)
Merging mm-stable/mm-stable (a6e79df92e4a mm/gup: disallow FOLL_LONGTERM GUP-fast writing to file-backed mappings)
Merging mm-nonmm-stable/mm-nonmm-stable (a94181ec064b syscalls: add sys_ni_posix_timers prototype)
Merging mm/mm-everything (915eac6baa67 Merge branch 'mm-nonmm-unstable' into mm-everything)
CONFLICT (content): Merge conflict in mm/mmap.c
Merging kbuild/for-next (9ac40f75debf linux/export.h: rename 'sec' argument to 'license')
Merging clang-format/clang-format (781121a7f6d1 clang-format: Fix space after for_each macros)
Merging perf/perf-tools-next (82fe2e45cdb0 perf pmus: Check if we can encode the PMU number in perf_event_attr.type)
Merging compiler-attributes/compiler-attributes (eeac8ede1755 Linux 6.3-rc2)
Merging dma-mapping/for-next (0a2f6372a43f drm/nouveau: stop using is_swiotlb_active)
Merging asm-generic/master (3b1ddbb62e7e Merge tag 'virt-to-pfn-for-arch-v6.5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator into asm-generic)
Merging arc/for-next (f2906aa86338 Linux 5.19-rc1)
Merging arm/for-next (fc6750b0d4a9 Merge branches 'misc' and 'fixes' into for-next)
Merging arm64/for-next/core (ba1f729d5740 Merge branch 'for-next/feat_s1pie' into for-next/core)
Merging arm-perf/for-next/perf (ea8d1c062a0e docs: perf: Add new description for HiSilicon UC PMU)
Merging arm-soc/for-next (75b5a265036c Merge branch 'arm/fixes' into for-next)
Merging amlogic/for-next (b857a3593956 Merge branch 'v6.5/arm64-dt' into for-next)
Merging asahi-soc/asahi-soc/for-next (eaf935fa48ec soc: apple: mailbox: Rename config symbol to APPLE_MAILBOX)
Merging aspeed/for-next (7d4f0b0df7c5 ARM: dts: aspeed-g6: Add UDMA node)
Merging at91/at91-next (9c8457a847fa Merge branch 'clk-microchip' into at91-next)
Merging broadcom/next (3d86637615ea Merge branch 'devicetree/next' into next)
CONFLICT (content): Merge conflict in MAINTAINERS
Merging davinci/davinci/for-next (ac9a78681b92 Linux 6.4-rc1)
Merging drivers-memory/for-next (6a66fb9ffe7b dt-bindings: memory-controllers: drop unneeded quotes)
Merging imx-mxs/for-next (89c016c82e46 Merge branch 'imx/defconfig' into for-next)
Merging mediatek/for-next (f6925844c82a Merge branch 'v6.4-next/soc' into for-next)
Merging mvebu/for-next (703b10801b44 Merge branch 'mvebu/dt64' into mvebu/for-next)
Merging omap/for-next (f581c395fcb8 Merge branches 'omap-for-v6.5/ti-sysc' and 'omap-for-v6.5/cleanup' into for-next)
Merging qcom/for-next (a4a7415fec01 Merge branches 'arm64-defconfig-for-6.5', 'arm64-fixes-for-6.4', 'arm64-for-6.5', 'clk-for-6.5', 'drivers-fixes-for-6.4', 'drivers-for-6.5', 'dts-fixes-for-6.4' and 'dts-for-6.5' into for-next)
Merging renesas/next (7762defcdaf0 Merge branch 'renesas-drivers-for-v6.5' into renesas-next)
Merging reset/reset/next (afb39e2bd36a reset: mpfs: select AUXILIARY_BUS)
Merging rockchip/for-next (dd738a0f90f7 Merge branch 'v6.5-armsoc/dts64' into for-next)
Merging samsung-krzk/for-next (878094dcccc3 Merge branch 'next/clk' into for-next)
Merging scmi/for-linux-next (83ff850e73ba Merge tag 'scmi-updates-6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next)
Merging stm32/stm32-next (c9cb7e72e293 MAINTAINERS: add entry for ARM/STM32 ARCHITECTURE)
Merging sunxi/sunxi/for-next (1bcb932283c9 Merge branch 'sunxi/dt-for-6.5' into sunxi/for-next)
Merging tee/next (6a8b7e801054 tee: optee: Use kmemdup() to replace kmalloc + memcpy)
Merging tegra/for-next (d7e22e94908d Merge branch for-6.5/arm64/dt into for-next)
Merging ti/ti-next (b0f8e128b3b4 Merge branch 'ti-k3-config-next' into ti-next)
Merging xilinx/for-next (a736607599a5 Merge branch 'zynqmp/soc' into for-next)
Merging clk/clk-next (8979618ba37e Merge branch 'clk-bindings' into clk-next)
Merging clk-imx/for-next (878b02d5f3b5 clk: imx: clk-imx8mp: improve error handling in imx8mp_clocks_probe())
Merging clk-renesas/renesas-clk (7df8eea64a41 clk: renesas: rzg2l: Convert to readl_poll_timeout_atomic())
Merging clk-samsung/for-next (b35f27fe73d8 clk: samsung: exynosautov9: add cmu_peric1 clock support)
Merging csky/linux-next (dd64621a2a97 csky: uprobes: Restore thread.trap_no)
Merging loongarch/loongarch-next (47e1ed2a5b9d LoongArch: Update Loongson-3 default config file)
Merging m68k/for-next (4055eabe04a2 m68k: defconfig: Update defconfigs for v6.4-rc1)
Merging m68knommu/for-next (858fd168a95c Linux 6.4-rc6)
Merging microblaze/next (fe15c26ee26e Linux 6.3-rc1)
Merging mips/mips-next (5cad8323040b mips: dts: ralink: mt7628a: Unify pinctrl-single pin group nodes)
Merging openrisc/for-next (c91b4a07655d openrisc: Add floating point regset)
Merging parisc-hd/for-next (b623c8436064 parisc: Add cacheflush() syscall)
Merging powerpc/next (7a313166d7dd powerpc: update ppc_save_regs to save current r1 in pt_regs)
Merging soc-fsl/next (fb9c384625dd bus: fsl-mc: fsl-mc-allocator: Drop a write-only variable)
Merging risc-v/for-next (d5e45e810e0e Merge patch series "riscv: Add vector ISA support")
CONFLICT (content): Merge conflict in MAINTAINERS
Merging riscv-dt/riscv-dt-for-next (c1362fd0f2fd Merge patch series "Add Sipeed Lichee Pi 4A RISC-V board support")
Merging riscv-soc/riscv-soc-for-next (ac9a78681b92 Linux 6.4-rc1)
Merging s390/for-next (c561c922e242 Merge branch 'features' into for-next)
Merging sh/for-next (a8ac2961148e sh: Avoid using IRQ0 on SH3 and SH4)
Merging uml/next (6032aca0deb9 um: make stub data pages size tweakable)
Merging xtensa/xtensa-for-next (f29cf77609cc xtensa: add load/store exception handler)
Merging pidfd/for-next (757777eef55b pid: Replace struct pid 1-element array with flex-array)
Merging fscrypt/for-next (d617ef039fb8 fscrypt: Replace 1-element array with flexible array)
Merging fscache/fscache-next (0885eacdc81f Merge tag 'nfsd-5.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux)
Merging afs/afs-next (0a278bc196e7 afs: Automatically generate trace tag enums)
Merging btrfs/for-next (a548b7ac767c Merge branch 'for-next-next-v6.4-20230616' into for-next-20230616)
CONFLICT (content): Merge conflict in fs/btrfs/file.c
Merging ceph/master (409e873ea3c1 ceph: fix use-after-free bug for inodes when flushing capsnaps)
Merging cifs/for-next (78491ea33d81 cifs: print nosharesock value while dumping mount options)
Merging configfs/for-next (77992f896745 configfs: remove mentions of committable items)
Merging ecryptfs/next (a3d78fe3e1ae fs: ecryptfs: comment typo fix)
Merging erofs/dev (30a33dc4a7d1 erofs: clean up zmap.c)
Merging exfat/dev (fe15c26ee26e Linux 6.3-rc1)
Merging ext3/for_next (15bb03a6c517 Pull cleanup of fsnotify_open() callsites.)
Merging ext4/dev (63ec000b35a3 ext4: refactoring to use the unified helper ext4_quotas_off())
Merging f2fs/dev (71a1277a46da f2fs: remove redundant assignment to variable err)
CONFLICT (content): Merge conflict in fs/f2fs/file.c
Merging fsverity/for-next (74836ecbc5c7 fsverity: rework fsverity_get_digest() again)
Merging fuse/for-next (c68ea140050e fuse: remove duplicate check for nodeid)
Merging gfs2/for-next (0a7aaa252413 gfs2: gfs2_freeze_lock_shared cleanup)
Merging jfs/jfs-next (fad376fce0af fs/jfs: fix shift exponent db_agl2size negative)
Merging ksmbd/ksmbd-for-next (7a4f1b513a70 ksmbd: Replace the ternary conditional operator with min())
Merging nfs/linux-next (9561de3a55be Linux 6.4-rc5)
Merging nfs-anna/linux-next (43439d858bba NFSv4.2: Fix a potential double free with READ_PLUS)
Merging nfsd/nfsd-next (88770b8de38e svcrdma: Fix stale comment)
Merging ntfs3/master (1f60ec888102 fs/ntfs3: Add support /proc/fs/ntfs3/<dev>/volinfo and /proc/fs/ntfs3/<dev>/label)
Merging orangefs/for-next (31720a2b109b orangefs: Fix kmemleak in orangefs_{kernel,client}_debug_init())
Merging overlayfs/overlayfs-next (98dd4b4b70ab ovl: modify layer parameter parsing)
Merging ubifs/next (b5fda08ef213 ubifs: Fix memleak when insert_old_idx() failed)
Merging v9fs/9p-next (4ec5183ec486 Linux 6.2-rc7)
Merging v9fs-ericvh/ericvh/for-next (ac9a78681b92 Linux 6.4-rc1)
Merging xfs/for-next (c3b880acadc9 xfs: fix ag count overflow during growfs)
Merging zonefs/for-next (8812387d0569 zonefs: set FMODE_CAN_ODIRECT instead of a dummy direct_IO method)
Merging iomap/iomap-for-next (3fd41721cd5c iomap: Add DIO tracepoints)
Merging djw-vfs/vfs-for-next (a79168a0c00d fs/remap_range: avoid spurious writeback on zero length request)
Merging file-locks/locks-next (63355b9884b3 cpumask: be more careful with 'cpumask_setall()')
Merging iversion/iversion-next (63355b9884b3 cpumask: be more careful with 'cpumask_setall()')
Merging vfs-brauner/vfs.all (27648ae8b791 Merge branches 'vfs.misc', 'v6.5/vfs.mount', 'fs.ntfs', 'vfs.rename.locking' and 'vfs.backing.file' into vfs.all)
Merging vfs/for-next (cff4b23c731a Merge branch 'work.lock_rename_child' into for-next)
Merging printk/for-next (16bff6f075a1 Merge branch 'for-6.4' into for-next)
Merging pci/next (5b9283e1ec21 Merge branch 'pci/controller/endpoint')
Merging pstore/for-next/pstore (d97038d5ec20 pstore/ram: Add check for kstrdup)
Merging hid/for-next (e2cbca364fe7 Merge branch 'for-6.4/upstream-fixes' into for-next)
Merging i2c/i2c/for-next (8e5b414887ab Merge branch 'i2c/for-mergewindow' into i2c/for-next)
Merging i3c/i3c/next (49b472ebc61d i3c: master: svc: add NACK check after start byte sent)
Merging dmi/dmi-for-next (13a0ac816d22 firmware: dmi: Fortify entry point length checks)
Merging hwmon-staging/hwmon-next (37f665ffa886 hwmon: (oxp-sensors) Simplify logic of error return)
Merging jc_docs/docs-next (1771aa9dc923 Merge branch 'arch-arm' into docs-next)
Merging v4l-dvb/master (be9aac187433 Merge tag 'v6.4-rc5' into media_stage)
Merging v4l-dvb-next/master (57713028261e Merge tag 'br-v6.5h' of git://linuxtv.org/hverkuil/media_tree into media_stage)
Merging pm/linux-next (cfe5d922f964 Merge branch 'thermal-intel-fixes' into linux-next)
Merging cpufreq-arm/cpufreq/arm/linux-next (3b062a086984 cpufreq: dt-platdev: Support building as module)
Merging cpupower/cpupower (25891bc945f7 cpupower: Bump soname version)
Merging devfreq/devfreq-next (a83bfdca8b20 PM / devfreq: mtk-cci: Fix variable deferencing before NULL check)
Merging opp/opp/linux-next (1ff98cf7a893 OPP: Simplify the over-designed pstate <-> level dance)
Merging thermal/thermal/linux-next (c6872f3055ab thermal/drivers/mediatek/lvts_thermal: Register thermal zones as hwmon sensors)
Merging dlm/next (1696c75f1864 fs: dlm: add send ack threshold and append acks to msgs)
Merging rdma/for-next (830f93f47068 RDMA/bnxt_re: optimize the parameters passed to helper functions)
Merging net-next/main (9a94d764e9bc Merge tag 'mlx5-updates-2023-06-16' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux)
CONFLICT (content): Merge conflict in fs/netfs/iterator.c
CONFLICT (content): Merge conflict in tools/testing/selftests/net/fcnal-test.sh
Applying: fix up for "Move netfs_extract_iter_to_sg() to lib/scatterlist.c"
Merging bpf-next/for-next (ab5d47bd41b1 bpf: Remove in_atomic() from bpf_link_put().)
Merging ipsec-next/master (a94fd40a18ae xfrm: delete not-needed clear to zero of encap_oa)
Merging mlx5-next/mlx5-next (77f7eb9f3416 net/mlx5: Introduce other vport query for Q-counters)
Merging netfilter-next/master (677fb7525331 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
Merging ipvs-next/main (4f325e26277b ipvs: dynamically limit the connection hash table)
Merging bluetooth/master (817efd3cad74 Bluetooth: hci_sock: Forward credentials to monitor)
CONFLICT (content): Merge conflict in net/bluetooth/hci_event.c
Applying: Revert "Bluetooth: hci_sock: Forward credentials to monitor"
Merging wireless-next/for-next (707a13c7e488 wifi: ray_cs: fix stringop-truncation GCC warning)
Merging wpan-next/master (1af3de62f03f ieee802154: ca8210: Flag the driver as being limited)
Merging wpan-staging/staging (18b849f12dcc ieee802154: ca8210: Remove stray gpiod_unexport() call)
Merging mtd/mtd/next (3b270fac8443 mtd: otp: Put factory OTP/NVRAM into the entropy pool)
Merging nand/nand/next (46c37b99b5cb mtd: rawnand: meson: check buffer length)
Merging spi-nor/spi-nor/next (df6def86b9dc mtd: spi-nor: spansion: Add support for s25hl02gt and s25hs02gt)
Merging crypto/master (d614dcb225a8 crypto: qat - do not export adf_init_admin_pm())
Merging drm/drm-next (e245db7b1451 Merge tag 'mediatek-drm-next-6.5' of https://git.kernel.org/pub/scm/linux/kernel/git/chunkuang.hu/linux into drm-next)
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/jpeg_v4_0.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_hdcp.c
Merging drm-misc/for-linux-next (cf683e8870bd fbdev: Use /* */ comment in initializer macro)
Merging amdgpu/drm-next (72f1de49ffb9 drm/dp_mst: Clear MSG_RDY flag before sending new message)
Merging drm-intel/for-linux-next (783d8b80871f drm/i915/psr: Re-enable PSR1 on hsw/bdw)
Merging drm-tegra/for-next (2429b3c529da drm/tegra: Avoid potential 32-bit integer overflow)
Merging drm-msm/msm-next (cd036d542afb drm/msm/a6xx: Add A610 speedbin support)
Merging drm-msm-lumag/msm-next-lumag (452c46ccf603 drm/msm/dsi: split dsi_ctrl_config() function)
Merging imx-drm/imx-drm/next (927d8fd465ad drm/imx: ipuv3-plane: Remove redundant color encoding and range initialisation)
Merging etnaviv/etnaviv/next (4c22c61e429f drm/etnaviv: show number of NN cores in GPU debugfs info)
Merging fbdev/for-next (79a3908d1ea6 fbdev: omapfb: lcd_mipid: Fix an error handling path in mipid_spi_probe())
Merging regmap/for-next (6c983a49150e Merge remote-tracking branch 'regmap/for-6.5' into regmap-next)
Merging sound/for-next (79597c8bf64c ALSA: ac97: Fix possible NULL dereference in snd_ac97_mixer)
CONFLICT (content): Merge conflict in include/linux/pci_ids.h
Merging ieee1394/for-next (06f45435d985 firewire: core: obsolete usage of GFP_ATOMIC at building node tree)
Merging sound-asoc/for-next (0f00a3fa5ac9 ASoC: SOF: misc updates for 6.5)
Merging modules/modules-next (0eeaf1eb40a3 kallsyms: make kallsyms_show_value() as generic function)
Merging input/next (8c9cce9cb81b Input: pm8941-powerkey - fix debounce on gen2+ PMICs)
Merging block/for-next (3655f73d1af3 Merge branch 'for-6.5/block' into for-next)
CONFLICT (content): Merge conflict in fs/ext4/super.c
CONFLICT (content): Merge conflict in fs/splice.c
CONFLICT (content): Merge conflict in include/linux/mm.h
CONFLICT (content): Merge conflict in mm/gup.c
Merging device-mapper/for-next (fa375646241b dm thin: disable discards for thin-pool if no_discard_passdown)
CONFLICT (content): Merge conflict in drivers/md/dm-thin-metadata.c
Merging libata/for-next (0515fca29707 ata: ahci_octeon: Remove unnecessary include)
Merging pcmcia/pcmcia-next (15e74c6c1ce2 pcmcia: remove AT91RM9200 Compact Flash driver)
Merging mmc/next (ae6a2c44052f mmc: Merge branch fixes into next)
Merging mfd/for-mfd-next (d918e0d58244 mfd: intel-lpss: Add missing check for platform_get_resource)
Merging backlight/for-backlight-next (a8b09e6fe3ee dt-bindings: backlight: pwm: Make power-supply not required)
Merging battery/for-next (4dea2fd6e83c power: reset: qcom-pon: add support for pm8941-pon)
Merging regulator/for-next (bf307cc41231 Merge remote-tracking branch 'regulator/for-6.5' into regulator-next)
Merging security/next (b432b5517644 MAINTAINERS: move labeled networking to "supported")
Merging apparmor/apparmor-next (e31dd6e412f7 apparmor: fix: kzalloc perms tables for shared dfas)
Merging integrity/next-integrity (95526d13038c ima: Fix build warnings)
Merging safesetid/safesetid-next (64b634830c91 LSM: SafeSetID: add setgroups() testing to selftest)
Merging selinux/next (447a5688005e selinux: avoid bool as identifier name)
CONFLICT (content): Merge conflict in security/selinux/Makefile
Merging smack/next (2c085f3a8f23 smack: Record transmuting in smk_transmuted)
Merging tomoyo/master (e52fa5e9fbe1 workqueue: Warn attempt to flush system-wide workqueues.)
Merging tpmdd/next (bcd6987b87b1 tpm: Switch i2c drivers back to use .probe())
Merging watchdog/master (fc4354c6e5c2 Merge tag 'mm-stable-2023-05-06-10-49' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm)
Merging iommu/next (fe420865bd74 Merge branches 'arm/smmu', 'ppc/pamu', 'virtio', 'x86/amd' and 'core' into next)
Merging audit/next (e455ca40dbcf audit: avoid missing-prototype warnings)
Merging devicetree/for-next (800e75245ba7 dt-bindings: Remove last usage of "binding" or "schema" in titles)
Merging dt-krzk/for-next (0ff3c07556e6 Merge branch 'next/dt64' into for-next)
Merging mailbox/mailbox-for-next (8fe72b76db79 mailbox: mailbox-test: fix a locking issue in mbox_test_message_write())
Merging spi/for-next (5f18392ba2fa Merge remote-tracking branch 'spi/for-6.5' into spi-next)
Merging tip/master (e00a68bc1301 Merge x86/mtrr into tip/master)
CONFLICT (content): Merge conflict in tools/objtool/check.c
CONFLICT (content): Merge conflict in tools/perf/arch/x86/include/arch-tests.h
CONFLICT (content): Merge conflict in tools/perf/arch/x86/tests/arch-tests.c
Applying: perf test amd: Fix build failure with amd-ibs-via-core-pmu.c
Applying: fix up for "objtool: Move noreturn function list to separate file"
Merging clockevents/timers/drivers/next (158009f1b4a3 timekeeping: Fix references to nonexistent ktime_get_fast_ns())
Merging edac/edac-for-next (852667c317ae Merge ras/edac-drivers into for-next)
Merging irqchip/irq/irqchip-next (70321006be5d Merge branch irq/misc-6.5 into irq/irqchip-next)
Merging ftrace/for-next (3862f86c1529 Merge tools/for-next)
Merging rcu/rcu/next (b9c333248913 Docs/RCU/rculist_nulls: Fix text discussing atomic_set_release())
Applying: fixup for "RDMA/rxe: Add error messages"
Merging kvm/next (39428f6ea9ea Merge tag 'kvmarm-fixes-6.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD)
Merging kvm-arm/next (e1e315c4d528 Merge branch kvm-arm64/misc into kvmarm/next)
CONFLICT (content): Merge conflict in arch/arm64/kernel/cpufeature.c
Merging kvms390/next (4551948e1e18 KVM: s390: vsie: fix the length of APCB bitmap)
Merging kvm-riscv/riscv_kvm_next (188595b8464f riscv: kvm: define vcpu_sbi_ext_pmu in header)
CONFLICT (content): Merge conflict in arch/riscv/include/uapi/asm/kvm.h
Merging kvm-x86/next (337ebecc1b25 Merge branches 'generic', 'misc', 'mmu', 'selftests', 'svm', 'vmx' and 'pmu')
Merging xen-tip/linux-next (8225b0e17c07 x86: xen: add missing prototypes)
Merging percpu/for-next (b9819165bb45 Merge branch 'for-6.2' into for-next)
Merging workqueues/for-next (ee360b1c5001 Merge branch 'for-6.5-cleanup-ordered' into for-next)
Merging drivers-x86/for-next (669f1f48b07f platform/x86: apple-gmux: don't use be32_to_cpu and cpu_to_be32)
Merging chrome-platform/for-next (2b8cc5858a07 platform/chrome: cros_ec_spi: Use %*ph for printing hexdump of a small buffer)
Merging hsi/for-next (42877c38ac78 HSI: omap_ssi_port: Drop error checking for debugfs_create_dir)
Merging leds/for-next (1b929c02afd3 Linux 6.2-rc1)
Merging leds-lj/for-leds-next (e338a05e76ca dt-bindings: leds: Add binding for AW200xx)
Merging ipmi/for-next (02210d52641a dt-bindings: ipmi: aspeed,ast2400-kcs-bmc: drop unneeded quotes)
Merging driver-core/driver-core-next (a91845b9a872 sysfs: Skip empty folders creation)
Merging usb/usb-next (88d8f3ac9c67 usb: typec: add support for the nb7vpq904m Type-C Linear Redriver)
Merging thunderbolt/next (481012b479fe thunderbolt: Add test case for 3 DisplayPort tunnels)
Merging usb-serial/usb-next (c9d934053d9e USB: serial: report unsupported break signalling)
Merging tty/tty-next (e8cc334847db selftests: tty: add selftest for tty timestamp updates)
Merging char-misc/char-misc-next (74a81c4854a8 char: xilinx_hwicap: Convert to platform remove callback returning void)
Merging accel/habanalabs-next (e6f49e96bc57 accel/habanalabs: refactor error info reset)
Merging coresight/next (3b79104f8003 Documentation: trace: Add documentation for Coresight Dummy Trace)
Merging fastrpc/for-next (ac9a78681b92 Linux 6.4-rc1)
Merging fpga/for-next (47147d56f92e fpga: zynq-fpga: Ensure proper xCAP interface switch)
Merging icc/icc-next (1400725e4515 Merge branch 'icc-qos' into icc-next)
Merging iio/togreg (9e66fb524495 samples: Add userspace example for TI TPS6594 PFSM)
Merging phy-next/next (1eac0f956608 dt-bindings: phy: qcom,qmp-usb: fix bindings error)
Merging soundwire/next (038306aabee6 soundwire: debugfs: Add missing SCP registers)
Merging extcon/extcon-next (94da3da96c35 dt-bindings: extcon: wlf,arizona: drop unneeded quotes)
Merging gnss/gnss-next (44c026a73be8 Linux 6.4-rc3)
Merging vfio/next (234489ac5613 vfio/cdx: add support for CDX bus)
Merging w1/for-next (b332af5398a3 w1: Replace usage of found with dedicated list iterator variable)
Merging staging/staging-next (01da3efafe06 staging: rtl8192e: Use standard api to calculate channel to frequency)
Merging counter-next/counter-next (d428487471ba counter: i8254: Introduce the Intel 8254 interface library module)
Merging mux/for-next (44c026a73be8 Linux 6.4-rc3)
Merging dmaengine/next (907514a7dc4c dmaengine: sprd: Don't set chancnt)
Merging cgroup/for-next (18740f47e5fa Merge branch 'for-6.5' into for-next)
Merging scsi/for-next (9b9561dbcb76 Merge branch 'misc' into for-next)
CONFLICT (content): Merge conflict in drivers/nvme/host/Makefile
Merging scsi-mkp/for-next (af92c02fb209 Merge patch series "scsi: fixes for targets with many LUNs, and scsi_target_block rework")
Merging vhost/linux-next (233cc7c52210 Revert "virtio-blk: support completion batching for the IRQ path")
Merging rpmsg/for-next (1ca04f21b204 remoteproc: stm32: Fix error code in stm32_rproc_parse_dt())
Merging gpio/for-next (ac9a78681b92 Linux 6.4-rc1)
Merging gpio-brgl/gpio/for-next (a1b78312ec44 dt-bindings: gpio: Add Cirrus EP93xx)
Merging gpio-intel/for-next (ac9a78681b92 Linux 6.4-rc1)
Merging pinctrl/for-next (386ea4292487 Merge branch 'devel' into for-next)
Merging pinctrl-intel/for-next (d1bfdf867d50 pinctrl: intel: refine ->irq_set_type() hook)
Merging pinctrl-renesas/renesas-pinctrl (5d32cead772c pinctrl: renesas: Fix spaces followed by tabs)
Merging pinctrl-samsung/for-next (ac9a78681b92 Linux 6.4-rc1)
Merging pwm/for-next (247ee6c78040 pwm: Remove unused radix tree)
Merging userns/for-next (05bd6e0242b4 Merge of unpriv-ipc-sysctls-for-v6.2, and fix-atomic_lock_inc_below-for-v6.2 for testing in linux-next)
Merging ktest/for-next (7dc8e24f0e09 ktest: Restore stty setting at first in dodie)
Merging kselftest/next (8cd0d8633e2d selftests/ftace: Fix KTAP output ordering)
Merging kunit/test (ac9a78681b92 Linux 6.4-rc1)
Merging kunit-next/kunit (2e66833579ed MAINTAINERS: Add source tree entry for kunit)
Merging livepatching/for-next (ac4890f97211 Merge branch 'for-6.5/core' into for-next)
Merging rtc/rtc-next (38e0689b27f8 rtc: stm32: remove dedicated wakeup management)
Merging nvdimm/libnvdimm-for-next (305a72efa791 Merge branch 'for-6.1/nvdimm' into libnvdimm-for-next)
Merging at24/at24/for-next (a3c10035d12f eeprom: at24: Use dev_err_probe for nvmem register failure)
Merging ntb/ntb-next (942cc9ceccb6 ntb: intel: Remove redundant pci_clear_master)
Merging seccomp/for-next/seccomp (0fb0624b15d2 seccomp: fix kernel-doc function name warning)
Merging fsi/next (35af9fb49bc5 fsi: core: Check error number after calling ida_simple_get)
Merging slimbus/for-next (ac9a78681b92 Linux 6.4-rc1)
Merging nvmem/for-next (ac1c0d15aedc nvmem: core: add support for fixed cells *layout*)
Merging xarray/main (69cb69ea5542 ida: Remove assertions that an ID was allocated)
Merging hyperv/hyperv-next (a494aef23dfc PCI: hv: Replace retarget_msi_interrupt_params with hyperv_pcpu_input_arg)
Merging auxdisplay/auxdisplay (def85dce1451 auxdisplay: Switch i2c drivers back to use .probe())
Merging kgdb/kgdb/for-next (c1cb81429df4 kdb: Fix the putarea helper function)
Merging hmm/hmm (ac9a78681b92 Linux 6.4-rc1)
Merging cfi/cfi/next (312310928417 Linux 5.18-rc1)
Merging mhi/mhi-next (6bb6aba2f57a bus: mhi: host: pci_generic: Add support for Quectel EM160R-GL modem)
Merging memblock/for-next (de649e7f5edb memblock: Update nid info in memblock debugfs)
Merging cxl/next (a70fc4ed20a6 cxl/port: Fix NULL pointer access in devm_cxl_add_port())
Merging zstd/zstd-next (2aa14b1ab2c4 zstd: import usptream v1.5.2)
Merging efi/next (d0a1865cf7e2 efi/esrt: Allow ESRT access without CAP_SYS_ADMIN)
Merging unicode/for-next (b500d6d7243d unicode: Handle memory allocation failures in mkutf8data)
Merging slab/for-next (7bc162d5cc4d Merge branches 'slab/for-6.5/prandom', 'slab/for-6.5/slab_no_merge' and 'slab/for-6.5/slab-deprecate' into slab/for-next)
CONFLICT (content): Merge conflict in arch/mips/configs/ci20_defconfig
CONFLICT (content): Merge conflict in mm/slab_common.c
Merging random/master (512dee0c00ad Merge tag 'x86-urgent-2023-01-04' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip)
Merging landlock/next (35ca42399297 selftests/landlock: Add hostfs tests)
Merging rust/rust-next (d2e3115d7171 rust: error: `impl Debug` for `Error` with `errname()` integration)
Merging sysctl/sysctl-next (2f2665c13af4 sysctl: replace child with an enumeration)
Merging execve/for-next/execve (36650a357eac binfmt: Slightly simplify elf_fdpic_map_file())
Merging bitmap/bitmap-for-next (714f3af11b21 cpumask: fix function description kernel-doc notation)
CONFLICT (content): Merge conflict in include/linux/cpumask.h
Merging hte/for-next (ac9a78681b92 Linux 6.4-rc1)
Merging kspp/for-next/kspp (a5a319ec2c22 um: Use HOST_DIR for mrproper)
Merging kspp-gustavo/for-next/kspp (1fa89cccd288 media: venus: hfi_cmds: Replace fake flex-arrays with flexible-array members)
Merging iommufd/for-next (f1fcbaa18b28 Linux 6.4-rc2)
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* linux-next: Tree for Jun 19
@ 2019-06-19 10:51 Stephen Rothwell
0 siblings, 0 replies; 9+ messages in thread
From: Stephen Rothwell @ 2019-06-19 10:51 UTC (permalink / raw)
To: Linux Next Mailing List; +Cc: Linux Kernel Mailing List
[-- Attachment #1: Type: text/plain, Size: 40135 bytes --]
Hi all,
Changes since 20190618:
The net-next tree gained a build failure due to an interaction with the
kbuild tree for which I applied a fix patch.
The drm tree gained a conflict against the kbuild tree.
The usb tree gained a build failure due to an interaction with the
kbuild tree for which I applied a fix patch.
The akpm-current tree gained a build failure due to an interaction with
the kbuild tree for which I reverted a commit.
Non-merge commits (relative to Linus' tree): 6431
7003 files changed, 261936 insertions(+), 218938 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, an allmodconfig for x86_64, a
multi_v7_defconfig for arm and a native build of tools/perf. After
the final fixups (if any), I do an x86_64 modules_install followed by
builds for x86_64 allnoconfig, powerpc allnoconfig (32 and 64 bit),
ppc44x_defconfig, allyesconfig and pseries_le_defconfig and i386, sparc
and sparc64 defconfig. And finally, a simple boot test of the powerpc
pseries_le_defconfig kernel in qemu (with and without kvm enabled).
Below is a summary of the state of the merge.
I am currently merging 294 trees (counting Linus' and 71 trees of bug
fix patches pending for the current merge release).
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.
--
Cheers,
Stephen Rothwell
$ git checkout master
$ git reset --hard stable
Merging origin/master (bed3c0d84e7e Merge tag 'for-5.2-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux)
Merging fixes/master (3ab4436f688c Merge tag 'nfsd-5.2-1' of git://linux-nfs.org/~bfields/linux)
Merging kspp-gustavo/for-next/kspp (034e673710d3 platform/x86: acer-wmi: Mark expected switch fall-throughs)
Merging kbuild-current/fixes (d1fdb6d8f6a4 Linux 5.2-rc4)
Merging arc-current/for-curr (d431a90c8a45 ARC: mm: do_page_fault refactor #8: release mmap_sem sooner)
Merging arm-current/fixes (e17b1af96b2a ARM: 8857/1: efi: enable CP15 DMB instructions before cleaning the cache)
Merging arm64-fixes/for-next/fixes (615c48ad8f42 arm64/mm: don't initialize pgd_cache twice)
Merging m68k-current/for-linus (fdd20ec8786a Documentation/features/time: Mark m68k having modern-timekeeping)
Merging powerpc-fixes/fixes (82f6e266f812 powerpc/32: fix build failure on book3e with KVM)
Merging s390-fixes/fixes (11aff183225c vfio-ccw: Destroy kmem cache region on module exit)
Merging sparc/master (15d5dfaf4adb sparc: fix unknown type name u_int in uapi header)
Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2)
Merging net/master (72b319dc08b4 tun: wake up waitqueues after IFF_UP is set)
Merging bpf/master (56f0f84e69c7 bpf: fix the check that forwarding is enabled in bpf_ipv6_fib_lookup)
Merging ipsec/master (b8d6d0079757 xfrm: fix sa selector validation)
Merging netfilter/master (8a3dca632538 netfilter: ipv6: nf_defrag: accept duplicate fragments again)
Merging ipvs/master (58e8b37069ff Merge branch 'net-phy-dp83867-add-some-fixes')
Merging wireless-drivers/master (69ae4f6aac15 mwifiex: Fix heap overflow in mwifiex_uap_parse_tail_ies())
Merging mac80211/master (6be8e297f9bc lapb: fixed leak of control-blocks.)
Merging rdma-fixes/for-rc (cc78076af14e IB/hfi1: Correct tid qp rcd to match verbs context)
Merging sound-current/for-linus (17d304604a88 Revert "ALSA: hda/realtek - Improve the headset mic for Acer Aspire laptops")
Merging sound-asoc-fixes/for-linus (88fbd9343adc Merge branch 'asoc-5.2' into asoc-linus)
Merging regmap-fixes/for-linus (2217d05161cb Merge branch 'regmap-5.2' into regmap-linus)
Merging regulator-fixes/for-linus (9e0babf2c06c Linux 5.2-rc5)
Merging spi-fixes/for-linus (ca4ad992582c Merge branch 'spi-5.2' into spi-linus)
Merging pci-current/for-linus (a188339ca5a3 Linux 5.2-rc1)
Merging driver-core.current/driver-core-linus (f2c7c76c5d0a Linux 5.2-rc3)
Merging tty.current/tty-linus (f2c7c76c5d0a Linux 5.2-rc3)
Merging usb.current/usb-linus (ddd57980a0fd xhci: detect USB 3.2 capable host controllers correctly)
Merging usb-gadget-fixes/fixes (42cc68868ce9 usb: gadget: udc: lpc32xx: fix return value check in lpc32xx_udc_probe())
Merging usb-serial-fixes/usb-linus (f3dfd4072c3e USB: serial: option: add Telit 0x1260 and 0x1261 compositions)
Merging usb-chipidea-fixes/ci-for-usb-stable (16009db47c51 usb: chipidea: udc: workaround for endpoint conflict issue)
Merging phy/fixes (ada28f7b3a97 phy: tegra: xusb: Add Tegra210 PLL power supplies)
Merging staging.current/staging-linus (9b9410766f54 Merge branch 'erofs_fix' into staging-linus)
Merging char-misc.current/char-misc-linus (a370003cc301 binder: fix possible UAF when freeing buffer)
Merging soundwire-fixes/fixes (39194128701b soundwire: intel: set dai min and max channels correctly)
Merging thunderbolt-fixes/fixes (0d53827d7c17 thunderbolt: Implement CIO reset correctly for Titan Ridge)
Merging input-current/for-linus (9843f3e08e21 Input: synaptics - enable SMBus on ThinkPad E480 and E580)
Merging crypto-current/master (7829a0c1cb9c crypto: hmac - fix memory leak in hmac_init_tfm())
Merging ide/master (54dee406374c Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux)
Merging vfio-fixes/for-linus (5715c4dd66a3 vfio/mdev: Synchronize device create/remove with parent removal)
Merging kselftest-fixes/fixes (e2e88325f4bc selftests: vm: Fix test build failure when built by itself)
Merging modules-fixes/modules-linus (be71eda5383f module: Fix display of wrong module .text address)
Merging slave-dma-fixes/fixes (d1fdb6d8f6a4 Linux 5.2-rc4)
Merging backlight-fixes/for-backlight-fixes (e93c9c99a629 Linux 5.1)
Merging mtd-fixes/mtd/fixes (b2b5921fe4b3 mtd: rawnand: initialize ntargets with maxchips)
Merging mfd-fixes/for-mfd-fixes (cd49b84d61b2 mfd: stmfx: Uninitialized variable in stmfx_irq_handler())
Merging v4l-dvb-fixes/fixes (a200c721956c media: venus: hfi_parser: fix a regression in parser)
Merging reset-fixes/reset/fixes (d5d4218e1669 reset: remove redundant null check on pointer dev)
Merging mips-fixes/mips-fixes (d6ed083f5cc6 MIPS: Fix bounds check virt_addr_valid)
Merging at91-fixes/at91-fixes (ba5e60c9b75d arm/mach-at91/pm : fix possible object reference leak)
Merging omap-fixes/fixes (f6192c664e21 Merge commit '79499bb11db508' into fixes)
Merging kvm-fixes/master (f8d221d2e0e1 Merge tag 'kvm-s390-master-5.2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into kvm-master)
Merging kvms390-fixes/master (a86cb413f4bf KVM: s390: Do not report unusabled IDs via KVM_CAP_MAX_VCPU_ID)
Merging hwmon-fixes/hwmon (48b5b6d53b28 hwmon: (pwm-fan) Check return value from devm_add_action_or_reset)
Merging nvdimm-fixes/libnvdimm-fixes (52f476a323f9 libnvdimm/pmem: Bypass CONFIG_HARDENED_USERCOPY overhead)
Merging btrfs-fixes/next-fixes (02252ea054b8 Merge branch 'misc-5.2' into next-fixes)
Merging vfs-fixes/fixes (d728cf79164b fs/namespace: fix unprivileged mount propagation)
Merging dma-mapping-fixes/for-linus (8c5165430c01 dma-debug: only skip one stackframe entry)
Merging i3c-fixes/master (709a53e19484 MAINTAINERS: Fix the I3C entry)
Merging drivers-x86-fixes/fixes (9e0babf2c06c Linux 5.2-rc5)
Merging samsung-krzk-fixes/fixes (a188339ca5a3 Linux 5.2-rc1)
Merging pinctrl-samsung-fixes/pinctrl-fixes (a188339ca5a3 Linux 5.2-rc1)
Merging devicetree-fixes/dt/linus (852d095d16a6 checkpatch.pl: Update DT vendor prefix check)
Merging scsi-fixes/fixes (625d7d351887 scsi: hpsa: correct ioaccel2 chaining)
Merging drm-fixes/drm-fixes (e14c5873d2a3 Merge branch 'drm-fixes-5.2' of git://people.freedesktop.org/~agd5f/linux into drm-fixes)
Merging amdgpu-fixes/drm-fixes (c08e56c647ba drm/amd/display: Don't load DMCU for Raven 1 (v2))
Merging drm-intel-fixes/for-linux-next-fixes (9e0babf2c06c Linux 5.2-rc5)
Merging mmc-fixes/fixes (83293386bc95 mmc: core: Prevent processing SDIO IRQs when the card is suspended)
Merging rtc-fixes/rtc-fixes (a188339ca5a3 Linux 5.2-rc1)
Merging gnss-fixes/gnss-linus (f2c7c76c5d0a Linux 5.2-rc3)
Merging hyperv-fixes/hyperv-fixes (01e7d61b8ace PCI: hv: Detect and fix Hyper-V PCI domain number collision)
Merging soc-fsl-fixes/fix (5674a92ca4b7 soc/fsl/qe: Fix an error code in qe_pin_request())
Merging risc-v-fixes/fixes (259931fd3b96 riscv: remove unused barrier defines)
Merging drm-misc-fixes/for-linux-next-fixes (74b67efa8d7b drm: return -EFAULT if copy_to_user() fails)
Merging kbuild/for-next (fdbbd6421d2e Merge branch 'kbuild' into for-next)
Merging compiler-attributes/compiler-attributes (a188339ca5a3 Linux 5.2-rc1)
Merging leaks/leaks-next (9e98c678c2d6 Linux 5.1-rc1)
Merging dma-mapping/for-next (591fcf3b301b iommu/dma: Apply dma_{alloc,free}_contiguous functions)
CONFLICT (content): Merge conflict in include/linux/genalloc.h
Merging asm-generic/master (6edd1dbace0e asm-generic: optimize generic uaccess for 8-byte loads and stores)
Merging arc/for-next (1a42d1d8c766 ARCv2: entry: simplify return to Delay Slot via interrupt)
Merging arm/for-next (2257962024da Merge commit commit 'drm-armada-devel^{/drm/armada: no need to check parent of remote}' into for-next)
Merging arm64/for-next/core (8f5c9037a55b arm64/mm: Correct the cache line size warning with non coherent device)
CONFLICT (content): Merge conflict in arch/arm64/include/asm/thread_info.h
Merging arm-perf/for-next/perf (ae9924667a7e MAINTAINERS: Add maintainer entry for the imx8 DDR PMU driver)
Merging arm-soc/for-next (e57f4f2c4506 ARM: Document merges)
Merging actions/for-next (fb9c1c1deb5e Merge branch 'v4.20/drivers+s900-sps' into next)
Merging amlogic/for-next (cfda88bf7f1c Merge branch 'v5.3/drivers' into tmp/aml-rebuild)
Merging aspeed/for-next (17fb539a4603 Merge branches 'dt-for-v5.3' and 'soc-for-v5.3' into for-next)
Merging at91/at91-next (32dfd9cfa4c6 Merge branch 'at91-dt' into at91-next)
Merging bcm2835/for-next (08e3c4158538 ARM: bcm283x: Enable DMA support for SPI controller)
Merging imx-mxs/for-next (beb58dd364d3 Merge branch 'imx/defconfig' into for-next)
Merging keystone/next (39c69ae7ef17 Merge tag 'drivers_soc_for_5.3' into next)
Merging mediatek/for-next (73ade6a62931 Merge branch 'v5.1-next/soc' into for-next)
Merging mvebu/for-next (03fb10f2128a Merge branch 'mvebu/dt64' into mvebu/for-next)
Merging omap/for-next (1e16bc075913 Merge branch 'fixes' into for-next)
Merging qcom/for-next (7aea6f1c7660 Merge branches 'arm64-for-5.3', 'drivers-for-5.3' and 'dts-for-5.3' into for-next)
Merging renesas/next (6cf0b47ff724 Merge branch 'arm64-dt-for-v5.3' into next)
Merging reset/reset/next (6b251ea99242 dt-bindings: reset: imx7: Fix the spelling of 'indices')
CONFLICT (content): Merge conflict in drivers/reset/reset-simple.c
Merging rockchip/for-next (bf0b34ecc3e7 Merge branch 'v5.3-clk/next' into for-next)
Merging samsung-krzk/for-next (0d8bc7b138cb Merge branch 'next/defconfig' into for-next)
Merging scmi/for-linux-next (d84dc98fad98 Merge branch 'for-next/scmi-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next)
Merging sunxi/sunxi/for-next (f0776d431adb Merge branch 'sunxi/dt64-for-5.3' into sunxi/for-next)
CONFLICT (content): Merge conflict in arch/arm64/configs/defconfig
Merging tegra/for-next (cc79a5f3cef6 Merge branch for-5.3/arm64/defconfig into for-next)
Merging clk/clk-next (397a7b5ebe4d Merge branch 'clk-fixes' into clk-next)
CONFLICT (content): Merge conflict in drivers/clk/bcm/Kconfig
Merging clk-samsung/for-next (2f57b95caf8f clk: samsung: add new clocks for DMC for Exynos5422 SoC)
Merging c6x/for-linux-next (8adcc59974b8 Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
Merging csky/linux-next (69fb22551ba7 dt-bindings: csky: Add csky PMU bindings)
Merging h8300/h8300-next (38ef0515e1e8 H8300: remove unused barrier defines)
Merging ia64/next (c51836246f97 ia64: generate uapi header and system call table files)
Merging m68k/for-next (f67d667213ba m68k: defconfig: Update defconfigs for v5.2-rc1)
Merging m68knommu/for-next (b75d252a6322 riscv: add binfmt_flat support)
Merging microblaze/next (226a893bbb1f microblaze: no need to check return value of debugfs_create functions)
Merging mips/mips-next (65eb3e4c1426 MIPS: configs: Remove useless UEVENT_HELPER_PATH)
CONFLICT (content): Merge conflict in arch/mips/include/asm/mach-ralink/pinmux.h
Merging nds32/next (932296120543 nds32: add new emulations for floating point instruction)
Merging nios2/for-next (21e6bff5e0ef nios2: Fix update_mmu_cache preload the TLB with the new PTE)
Merging openrisc/for-next (57ce8ba0fd3a openrisc: Fix broken paths to arch/or32)
Merging parisc-hd/for-next (d2ba3b1714d7 parisc: Fix module loading error with JUMP_LABEL feature)
Merging powerpc/next (e610a466d16a powerpc/pseries/mobility: rebuild cacheinfo hierarchy post-migration)
Merging fsl/next (63d86876f324 Revert "powerpc/fsl_pci: simplify fsl_pci_dma_set_mask")
Merging soc-fsl/next (21560067fb1f soc: fsl: qe: fold qe_get_num_of_snums into qe_snums_init)
Merging risc-v/for-next (e93c9c99a629 Linux 5.1)
Merging sifive/for-next (467e050e9760 Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux)
Merging s390/features (39c00378e337 Update default configuration)
Merging sh/sh-next (7c04efc8d2ef sh: configs: Remove useless UEVENT_HELPER_PATH)
Merging sparc-next/master (b71acb0e3721 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6)
Merging uml/linux-next (1987b1b8f9f1 um: irq: don't set the chip for all irqs)
Merging xtensa/xtensa-for-next (61474c3685e1 Merge branch 'xtensa-5.3' into xtensa-for-next)
Merging fscrypt/master (0bb06cac060d fscrypt: remove unnecessary includes of ratelimit.h)
Merging btrfs/next (29dcea88779c Linux 4.17)
Merging btrfs-kdave/for-next (6fc9f4e59957 Merge branch 'for-next-current-v5.1-20190509' into for-next-20190509)
Merging ceph/master (7b2f936fc828 ceph: fix error handling in ceph_get_caps())
Merging cifs/for-next (d677d0b6547d Fix match_server check to allow for auto dialect negotiate)
Merging configfs/for-next (f6122ed2a4f9 configfs: Fix use-after-free when accessing sd->s_dentry)
Merging ecryptfs/next (d43388dea04b eCryptfs: fix permission denied with ecryptfs_xattr mount option when create readonly file)
Merging ext3/for_next (3803f4dc265f Merge ext2 bitmap bh leak fix.)
Merging ext4/dev (a49773064bc2 jbd2: fix typo in comment of journal_submit_inode_data_buffers)
Merging f2fs/dev (f14f319eb1a1 f2fs: add a rw_sem to cover quota flag changes)
Merging fuse/for-next (766741fcaa1f Revert "fuse: require /dev/fuse reads to have enough buffer capacity")
Merging jfs/jfs-next (a5fdd713d256 jfs: fix bogus variable self-initialization)
Merging nfs/linux-next (29f785ff76b6 Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
Merging nfs-anna/linux-next (d3f74a492eac Revert "SUNRPC: Declare RPC timers as TIMER_DEFERRABLE")
Merging nfsd/nfsd-next (4fc2b5fe1cf2 nfsd: fix cleanup of nfsd_reply_cache_init on failure)
Merging orangefs/for-next (33713cd09ccd orangefs: truncate before updating size)
Merging overlayfs/overlayfs-next (253e74833911 ovl: fix typo in MODULE_PARM_DESC)
Merging ubifs/linux-next (c16e73587ad6 ubifs: Don't leak orphans on memory during commit)
Merging v9fs/9p-next (80a316ff1627 9p/xen: Add cleanup path in p9_trans_xen_init)
Merging xfs/for-next (f5b999c03f4c xfs: remove unused flag arguments)
Merging file-locks/locks-next (6ef048fd5955 locks: eliminate false positive conflicts for write lease)
Merging vfs/for-next (6e14c3cf8bc4 Merge branch 'work.icache' into for-next)
CONFLICT (content): Merge conflict in Documentation/filesystems/porting
Merging printk/for-next (753637b2039f Merge branch 'for-5.3' into for-next)
Merging pci/next (fbc6e0dd8d4e Merge branch 'pci/trivial')
Merging pstore/for-next/pstore (e070e380c674 Merge branch 'for-linus/pstore' into for-next/pstore)
Merging hid/for-next (b0153147e2d7 Merge branch 'for-5.3/wacom' into for-next)
Merging i2c/i2c/for-next (bb0fb7686a52 Merge branch 'i2c/for-5.3' into i2c/for-next)
Merging i3c/i3c/next (5e343fbb7176 dt-bindings: i3c: Document dropped support for I2C 10 bit devices)
Merging dmi/master (57361846b52b Linux 4.19-rc2)
Merging hwmon-staging/hwmon-next (3852d74e3bb4 hwmon: (gpio-fan) Fix sysfs_notify and kobject_uevent in fan_alarm_notify)
Merging jc_docs/docs-next (d95ea1a4e1fb docs: Add a document on repository management)
Merging v4l-dvb/master (513dbd35b5d9 media: add SPDX headers to some files)
Merging v4l-dvb-next/master (a188339ca5a3 Linux 5.2-rc1)
Merging fbdev/fbdev-for-next (0f5a5712ad1e video: fbdev: pvr2fb: add COMPILE_TEST support)
CONFLICT (modify/delete): drivers/video/fbdev/mxsfb.c deleted in fbdev/fbdev-for-next and modified in HEAD. Version HEAD of drivers/video/fbdev/mxsfb.c left in tree.
$ git rm -f drivers/video/fbdev/mxsfb.c
Merging pm/linux-next (eefb01367c51 Merge branches 'pm-cpufreq' and 'pm-pci' into linux-next)
Merging cpufreq-arm/cpufreq/arm/linux-next (d3df18a97e58 cpufreq: add driver for Raspberry Pi)
Merging cpupower/cpupower (04507c0a9385 cpupower : frequency-set -r option misses the last cpu in related cpu list)
Merging opp/opp/linux-next (cd7ea582866f opp: Make dev_pm_opp_set_rate() handle freq = 0 to drop performance votes)
Merging thermal/next (6df24c3e81b9 Merge branches 'thermal-core', 'thermal-built-it' and 'thermal-intel' into next)
Merging thermal-soc/next (4cb9f043447e thermal: thermal_mmio: remove some dead code)
Merging ieee1394/for-next (812cd88749e0 firewire: mark expected switch fall-throughs)
Merging dlm/next (6051531997ed dlm: no need to check return value of debugfs_create functions)
Merging swiotlb/linux-next (4aa095ea329d swiotlb: Return consistent SWIOTLB segments/nr_tbl)
Merging rdma/for-next (cbdc666f3e84 RDMA/ipoib: Remove check for ETH_SS_TEST)
CONFLICT (content): Merge conflict in drivers/infiniband/core/uverbs_std_types_cq.c
CONFLICT (content): Merge conflict in drivers/infiniband/core/uverbs_cmd.c
Merging net-next/master (760f1dc29580 net: stmmac: add sanity check to device_property_read_u32_array call)
CONFLICT (content): Merge conflict in arch/sh/configs/titan_defconfig
CONFLICT (content): Merge conflict in arch/sh/configs/se7721_defconfig
CONFLICT (content): Merge conflict in arch/sh/configs/se7712_defconfig
Applying: net: sched: don't use BIT() in uapi headers
Merging bpf-next/master (94079b64255f Merge branch 'bpf-bounded-loops')
Merging ipsec-next/master (8928aa6a007d xfrm: remove empty xfrmi_init_net)
Merging mlx5-next/mlx5-next (82b11f071936 net/mlx5: Expose eswitch encap mode)
CONFLICT (content): Merge conflict in include/linux/mlx5/eswitch.h
Merging netfilter-next/master (d7f9b2f18eae netfilter: synproxy: extract SYNPROXY infrastructure from {ipt, ip6t}_SYNPROXY)
Merging nfc-next/master (1f008cfec5d5 NFC: fdp: Fix unused variable warnings)
Merging ipvs-next/master (1b0b807dd746 Merge branch 'r8169-fw')
Merging wireless-drivers-next/master (ec2e93cf1910 b43: Avoid possible double calls to b43_one_core_detach())
Merging bluetooth/master (877cd9ffbc9c Merge branch 'net-dsa-use-switchdev-attr-and-obj-handlers')
Merging mac80211-next/master (f464100f5766 selftests/net: fix warnings in TFO key rotation selftest)
Merging gfs2/for-next (a4262eaf3df3 gfs2: Use IS_ERR_OR_NULL)
Merging mtd/mtd/next (a188339ca5a3 Linux 5.2-rc1)
Merging nand/nand/next (5dc353d306bf mtd: onenand_base: Avoid fall-through warnings)
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/mtd/brcm,brcmnand.txt
Merging spi-nor/spi-nor/next (92aae4ce8427 mtd: spi-nor: change "error reading JEDEC id" from dbg to err)
Merging crypto/master (b0d765219fb3 crypto: sahara - Use devm_platform_ioremap_resource())
CONFLICT (content): Merge conflict in drivers/crypto/vmx/vmx.c
CONFLICT (content): Merge conflict in drivers/crypto/vmx/aes_xts.c
CONFLICT (content): Merge conflict in drivers/crypto/vmx/aes_ctr.c
CONFLICT (content): Merge conflict in drivers/crypto/vmx/aes_cbc.c
CONFLICT (content): Merge conflict in drivers/crypto/vmx/aes.c
CONFLICT (content): Merge conflict in drivers/crypto/talitos.c
CONFLICT (modify/delete): crypto/crypto_wq.c deleted in crypto/master and modified in HEAD. Version HEAD of crypto/crypto_wq.c left in tree.
$ git rm -f crypto/crypto_wq.c
Merging drm/drm-next (2454fcea338a Merge tag 'drm-misc-next-2019-06-14' of git://anongit.freedesktop.org/drm/drm-misc into drm-next)
CONFLICT (modify/delete): include/drm/gma_drm.h deleted in drm/drm-next and modified in HEAD. Version HEAD of include/drm/gma_drm.h left in tree.
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/Makefile.header-test
CONFLICT (modify/delete): drivers/gpu/drm/cirrus/cirrus_drv.h deleted in drm/drm-next and modified in HEAD. Version HEAD of drivers/gpu/drm/cirrus/cirrus_drv.h left in tree.
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
$ git rm -f drivers/gpu/drm/cirrus/cirrus_drv.h include/drm/gma_drm.h
Merging amdgpu/drm-next (21a249ca0241 drm/amdgpu: wait to fetch the vbios until after common init)
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/dce/dce_audio.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
Merging drm-intel/for-linux-next (381f8a20d2f6 drm/i915/psr: Force manual PSR exit in older gens)
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_csr.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_drv.h
Merging drm-tegra/drm/tegra/for-next (eb7cf945a8da host1x: debugfs_create_dir() can never return NULL)
Merging drm-misc/for-linux-next (b1622cb3be45 drm/bridge: tfp410: fix use of cancel_delayed_work_sync)
Merging drm-msm/msm-next (d3cb8f3d0fb2 drm/msm/dpu: Remove bogus comment)
Merging hdlcd/for-upstream/hdlcd (d664b851eb2b drm/arm/hdlcd: Reject atomic commits that disable only the plane)
Merging mali-dp/for-upstream/mali-dp (8f2501e643bc drm/komeda: Enable writeback split support)
CONFLICT (content): Merge conflict in drivers/gpu/drm/arm/display/komeda/komeda_dev.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/arm/display/komeda/d71/d71_dev.c
Merging imx-drm/imx-drm/next (fee77829083a gpu: ipu-v3: image-convert: Enable double write reduction)
CONFLICT (content): Merge conflict in drivers/staging/media/imx/imx-ic-prpencvf.c
Merging etnaviv/etnaviv/next (2b76f5be7c27 drm/etnaviv: initialize idle mask before querying the HW db)
Merging regmap/for-next (0a19fcccf3ed Merge branch 'regmap-5.3' into regmap-next)
Merging sound/for-next (15d472ecc510 ALSA: firewire-motu: code refactoring for pcm.hw_params/hw_free callbacks)
CONFLICT (content): Merge conflict in sound/pci/rme9652/hdspm.c
Merging sound-asoc/for-next (bf7d23f120af Merge remote-tracking branch 'asoc/topic/meson' into asoc-next)
Merging modules/modules-next (bc6f2a757d52 kernel/module: Fix mem leak in module_add_modinfo_attrs)
Merging input/next (b02f6b6b711b Input: tca8418 - remove set but not used variable 'max_keys')
CONFLICT (content): Merge conflict in drivers/input/misc/da9063_onkey.c
Merging block/for-next (e3bf98fbd085 Merge branch 'for-5.3/block' into for-next)
Merging device-mapper/for-next (51b86f9a8d1c dm: make sure to obey max_io_len_target_boundary)
Merging pcmcia/pcmcia-next (95691e3eddc4 pcmcia: Implement CLKRUN protocol disabling for Ricoh bridges)
Merging mmc/next (9d767dc55208 Merge branch 'fixes' into next)
Merging kgdb/kgdb-next (3bd67b37e350 kdb: print real address of pointers instead of hashed addresses)
CONFLICT (content): Merge conflict in kernel/debug/kdb/kdb_bt.c
Merging md/for-next (e820d55cb99d md: fix raid10 hang issue caused by barrier)
Merging mfd/for-mfd-next (a65d642f93f8 mfd: madera: Add supply mapping for MICVDD)
CONFLICT (content): Merge conflict in include/linux/mfd/cros_ec_commands.h
Merging backlight/for-backlight-next (53fa0f87177d backlight: lm3630a: Add firmware node support)
Merging battery/for-next (a188339ca5a3 Linux 5.2-rc1)
Merging regulator/for-next (d8e1c6c3b28d Merge branch 'regulator-5.3' into regulator-next)
Merging security/next-testing (ba9bfa0e4809 Merge branch 'next-general' into next-testing)
Merging apparmor/apparmor-next (06c13f554a71 apparmor: re-introduce a variant of PROFILE_MEDIATES_SAFE)
Merging integrity/next-integrity (e038f5f691e0 ima: Use designated initializers for struct ima_event_data)
Merging selinux/next (464c258aa45b selinux: fix empty write to keycreate file)
Merging tpmdd/next (31be68564a43 efi: Attempt to get the TCG2 event log in the boot stub)
Merging watchdog/master (a9f0bda567e3 watchdog: Enforce that at least one pretimeout governor is enabled)
Merging iommu/next (5a4c44728eb6 Merge branches 'x86/vt-d', 'x86/amd', 'arm/renesas', 'generic-dma-ops' and 'core' into next)
Merging vfio/next (15c80c1659f2 vfio: Add Cornelia Huck as reviewer)
Merging audit/next (839d05e41385 audit: remove the BUG() calls in the audit rule comparison functions)
Merging devicetree/for-next (1bdd44579a54 dt-bindings: Add missing newline at end of file)
Merging mailbox/mailbox-for-next (35110e38e6c5 Merge tag 'media/v5.2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media)
Merging spi/for-next (691b74070b89 Merge remote-tracking branch 'spi/topic/pump-rt' into spi-next)
Merging tip/auto-latest (434f93f268c3 Merge branch 'irq/core')
Merging clockevents/clockevents/next (21c768d5ef2f clocksource/drivers/arm_arch_timer: Extract elf_hwcap use to arch-helper)
Merging edac-amd/for-next (b2572772d13e EDAC: Make edac_debugfs_create_x*() return void)
Merging irqchip/irq/irqchip-next (0bdd0047ec94 irqchip/mbigen: Stop printing kernel addresses)
Merging ftrace/for-next (a124692b698b ftrace: Enable trampoline when rec count returns back to one)
Merging rcu/rcu/next (91df49e187c1 Merge LKMM and RCU commits)
Merging kvm/linux-next (f8d221d2e0e1 Merge tag 'kvm-s390-master-5.2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into kvm-master)
Merging kvm-arm/next (9eecfc22e0bf KVM: arm64: Fix ptrauth ID register masking logic)
Merging kvm-ppc/kvm-ppc-next (3bda7f0ae0f7 KVM: PPC: Book3S PR: Fix software breakpoints)
Merging kvms390/next (8343ba2d4820 KVM: selftests: enable pgste option for the linker on s390)
Merging xen-tip/linux-next (1d5c76e66433 xen-blkfront: switch kcalloc to kvcalloc for large array allocation)
Merging percpu/for-next (558ac86039fc Merge branch 'for-5.3' into for-next)
Merging workqueues/for-next (24acfb718225 workqueue: Use normal rcu)
Merging drivers-x86/for-next (a2558e247804 platform/x86: hp_accel: Add support for HP ProBook 450 G0)
Merging chrome-platform/for-next (10671da7e8e1 platform/chrome: wilco_ec: fix null pointer dereference on failed kzalloc)
Merging hsi/for-next (a188339ca5a3 Linux 5.2-rc1)
Merging leds/for-next (25529edef561 Merge tag 'ti-lmu-led-drivers' into for-next)
Merging ipmi/for-next (102308f557bc ipmi: ipmb: Fix build error while CONFIG_I2C is set to m)
Merging driver-core/driver-core-next (5669245b57df ARM: omap1: remove unused variable)
Merging usb/usb-next (d7863de8cdea usb: host: fotg2: add device tree probing)
Applying: USB: fix types in uapi include
Merging usb-gadget/next (d29fcf7078bc usb: gadget: ether: Fix race between gether_disconnect and rx_submit)
Merging usb-serial/usb-next (f2c7c76c5d0a Linux 5.2-rc3)
Merging usb-chipidea-next/ci-for-usb-next (034252e37b31 usb: chipidea: msm: Use devm_platform_ioremap_resource())
Merging phy-next/next (6ef72bc036bc phy: qcom: Add Qualcomm PCIe2 PHY driver)
Merging tty/tty-next (607ea69d2621 serial: 8250: pericom_do_set_divisor can be static)
Merging char-misc/char-misc-next (312d362c6ae4 MAINTAINERS: fpga: hand off maintainership to Moritz)
CONFLICT (content): Merge conflict in drivers/misc/vmw_balloon.c
Merging extcon/extcon-next (fbdc60b2a787 extcon: arizona: Correct error handling on regmap_update_bits_check)
Merging soundwire/next (be1038846b80 docs: soundwire: locking: fix tags for a code-block)
Merging thunderbolt/next (9e0babf2c06c Linux 5.2-rc5)
Merging staging/staging-next (61959885103a staging: rtl8723bs: hal: odm_HWConfig: Unneeded variable: "result". Return "HAL_STATUS_SUCCESS")
Merging mux/for-next (561eb7335f13 Merge branch 'i2c-mux/for-next' into for-next)
Merging icc/icc-next (83fdb2dfb0c2 interconnect: convert to DEFINE_SHOW_ATTRIBUTE)
Merging slave-dma/next (0eaab70a7a1b dmagengine: pl330: add code to get reset property)
CONFLICT (modify/delete): include/linux/sudmac.h deleted in slave-dma/next and modified in HEAD. Version HEAD of include/linux/sudmac.h left in tree.
CONFLICT (content): Merge conflict in drivers/dma/mediatek/Makefile
CONFLICT (content): Merge conflict in drivers/dma/dma-jz4780.c
CONFLICT (content): Merge conflict in drivers/dma/dma-axi-dmac.c
$ git rm -f include/linux/sudmac.h
Merging cgroup/for-next (22a0b83583ab Merge branch 'for-5.3' into for-next)
CONFLICT (content): Merge conflict in Documentation/cgroup-v1/blkio-controller.rst
Merging scsi/for-next (4e9c049f93e9 Merge branch 'misc' into for-next)
CONFLICT (content): Merge conflict in include/scsi/scsi_transport_spi.h
CONFLICT (content): Merge conflict in include/scsi/scsi_transport_iscsi.h
CONFLICT (content): Merge conflict in include/scsi/scsi_transport_fc.h
CONFLICT (content): Merge conflict in include/scsi/scsi_transport.h
CONFLICT (content): Merge conflict in include/scsi/scsi_bsg_iscsi.h
CONFLICT (content): Merge conflict in include/scsi/sas_ata.h
CONFLICT (content): Merge conflict in include/scsi/sas.h
CONFLICT (content): Merge conflict in include/scsi/libsas.h
CONFLICT (content): Merge conflict in include/scsi/libiscsi_tcp.h
CONFLICT (content): Merge conflict in include/scsi/libiscsi.h
CONFLICT (content): Merge conflict in include/scsi/libfcoe.h
CONFLICT (content): Merge conflict in include/scsi/libfc.h
CONFLICT (content): Merge conflict in include/scsi/iscsi_proto.h
CONFLICT (content): Merge conflict in include/scsi/iscsi_if.h
CONFLICT (content): Merge conflict in include/scsi/fc/fc_ms.h
CONFLICT (content): Merge conflict in include/scsi/fc/fc_fcp.h
CONFLICT (content): Merge conflict in include/scsi/fc/fc_fcoe.h
CONFLICT (content): Merge conflict in include/scsi/fc/fc_fc2.h
CONFLICT (content): Merge conflict in include/scsi/fc/fc_encaps.h
CONFLICT (content): Merge conflict in drivers/scsi/st.c
CONFLICT (content): Merge conflict in drivers/scsi/sr.c
CONFLICT (content): Merge conflict in drivers/scsi/sg.c
CONFLICT (content): Merge conflict in drivers/scsi/ses.c
CONFLICT (content): Merge conflict in drivers/scsi/sd_zbc.c
CONFLICT (content): Merge conflict in drivers/scsi/sd_dif.c
CONFLICT (content): Merge conflict in drivers/scsi/sd.c
CONFLICT (content): Merge conflict in drivers/scsi/scsi_transport_spi.c
CONFLICT (content): Merge conflict in drivers/scsi/scsi_transport_sas.c
CONFLICT (content): Merge conflict in drivers/scsi/scsi_transport_iscsi.c
CONFLICT (content): Merge conflict in drivers/scsi/scsi_transport_fc.c
CONFLICT (content): Merge conflict in drivers/scsi/scsi_trace.c
CONFLICT (content): Merge conflict in drivers/scsi/scsi_sysfs.c
CONFLICT (content): Merge conflict in drivers/scsi/scsi_sysctl.c
CONFLICT (content): Merge conflict in drivers/scsi/scsi_pm.c
CONFLICT (content): Merge conflict in drivers/scsi/scsi_logging.c
CONFLICT (content): Merge conflict in drivers/scsi/scsi_lib.c
CONFLICT (content): Merge conflict in drivers/scsi/scsi_ioctl.c
CONFLICT (content): Merge conflict in drivers/scsi/scsi_error.c
CONFLICT (content): Merge conflict in drivers/scsi/scsi.c
CONFLICT (modify/delete): drivers/scsi/osst.c deleted in scsi/for-next and modified in HEAD. Version HEAD of drivers/scsi/osst.c left in tree.
CONFLICT (content): Merge conflict in drivers/scsi/libsas/sas_task.c
CONFLICT (content): Merge conflict in drivers/scsi/libsas/sas_scsi_host.c
CONFLICT (content): Merge conflict in drivers/scsi/libsas/sas_internal.h
CONFLICT (content): Merge conflict in drivers/scsi/libsas/sas_init.c
CONFLICT (content): Merge conflict in drivers/scsi/libsas/sas_host_smp.c
CONFLICT (content): Merge conflict in drivers/scsi/libsas/sas_ata.c
CONFLICT (content): Merge conflict in drivers/scsi/libiscsi_tcp.c
CONFLICT (content): Merge conflict in drivers/scsi/libiscsi.c
CONFLICT (content): Merge conflict in drivers/scsi/libfc/fc_rport.c
CONFLICT (content): Merge conflict in drivers/scsi/libfc/fc_npiv.c
CONFLICT (content): Merge conflict in drivers/scsi/libfc/fc_lport.c
CONFLICT (content): Merge conflict in drivers/scsi/libfc/fc_libfc.h
CONFLICT (content): Merge conflict in drivers/scsi/libfc/fc_libfc.c
CONFLICT (content): Merge conflict in drivers/scsi/libfc/fc_frame.c
CONFLICT (content): Merge conflict in drivers/scsi/libfc/fc_fcp.c
CONFLICT (content): Merge conflict in drivers/scsi/libfc/fc_exch.c
CONFLICT (content): Merge conflict in drivers/scsi/libfc/fc_elsct.c
CONFLICT (content): Merge conflict in drivers/scsi/libfc/fc_disc.c
CONFLICT (content): Merge conflict in drivers/scsi/hosts.c
CONFLICT (content): Merge conflict in drivers/scsi/fcoe/fcoe_transport.c
CONFLICT (content): Merge conflict in drivers/scsi/fcoe/fcoe_sysfs.c
CONFLICT (content): Merge conflict in drivers/scsi/fcoe/fcoe_ctlr.c
CONFLICT (content): Merge conflict in drivers/scsi/fcoe/fcoe.h
CONFLICT (content): Merge conflict in drivers/scsi/fcoe/fcoe.c
$ git rm -f drivers/scsi/osst.c
Merging scsi-mkp/for-next (f3e88ad00f58 scsi: mpt3sas: Update driver version to 29.100.00.00)
Merging vhost/linux-next (169a126c6e88 iommu/virtio: Add event queue)
Merging rpmsg/for-next (b3e144584ac2 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
Merging gpio/for-next (c8ecfd6caa1e Merge branch 'devel' into for-next)
Merging gpio-brgl/gpio/for-next (2674700c4c0e gpio: max732x: use devm_gpiochip_add_data())
Merging pinctrl/for-next (d6e561df50b5 dt-bindings: pinctrl: pic32: Spelling s/configuraion/configuration/)
CONFLICT (content): Merge conflict in include/dt-bindings/gpio/meson8b-gpio.h
CONFLICT (content): Merge conflict in include/dt-bindings/gpio/meson8-gpio.h
CONFLICT (content): Merge conflict in include/dt-bindings/gpio/meson-gxl-gpio.h
CONFLICT (content): Merge conflict in include/dt-bindings/gpio/meson-gxbb-gpio.h
CONFLICT (content): Merge conflict in drivers/pinctrl/pinctrl-u300.c
CONFLICT (content): Merge conflict in drivers/pinctrl/pinctrl-coh901.c
CONFLICT (content): Merge conflict in drivers/pinctrl/nomadik/Kconfig
CONFLICT (content): Merge conflict in drivers/pinctrl/meson/pinctrl-meson8b.c
CONFLICT (content): Merge conflict in drivers/pinctrl/meson/pinctrl-meson8.c
CONFLICT (content): Merge conflict in drivers/pinctrl/meson/pinctrl-meson8-pmx.h
CONFLICT (content): Merge conflict in drivers/pinctrl/meson/pinctrl-meson8-pmx.c
CONFLICT (content): Merge conflict in drivers/pinctrl/meson/pinctrl-meson.h
CONFLICT (content): Merge conflict in drivers/pinctrl/meson/pinctrl-meson.c
CONFLICT (content): Merge conflict in drivers/pinctrl/meson/pinctrl-meson-gxl.c
CONFLICT (content): Merge conflict in drivers/pinctrl/meson/pinctrl-meson-gxbb.c
Merging pinctrl-samsung/for-next (a188339ca5a3 Linux 5.2-rc1)
Merging pwm/for-next (f41efceb46e6 pwm: meson: Add clock source configuration for Meson G12A)
Merging userns/for-next (318759b4737c signal/x86: Move tsk inside of CONFIG_MEMORY_FAILURE in do_sigbus)
CONFLICT (content): Merge conflict in arch/arm64/kernel/traps.c
CONFLICT (content): Merge conflict in arch/arc/mm/fault.c
Merging ktest/for-next (d20f6b41b7c2 ktest: update sample.conf for grub2bls)
Merging random/dev (58be0106c530 random: fix soft lockup when trying to read from an uninitialized blocking pool)
Merging kselftest/next (fe48319243a6 selftests/timers: Add missing fflush(stdout) calls)
Merging y2038/y2038 (a2318b6a16a8 riscv: Use latest system call ABI)
Merging livepatching/for-next (eb1bfcffba2c Merge branch 'for-5.3-core' into for-next)
Merging coresight/next (074b8244b52d coresight: replicator: Add terminate entry for acpi_device_id tables)
Merging rtc/rtc-next (110036b4f4db rtc: rx8025: simplify getting the adapter of a client)
Merging nvdimm/libnvdimm-for-next (cd6c84d8f0cd Linux 5.2-rc2)
Merging at24/at24/for-next (9ae9d9bfb72c eeprom: at24: use struct_size() in devm_kzalloc())
Merging ntb/ntb-next (d9c53aa440b3 NTB: Describe the ntb_msi_test client in the documentation.)
Merging kspp/for-next/kspp (2dcbe7fe2265 lib/test_stackinit: Handle Clang auto-initialization pattern)
Merging cisco/for-next (9e98c678c2d6 Linux 5.1-rc1)
Merging gnss/gnss-next (f2c7c76c5d0a Linux 5.2-rc3)
Merging fsi/master (d20810530b71 fsi: fsi-scom.c: Remove duplicate header)
Merging siox/siox/next (1e4b044d2251 Linux 4.18-rc4)
Merging slimbus/for-next (a188339ca5a3 Linux 5.2-rc1)
Merging nvmem/for-next (c8d087d040cf nvmem: Broaden the selection of NVMEM_SNVS_LPGPR)
CONFLICT (content): Merge conflict in drivers/nvmem/meson-mx-efuse.c
CONFLICT (content): Merge conflict in drivers/nvmem/meson-efuse.c
Merging xarray/xarray (12fd2aee6db7 XArray tests: Add check_insert)
Merging hyperv/hyperv-next (703a70908255 Drivers: hv: vmbus: Break out ISA independent parts of mshyperv.h)
Merging auxdisplay/auxdisplay (f4cd7203c1d4 auxdisplay/ht16k33.c: Convert to use vm_map_pages_zero())
Merging kgdb-dt/kgdb/for-next (ca976bfb3154 kdb: Fix bound check compiler warning)
Merging pidfd/for-next (0560505fbd43 Merge branch 'clone' into for-next)
CONFLICT (content): Merge conflict in tools/testing/selftests/pidfd/pidfd_test.c
CONFLICT (content): Merge conflict in tools/testing/selftests/pidfd/Makefile
Merging devfreq/for-next (cf451adfa392 PM / devfreq: add tracing for scheduling work)
Merging hmm/hmm (9b1ae605c8e2 mm/hmm: Only set FAULT_FLAG_ALLOW_RETRY for non-blocking)
Merging akpm-current/current (d96d6145d979 mm/page_idle.c: fix oops because end_pfn is larger than max_pfn)
CONFLICT (content): Merge conflict in kernel/pid.c
CONFLICT (content): Merge conflict in kernel/dma/remap.c
CONFLICT (content): Merge conflict in include/linux/pid.h
CONFLICT (content): Merge conflict in fs/binfmt_flat.c
Applying: Revert "byteorder-sanity-check-toolchain-vs-kernel-endianess-checkpatch-fixes"
Applying: Revert "byteorder: sanity check toolchain vs kernel endianness"
$ git checkout -b akpm remotes/origin/akpm/master
Applying: pinctrl: fix pxa2xx.c build warnings
Applying: proc/sysctl: add shared variables for range check
Applying: proc-sysctl-add-shared-variables-for-range-check-fix
Applying: tipc: remove two unused variables
Applying: proc-sysctl-add-shared-variables-for-range-check-fix-2-fix
Applying: proc/sysctl: make firmware loader table conditional
Applying: fs/select.c: use struct_size() in kmalloc()
Applying: drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow
Merging akpm/master (3305df8e2faf drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow)
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* linux-next: Tree for Jun 19
@ 2017-06-19 8:18 Stephen Rothwell
0 siblings, 0 replies; 9+ messages in thread
From: Stephen Rothwell @ 2017-06-19 8:18 UTC (permalink / raw)
To: Linux-Next Mailing List; +Cc: Linux Kernel Mailing List
Hi all,
Changes since 20170616:
Undropped tree: uuid
The arm64 tree gained conflicts against the uuid tree so I merged the
version of the arm64 tree from next-20170615 for today.
The sound-asoc tree lost its build failure.
The scsi tree gained conflicts against the block tree.
The kspp tree lost its build failure.
The akpm-current tree gained a build failure for which I reverted
2 commits.
Non-merge commits (relative to Linus' tree): 7221
7224 files changed, 604567 insertions(+), 142816 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 (with
CONFIG_BUILD_DOCSRC=n) for x86_64, a multi_v7_defconfig for arm and a
native build of tools/perf. After the final fixups (if any), I do an
x86_64 modules_install followed by builds for x86_64 allnoconfig,
powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig
and pseries_le_defconfig and i386, sparc and sparc64 defconfig. And
finally, a simple boot test of the powerpc pseries_le_defconfig kernel
in qemu.
Below is a summary of the state of the merge.
I am currently merging 265 trees (counting Linus' and 41 trees of bug
fix patches pending for the current merge release).
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.
--
Cheers,
Stephen Rothwell
$ git checkout master
$ git reset --hard stable
Merging origin/master (edf9364d3f92 Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip)
Merging fixes/master (97da3854c526 Linux 4.11-rc3)
Merging kbuild-current/fixes (ff85a1a80e00 kconfig: Check for libncurses before menuconfig)
Merging arc-current/for-curr (45c7d002f207 ARC: defconfig: Cleanup from old Kconfig options)
Merging arm-current/fixes (d360a687d995 ARM: 8682/1: V7M: Set cacheid iff DminLine or IminLine is nonzero)
Merging m68k-current/for-linus (f6ab4d59a5fe nubus: Add MVC and VSC video card definitions)
Merging metag-fixes/fixes (b884a190afce metag/usercopy: Add missing fixups)
Merging powerpc-fixes/fixes (a093c92dc7f9 powerpc/debug: Add missing warn flag to WARN_ON's non-builtin path)
Merging sparc/master (5faab9e0f03c Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
Merging fscrypt-current/for-stable (42d97eb0ade3 fscrypt: fix renaming and linking special files)
Merging net/master (76371d2e3ad1 decnet: always not take dst->__refcnt when inserting dst into hash table)
Merging ipsec/master (e747f64336fc xfrm: NULL dereference on allocation failure)
Merging netfilter/master (4b1f0d33db7d net: ipmr: Fix some mroute forwarding issues in vrf's)
Merging ipvs/master (3c5ab3f395d6 ipvs: SNAT packet replies only for NATed connections)
Merging wireless-drivers/master (35abcd4f9f30 brcmfmac: fix uninitialized warning in brcmf_usb_probe_phase2())
Merging mac80211/master (68dd02d19c81 dev_ioctl: copy only the smaller struct iwreq for wext)
Merging sound-current/for-linus (2deaeaf102d6 ALSA: pcm: Don't treat NULL chmap as a fatal error)
Merging pci-current/for-linus (98dbf5af4fdd PCI: endpoint: Select CRC32 to fix test build error)
Merging driver-core.current/driver-core-linus (08332893e37a Linux 4.12-rc2)
Merging tty.current/tty-linus (3c2993b8c614 Linux 4.12-rc4)
Merging usb.current/usb-linus (f16443a034c7 USB: gadgetfs, dummy-hcd, net2280: fix locking for callbacks)
Merging usb-gadget-fixes/fixes (f50b878fed33 USB: gadget: fix GPF in gadgetfs)
Merging usb-serial-fixes/usb-linus (996fab55d864 USB: serial: qcserial: new Sierra Wireless EM7305 device ID)
Merging usb-chipidea-fixes/ci-for-usb-stable (cbb22ebcfb99 usb: chipidea: core: check before accessing ci_role in ci_role_show)
Merging phy/fixes (9605bc46433d phy: qualcomm: phy-qcom-qmp: fix application of sizeof to pointer)
Merging staging.current/staging-linus (ed6456afef0d Staging: rtl8723bs: fix an error code in isFileReadable())
Merging char-misc.current/char-misc-linus (32c1431eea48 Linux 4.12-rc5)
Merging input-current/for-linus (a0897d5f2c2d Input: synaptics-rmi4 - register F03 port as pass-through serio)
Merging crypto-current/master (d41519a69b35 crypto: Work around deallocated stack frame reference gcc bug on sparc.)
Merging ide/master (acfead32f3f9 ide: don't call memcpy with the same source and destination)
Merging vfio-fixes/for-linus (39da7c509acf Linux 4.11-rc6)
Merging kselftest-fixes/fixes (2ea659a9ef48 Linux 4.12-rc1)
Merging backlight-fixes/for-backlight-fixes (68feaca0b13e backlight: pwm: Handle EPROBE_DEFER while requesting the PWM)
Merging ftrace-fixes/for-next-urgent (6224beb12e19 tracing: Have branch tracer use recursive field of task struct)
Merging nand-fixes/nand/fixes (d4ed3b9015b5 mtd: nand: make nand_ooblayout_lp_hamming_ops static)
Merging spi-nor-fixes/spi-nor/fixes (2ea659a9ef48 Linux 4.12-rc1)
Merging mfd-fixes/for-mfd-fixes (27fef9f8ecb0 mfd: arizona: Fix typo using hard-coded register)
Merging v4l-dvb-fixes/fixes (f9f314f32395 [media] media/cec.h: use IS_REACHABLE instead of IS_ENABLED)
Merging reset-fixes/reset/fixes (4497a224f759 reset: hi6220: Set module license so that it can be loaded)
Merging drm-intel-fixes/for-linux-next-fixes (c380f681245d drm/i915: Fix GVT-g PVINFO version compatibility check)
Merging drm-misc-fixes/for-linux-next-fixes (0f933328f018 drm: mxsfb_crtc: Reset the eLCDIF controller)
Merging kbuild/for-next (e814942193b7 Merge branches 'kbuild' and 'fixes' into for-next)
Merging uuid/for-next (87085ff2e90e thermal: int340x_thermal: fix compile after the UUID API switch)
Merging asm-generic/master (de4be6b87b6b asm-generic: page.h: fix comment typo)
CONFLICT (content): Merge conflict in include/asm-generic/percpu.h
Merging arc/for-next (db60a589614c ARC: set boot print log level to PR_INFO)
Merging arm/for-next (87a8868c3f89 Merge branches 'fixes' and 'misc' into for-next)
Merging arm-perf/for-next/perf (bddb9b68d3fb drivers/perf: commonise PERF_EVENTS dependency)
Merging arm-soc/for-next (b0cd8f449f09 Merge branch 'fixes' into for-next)
Merging actions/for-next (5c4d50aa3c06 Merge branch 'v4.13/soc' into next)
Merging alpine/alpine/for-next (a1144b2b1ec4 ARM: dts: alpine: add valid clock-frequency values)
Merging amlogic/for-next (3ecbaeae6553 Merge branch 'v4.13/defconfig' into tmp/aml-rebuild)
Merging aspeed/for-next (4944e5dbb215 Merge branches 'dt-for-v4.12' and 'defconfig-for-v4.12' into for-next)
Merging at91/at91-next (630efea351f0 Merge branch 'at91-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into at91-next)
CONFLICT (content): Merge conflict in arch/arm/mach-at91/Kconfig
Merging bcm2835/for-next (652fb0c6435c Merge branch anholt/bcm2835-defconfig-next into for-next)
Merging berlin/berlin/for-next (5153351425c9 Merge branch 'berlin/dt' into berlin/for-next)
Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings)
Merging imx-mxs/for-next (4e8c89e67183 Merge branch 'imx/defconfig' into for-next)
Merging keystone/next (b45371147f9d Merge branch 'for_4.13/keystone_dts' into next)
Merging mvebu/for-next (ea1a8b5dc645 Merge branch 'mvebu/dt64' into mvebu/for-next)
Merging omap/for-next (33bb085d65d5 Merge branch 'omap-for-v4.13/soc-v4' into for-next)
Merging omap-pending/for-next (c20c8f750d9f ARM: OMAP2+: hwmod: fix _idle() hwmod state sanity check sequence)
Merging reset/reset/next (28df169b9afa reset: Add the TI SCI reset driver)
Merging qcom/for-next (05ebfa8ae478 Merge tag 'qcom-arm64-for-4.13' into all-for-4.13)
Merging realtek/for-next (007e6304223c Merge branch 'v4.13/dt64' into next)
Merging renesas/next (57e4f5c382df Merge branches 'arm64-dt-for-v4.13', 'rcar-sysc-for-v4.13' and 'soc-for-v4.13' into next)
Merging rockchip/for-next (dd3f24b9ff88 Merge branch 'v4.13-clk/next' into for-next)
Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2)
Merging samsung/for-next (2ea659a9ef48 Linux 4.12-rc1)
Merging samsung-krzk/for-next (5fa286799f96 Merge branch 'next/dt' into for-next)
Merging sunxi/sunxi/for-next (efb85d294c2a Merge branches 'sunxi/h3-for-4.13', 'sunxi/dt-for-4.13' and 'sunxi/dt64-for-4.13' into sunxi/for-next)
Merging tegra/for-next (07bb9460b188 Merge branch for-4.13/arm64/dt into for-next)
Merging arm64/for-next/core (0870f692c2ed Merge branch 'aarch64/for-next/ras-apei' into aarch64/for-next/core)
CONFLICT (content): Merge conflict in include/uapi/linux/uuid.h
CONFLICT (content): Merge conflict in drivers/acpi/apei/ghes.c
$ git merge --abort
Merging next-20170615 version of arm64
Merging clk/clk-next (4dea04c1f113 Merge tag 'meson-clk-for-4.13-2' of git://github.com/BayLibre/clk-meson into clk-next)
CONFLICT (content): Merge conflict in MAINTAINERS
Merging c6x/for-linux-next (91ebcd1b97ae MAINTAINERS: update email address for C6x maintainer)
Merging cris/for-next (8f50f2a1b46a cris: No need to append -O2 and $(LINUXINCLUDE))
Merging h8300/h8300-next (58c57526711f h8300: Add missing include file to asm/io.h)
Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error")
Merging ia64/next (fbb0e4da96f4 ia64: salinfo: use a waitqueue instead a sema down/up combo)
Merging m68k/for-next (1072734a2c63 m68k/defconfig: Update defconfigs for v4.12-rc1)
Merging m68knommu/for-next (f4d8f47e52ec m68k: defconfig: Cleanup from old Kconfig options)
Merging metag/for-next (e3cd7f013bac metag/mm: Drop pointless increment)
Merging microblaze/next (83f0124ad81e microblaze: remove asm-generic wrapper headers)
Merging mips/mips-for-linux-next (156b0ddcf50b Merge branch '4.12-fixes' into mips-for-linux-next)
Merging nios2/for-next (e118c3fec9c0 nios2: remove custom early console implementation)
Merging openrisc/for-next (9d15eb228b10 openrisc: defconfig: Cleanup from old Kconfig options)
Merging parisc-hd/for-next (f02e6c61bc1f parisc: Don't hardcode PSW values in hpmc code)
Merging powerpc/next (0edc2ca9ccc9 Revert "powerpc: Handle simultaneous interrupts at once")
Merging fsl/next (61baf1555512 powerpc/64e: Don't place the stack beyond TASK_SIZE)
Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc)
Merging s390/features (f044f4c58898 s390/fpu: export save_fpu_regs for all configs)
Merging sparc-next/master (c55c5ddedba0 sparc/time: make of_device_ids const)
Merging sh/for-next (6e2fbfdd585f sh: fix futex FUTEX_OP_SET op on userspace addresses)
Merging tile/master (0af0bc38175d mm, tile: drop arch_{add,remove}_memory)
Merging uml/linux-next (ce4586063f1a um: Add missing NR_CPUS include)
Merging unicore32/unicore32 (bc27113620ca unicore32-oldabi: add oldabi syscall interface)
Merging xtensa/xtensa-for-next (bdf3b55fde37 Merge branch 'xtensa-fixes' into xtensa-for-next)
Merging fscrypt/master (6f9d696f016f fscrypt: correct collision claim for digested names)
Merging befs/for-next (0bbabf98dd76 befs: make export work with cold dcache)
Merging btrfs/next (8b8b08cbfb90 Btrfs: fix delalloc accounting after copy_from_user faults)
Merging btrfs-kdave/for-next (736202ae51c5 Merge branch 'for-next-next-v4.13-20170605' into for-next-20170605)
CONFLICT (content): Merge conflict in fs/btrfs/extent-tree.c
Merging ceph/master (4ca2fea6f827 ceph: unify inode i_ctime update)
Merging cifs/for-next (a95cfad947d5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging configfs/for-next (19e72d3abb63 configfs: Introduce config_item_get_unless_zero())
Merging ecryptfs/next (be280b25c328 ecryptfs: remove private bin2hex implementation)
Merging ext3/for_next (fd3cfad374d4 udf: Convert udf_disk_stamp_to_time() to use mktime64())
Merging ext4/dev (67a7d5f561f4 ext4: fix fdatasync(2) after extent manipulation operations)
Merging f2fs/dev (1b7d8dd63b27 f2fs: fix a panic caused by NULL flush_cmd_control)
Merging freevxfs/for-next (bf1bb4b460c8 freevxfs: update Kconfig information)
Merging fscache/fscache (d52bd54db8be Merge branch 'akpm' (patches from Andrew))
Merging fuse/for-next (68227c03cba8 fuse: initialize the flock flag in fuse_file on allocation)
Merging jfs/jfs-next (684666e51585 jfs: atomically read inode size)
Merging nfs/linux-next (501e7a468937 NFSv4.2: Don't send mode again in post-EXCLUSIVE4_1 SETATTR with umask)
Merging nfsd/nfsd-next (bb2a8b0cd116 nfsd4: const-ify nfsd4_ops)
Merging orangefs/for-next (2f713b5c7d2a orangefs: count directory pieces correctly)
Merging overlayfs/overlayfs-next (a082c6f680da ovl: filter trusted xattr for non-admin)
Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock)
Merging ubifs/linux-next (7bccd12d27b7 ubi: Add debugfs file for tracking PEB state)
Merging xfs/for-next (161f55efba5d xfs: fix use-after-free in xfs_finish_page_writeback)
Merging file-locks/linux-next (f73127356f34 fs/fcntl: return -ESRCH in f_setown when pid/pgid can't be found)
Merging vfs/for-next (919bb328b020 Merge branch 'work.misc' into for-next)
Merging vfs-jk/vfs (030b533c4fd4 fs: Avoid premature clearing of capabilities)
Merging vfs-miklos/next (0eb8af4916a5 vfs: use helper for calling f_op->fsync())
Merging printk/for-next (f4e981cba2de printk: add __printf attributes to internal functions)
Merging pci/next (c823e5b95885 Merge branch 'pci/host-xilinx' into next)
Merging pstore/for-next/pstore (d3762358a739 pstore: Fix format string to use %u for record id)
Merging hid/for-next (4bf938cb7b1c Merge branch 'for-4.12/driver-matching-fix' into for-next)
Merging i2c/i2c/for-next (950497ff64f5 Merge branch 'i2c/for-4.13' into i2c/for-next)
Merging jdelvare-hwmon/master (08d27eb20666 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
Merging dmi/master (8efa050f19fe firmware: dmi_scan: Check DMI structure length)
Merging hwmon-staging/hwmon-next (677252a185a9 hwmon: (pwm-fan) Switch to new atomic PWM API)
Merging jc_docs/docs-next (68f04b571da4 Doc: fix a markup error in coding-style.rst)
Merging v4l-dvb/master (acec36301557 [media] s3c-camif: fix arguments position in a function call)
Merging v4l-dvb-next/master (791a9a666d1a Merge tag 'kbuild-uapi-v4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild)
Merging fbdev/fbdev-for-next (a8feae091106 uvesafb: Fix continuation printks without KERN_LEVEL to pr_cont, neatening)
Merging pm/linux-next (1e0afde20ced Merge branch 'acpi-pm' into linux-next)
Merging idle/next (306899f94804 x86 tsc: Add the Intel Denverton Processor to native_calibrate_tsc())
Merging thermal/next (cb15c81a0c1c Merge branch 'thermal-soc' into next)
Merging thermal-soc/next (33011c583fcc Merge branch 'work-linus' into work-next)
Merging ieee1394/for-next (72f3c27aa646 firewire: net: max MTU off by one)
Merging dlm/next (591c3beb86c4 dlm: Delete an unnecessary variable initialisation in dlm_ls_start())
Merging swiotlb/linux-next (69369f52d28a swiotlb-xen: implement xen_swiotlb_get_sgtable callback)
Merging net-next/master (06d4d450db77 net: dsa: Fix legacy probing)
CONFLICT (content): Merge conflict in net/decnet/dn_route.c
Applying: remove duplicate ethernet node intruduced by merge
Merging ipsec-next/master (8bafd73093f2 xfrm: add UDP encapsulation port in migrate message)
Merging netfilter-next/master (34158151d2aa netfilter: cttimeout: use nf_ct_iterate_cleanup_net to unlink timeout objs)
Merging ipvs-next/master (fb90e8dedb46 ipvs: change comparison on sync_refresh_period)
Merging wireless-drivers-next/master (c48c281e7236 wlcore: spi: remove unnecessary variable)
Merging bluetooth/master (3715c47bcda8 Merge branch 'r8152-support-new-chips')
Merging mac80211-next/master (0e74008b668f Merge tag 'mac80211-next-for-davem-2017-06-13' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next)
Merging rdma/for-next (5ed02dbb4974 Linux 4.12-rc3)
Merging gfs2/for-next (df68f20f5608 GFS2: Remove gl_list from glock structure)
Merging mtd/master (05e97a9eda72 Merge tag 'nand/fixes-for-4.12-rc3' of git://git.infradead.org/linux-mtd into MTD)
Merging l2-mtd/master (1eeef2d7483a mtd: handle partitioning on devices with 0 erasesize)
Merging nand/nand/next (d690694be933 mtd: nand: atmel: drop unused include)
Merging spi-nor/spi-nor/next (05d090f00203 mtd: spi-nor: Potential oops on error path in quad_enable())
Merging crypto/master (48df28b85991 dt-bindings: crypto: remove mediatek ethif clock)
Merging drm/drm-next (925344ccc91d BackMerge tag 'v4.12-rc5' into drm-next)
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_pm.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_display.c
Merging drm-panel/drm/panel/for-next (e4bac408b084 drm/panel: simple: Add support for Winstar WF35LTIACD)
Merging drm-intel/for-linux-next (46c26662d2fb drm/i915/cfl: Introduce Coffee Lake workarounds.)
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_engine_cs.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem_gtt.c
Merging drm-tegra/drm/tegra/for-next (43240bbd871e gpu: host1x: At first try a non-blocking allocation for the gather copy)
CONFLICT (content): Merge conflict in Documentation/gpu/index.rst
Merging drm-misc/for-linux-next (2d7b56378d32 drm/rockchip: gem: add the lacks lock and trivial changes)
Merging drm-exynos/exynos-drm/for-next (7d1e04231461 Merge tag 'usercopy-v4.8-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux)
Merging drm-msm/msm-next (51c9fbe69486 bus: SIMPLE_PM_BUS does not depend on ARCH_RENESAS)
Merging hdlcd/for-upstream/hdlcd (af8ae06b5103 drm: hdlcd: Update PM code to save/restore console.)
Merging mali-dp/for-upstream/mali-dp (e40eda3dda1e drm/arm: mali-dp: Use CMA helper for plane buffer address calculation)
Merging sunxi-drm/sunxi-drm/for-next (110d33dd428e drm/sun4i: Add compatible for the A10s pipeline)
Merging imx-drm/imx-drm/next (add1318723a0 gpu: ipu-v3: vdic: include AUTO field order bit in ipu_vdi_set_field_order)
Merging etnaviv/etnaviv/next (46a269da7e8a drm/etnaviv: restore ETNA_PREP_NOSYNC behaviour)
Merging kconfig/for-next (5bcba792bb30 localmodconfig: Fix whitespace repeat count after "tristate")
Merging regmap/for-next (5ea32fb24a83 Merge remote-tracking branches 'regmap/topic/1wire', 'regmap/topic/irq' and 'regmap/topic/lzo' into regmap-next)
Merging sound/for-next (35f8001415d3 ALSA: core: Follow standard EXPORT_SYMBOL() declarations)
Merging sound-asoc/for-next (884e89471656 Merge remote-tracking branches 'asoc/topic/sunxi', 'asoc/topic/tlv320dac31xx', 'asoc/topic/topology' and 'asoc/topic/wm-adsp' into asoc-next)
Merging modules/modules-next (3e2e857f9c3a module: Add module name to modinfo)
Merging input/next (be19788c73d3 Input: xpad - sync supported devices with XBCD)
Merging block/for-next (5a3944fb8061 Merge branch 'for-4.13/block' into for-next)
CONFLICT (content): Merge conflict in fs/btrfs/inode.c
CONFLICT (content): Merge conflict in fs/btrfs/extent_io.h
CONFLICT (content): Merge conflict in fs/btrfs/extent_io.c
CONFLICT (content): Merge conflict in fs/btrfs/disk-io.h
CONFLICT (content): Merge conflict in fs/btrfs/disk-io.c
CONFLICT (content): Merge conflict in fs/btrfs/compression.c
CONFLICT (content): Merge conflict in drivers/s390/block/scm_blk.h
CONFLICT (content): Merge conflict in drivers/s390/block/scm_blk.c
Applying: btrfs: merge fix for "block: switch bios to blk_status_t"
Applying: s390: fix up for "blk-mq: switch ->queue_rq return value to blk_status_t"
Merging lightnvm/for-next (1c6286f26301 lightnvm: fix some error code in pblk-init.c)
Merging device-mapper/for-next (1e6562930ed7 dm zoned: drive-managed zoned block device target)
Applying: dm zoned: merge fix for "blk: replace bioset_create_nobvec() with a flags arg to bioset_create()"
Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards)
Merging mmc/next (f2cd281b9f7d mmc: sdhci-pci: Enable card detect wake for Intel BYT-related SD controllers)
CONFLICT (content): Merge conflict in drivers/mmc/core/block.c
Merging kgdb/kgdb-next (7a6653fca500 kdb: Fix handling of kallsyms_symbol_next() return value)
Merging md/for-next (8df72024393c md: change the initialization value for a spare device spot to MD_DISK_ROLE_SPARE)
Merging mfd/for-mfd-next (d905cd268c76 dt-bindings: vendor-prefixes: Add arctic to vendor prefix)
Merging backlight/for-backlight-next (7e715c2d9c27 backlight: Report error on failure)
Merging battery/for-next (bfa953d336cd power: supply: sbs-battery: Don't needlessly set CAPACITY_MODE)
Merging omap_dss2/for-next (c456a2f30de5 video: smscufx: remove unused variable)
Merging regulator/for-next (142bd4193b98 Merge remote-tracking branches 'regulator/topic/settle', 'regulator/topic/tps65910' and 'regulator/topic/tps65917' into regulator-next)
Merging security/next (33f2eadabba5 apparmor: export that basic profile namespaces are supported)
Merging integrity/next (a2d9fa811f05 IMA: update IMA policy documentation to include pcr= option)
Merging keys/keys-next (3088c2ad40cf Merge remote-tracking branch 'origin/keys-fixes' into keys-next)
CONFLICT (content): Merge conflict in security/keys/dh.c
Merging selinux/next (0b4d3452b8b4 security/selinux: allow security_sb_clone_mnt_opts to enable/disable native labeling behavior)
Merging tpmdd/next (e4b0852798bc tpm/tpm_atmel: remove unnecessary NULL check)
Merging watchdog/master (3a9aedb282ac watchdog: w83627hf: Add support for NCT6793D and NCT6795D)
Merging iommu/next (dffa88289b95 Merge branches 'iommu/fixes', 'arm/rockchip', 'arm/renesas', 'arm/core', 'x86/vt-d' and 'x86/amd' into next)
Merging dwmw2-iommu/master (910170442944 iommu/vt-d: Fix PASID table allocation)
Merging vfio/next (7b3a10df1d4b vfio: Use ERR_CAST() instead of open coding it)
Merging trivial/for-next (6fbc8798d946 tty: fix comment for __tty_alloc_driver())
Merging audit/next (cd33f5f2cbfa audit: make sure we never skip the multicast broadcast)
Merging devicetree/for-next (acedeb509830 MAINTAINERS: add device tree ABI documentation file)
Merging mailbox/mailbox-for-next (25bfee16d5a3 mailbox: Introduce Qualcomm APCS IPC driver)
Merging spi/for-next (2b37bbbc6291 Merge remote-tracking branches 'spi/topic/rockchip', 'spi/topic/sh-msiof', 'spi/topic/spidev' and 'spi/topic/st-ssc4' into spi-next)
Merging tip/auto-latest (8b613ccb9d93 Merge branch 'x86/urgent')
CONFLICT (content): Merge conflict in arch/unicore32/include/asm/Kbuild
Merging clockevents/clockevents/next (d9569035d594 clocksource: Add an alias macro CLOCKSOURCE_OF_DECLARE)
Merging edac/linux_next (345fb0a9a634 Merge tag 'edac_for_4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp)
Merging edac-amd/for-next (ff0abed4922f EDAC, altera: Simplify calculation of total memory)
Merging irqchip/irqchip/for-next (c1ae3cfa0e89 Linux 4.11-rc1)
Merging ftrace/for-next (6ee98ffeea0b x86/ftrace: Make sure that ftrace trampolines are not RWX)
Merging rcu/rcu/next (b79e92e97107 srcu: Make process_srcu() be static)
Merging kvm/linux-next (9d643f63128b KVM: x86: avoid large stack allocations in em_fxrstor)
Merging kvm-arm/next (02d50cdaff36 KVM: ARM64: fix phy counter access failure in guest.)
Merging kvm-mips/next (dc44abd6aad2 KVM: MIPS/Emulate: Properly implement TLBR for T&E)
Merging kvm-ppc/kvm-ppc-next (3d3efb68c19e KVM: PPC: Book3S HV: Ignore timebase offset on POWER9 DD1)
Merging kvms390/next (a2bdbb2c7e70 KVM: s390: ioctls to get and set guest storage attributes)
CONFLICT (content): Merge conflict in arch/s390/include/asm/kvm_host.h
Merging xen-tip/linux-next (84b7625728ea xen: add sysfs node for hypervisor build id)
Merging percpu/for-next (1328710b8ec3 mark most percpu globals as __ro_after_init)
Merging workqueues/for-next (bacb71fc9187 Merge branch 'for-4.12' into for-next)
Merging drivers-x86/for-next (5d4be5f2b1f1 platform/x86: dell-rbtn: Improve explanation about DELLABC6)
Merging chrome-platform/for-next (31b764171cb5 Revert "platform/chrome: chromeos_laptop: Add Leon Touch")
Merging hsi/for-next (67ddd75771b6 HSI: core: Use kcalloc() in two functions)
Merging leds/for-next (a5a82ff65611 Revert "leds: handle suspend/resume in heartbeat trigger")
Merging ipmi/for-next (afd0c88230c0 ipmi: Convert DMI handling over to a platform device)
Merging driver-core/driver-core-next (d565ed38d045 arm: mach-rpc: ecard: fix build error)
Merging usb/usb-next (21bdb3b071a7 Merge tag 'phy-for-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy into usb-next)
Merging usb-gadget/next (ece7af5f787e usb: dwc3: exynos: Handle return value of clk_prepare_enable)
CONFLICT (content): Merge conflict in drivers/usb/gadget/function/f_mass_storage.c
Merging usb-serial/usb-next (08f741a93333 USB: serial: qcserial: expose methods for modem control)
Merging usb-chipidea-next/ci-for-usb-next (c4a0bbbdb7f6 usb: chipidea: properly handle host or gadget initialization failure)
Merging phy-next/next (af850e14a7ae phy: bcm-ns-usb3: add MDIO driver using proper bus layer)
Merging tty/tty-next (92c8f7c0e109 tty/serial: atmel: make the driver DT only)
Merging char-misc/char-misc-next (cbbdc6082917 misc: apds990x: Use sysfs_match_string() helper)
CONFLICT (content): Merge conflict in Documentation/admin-guide/index.rst
CONFLICT (modify/delete): Documentation/DocBook/w1.tmpl deleted in HEAD and modified in char-misc/char-misc-next. Version char-misc/char-misc-next of Documentation/DocBook/w1.tmpl left in tree.
$ git rm -f Documentation/DocBook/w1.tmpl
Applying: docs-rst: merge fix for "DocBook: w1: Update W1 file locations and names in DocBook"
Merging extcon/extcon-next (1f4be24786b8 extcon: int3496: Switch to devm_acpi_dev_add_driver_gpios())
Merging staging/staging-next (d567b0fe2d63 staging: android: ion: Improve memory alloc style)
CONFLICT (content): Merge conflict in include/uapi/linux/tty.h
Merging mux/for-next (a351e9b9fc24 Linux 4.11)
Merging slave-dma/next (9d4f4a2b926b Merge branch 'topic/mxs' into next)
Merging cgroup/for-next (b6053d40e338 cgroup: fix lockdep warning in debug controller)
Merging scsi/for-next (1080f7ec6125 scsi: lpfc: update to revision to 11.4.0.0)
CONFLICT (content): Merge conflict in drivers/scsi/scsi_lib.c
Merging scsi-mkp/for-next (1080f7ec6125 scsi: lpfc: update to revision to 11.4.0.0)
Merging target-updates/for-next (28d44b983000 tcmu: Add Type of reconfig into netlink)
CONFLICT (content): Merge conflict in drivers/scsi/qla2xxx/qla_target.c
Merging target-merge/for-next-merge (2994a7518317 cxgb4: update Kconfig and Makefile)
Merging target-bva/for-next (2ea659a9ef48 Linux 4.12-rc1)
Merging libata/for-next (d6f6f8c3f726 Merge branch 'for-4.13' into for-next)
Merging binfmt_misc/for-next (4af75df6a410 binfmt_misc: add F option description to documentation)
Merging vhost/linux-next (e41b1355508d virtio_balloon: disable VIOMMU support)
Merging rpmsg/for-next (0696d197bda1 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
Merging gpio/for-next (5c996b7eb52c Merge branch 'devel' into for-next)
Merging pinctrl/for-next (6777c135a734 Merge branch 'devel' into for-next)
CONFLICT (content): Merge conflict in MAINTAINERS
Merging pinctrl-samsung/for-next (a453f3693f2a pinctrl: samsung: Explicitly cast pointer returned by of_iomap() to iomem)
Merging dma-mapping/dma-mapping-next (1001354ca341 Linux 4.9-rc1)
Merging pwm/for-next (97512ceafaac Merge branch 'for-4.12/drivers' into for-next)
Merging dma-buf/for-next (194cad44c4e1 dma-buf/sync_file: improve Kconfig description for Sync Files)
CONFLICT (content): Merge conflict in drivers/dma-buf/Kconfig
Merging userns/for-next (296990deb389 mnt: Make propagate_umount less slow for overlapping mount propagation trees)
Merging ktest/for-next (f7c6401ff84a ktest: Make sure wait_for_input does honor the timeout)
Merging random/dev (9d9035bc6d78 random: suppress duplicate crng_init=0 warnings)
Merging aio/master (b562e44f507e Linux 4.5)
Merging kselftest/next (34539b6c487c kselftest: membarrier: make test names more informative)
CONFLICT (content): Merge conflict in MAINTAINERS
CONFLICT (content): Merge conflict in Documentation/dev-tools/index.rst
Merging y2038/y2038 (69973b830859 Linux 4.9)
Merging luto-misc/next (2dcd0af568b0 Linux 4.6)
Merging borntraeger/linux-next (e76d21c40bd6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging livepatching/for-next (c87a040fb6c5 Merge branch 'for-4.12/upstream-fixes' into for-next)
Merging coresight/next (92cd7037795e arm64: dts: qcom: msm8916: Add debug unit)
Merging rtc/rtc-next (5c82a6ae0242 rtc: remove rtc_device.name)
Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field)
Merging nvdimm/libnvdimm-for-next (f5705aa8cfed dax, xfs, ext4: compile out iomap-dax paths in the FS_DAX=n case)
Merging dax-misc/dax-misc (4d9a2c874667 dax: Remove i_mmap_lock protection)
Merging idr/idr-4.11 (f0f3f2d0a3e0 radix tree test suite: Specify -m32 in LDFLAGS too)
Merging kspp/for-next/kspp (94e4eaaabea7 Merge branch 'kspp/fortify/latest' into for-next/kspp)
Merging akpm-current/current (9c742c8a288f ipc/util.h: update documentation for ipc_getref() and ipc_putref())
CONFLICT (content): Merge conflict in include/linux/random.h
$ git checkout -b akpm remotes/origin/akpm/master
Applying: net/netfilter/x_tables.c: use kvmalloc() in xt_alloc_table_info()
Applying: sparc64: NG4 memset 32 bits overflow
Applying: xtensa: use generic fb.h
Applying: lib/crc-ccitt: add CCITT-FALSE CRC16 variant
Merging akpm/master (9c0ac6904edd lib/crc-ccitt: add CCITT-FALSE CRC16 variant)
Applying: Revert "lib-extablec-use-bsearch-library-function-in-search_extable-checkpatch-fixes"
Applying: Revert "lib/extable.c: use bsearch() library function in search_extable()"
^ permalink raw reply [flat|nested] 9+ messages in thread
* linux-next: Tree for Jun 19
@ 2015-06-19 5:16 Michael Ellerman
0 siblings, 0 replies; 9+ messages in thread
From: Michael Ellerman @ 2015-06-19 5:16 UTC (permalink / raw)
To: linux-next; +Cc: Linux Kernel Mailing List
Hi all,
Changes since 20150618:
The v4l-dvb tree gained a build failure.
The kvm tree gained a conflict against the tip tree.
The drivers-x86 tree gained some conflicts against the pm tree.
Non-merge commits (relative to Linus' tree): 11423
9716 files changed, 1038136 insertions(+), 242673 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 219 trees (counting Linus' and 31 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.
cheers
$ git checkout master
$ git reset --hard stable
Merging origin/master (17fda38f1595 Merge tag 'trace-fix-filter-4.1-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace)
Merging fixes/master (b94d525e58dc Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging kbuild-current/rc-fixes (c517d838eb7d Linux 4.0-rc1)
Merging arc-current/for-curr (e4140819dadc ARC: signal handling robustify)
Merging arm-current/fixes (0bbe6b5a73c0 ARM: 8388/1: tcm: Don't crash when TCM banks are protected by TrustZone)
Merging m68k-current/for-linus (b24f670b7f5b m68k/mac: Fix out-of-bounds array index in OSS IRQ source initialization)
Merging metag-fixes/fixes (0164a711c97b metag: Fix ioremap_wc/ioremap_cached build errors)
Merging mips-fixes/mips-fixes (1795cd9b3a91 Linux 3.16-rc5)
Merging powerpc-merge-mpe/fixes (c65b99f04684 Linux 4.1-rc6)
Merging powerpc-merge/merge (c517d838eb7d Linux 4.0-rc1)
Merging sparc/master (c46a024ea5eb Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging net/master (2dab80a8b486 bridge: fix br_stp_set_bridge_priority race conditions)
Merging ipsec/master (31a418986a58 xen: netback: read hotplug script once at start of day.)
Merging sound-current/for-linus (145c0e914d2c ALSA: hda - Fix unused label skip_i915)
Merging pci-current/for-linus (552bc94ebeeb PCI: Preserve resource size during alignment reordering)
Merging wireless-drivers/master (38fe44e61a89 Merge tag 'iwlwifi-for-kalle-2015-05-28' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes)
Merging driver-core.current/driver-core-linus (d4a4f75cd8f2 Linux 4.1-rc7)
Merging tty.current/tty-linus (d4a4f75cd8f2 Linux 4.1-rc7)
Merging usb.current/usb-linus (d4a4f75cd8f2 Linux 4.1-rc7)
Merging usb-gadget-fixes/fixes (c94e289f195e usb: gadget: remove incorrect __init/__exit annotations)
Merging usb-serial-fixes/usb-linus (0f57d86787d8 Linux 4.1-rc8)
Merging staging.current/staging-linus (d4a4f75cd8f2 Linux 4.1-rc7)
Merging char-misc.current/char-misc-linus (e26081808eda Linux 4.1-rc4)
Merging input-current/for-linus (469d7d22cea1 Input: pixcir_i2c_ts - fix receive error)
Merging crypto-current/master (412c98c1bef6 crypto: caam - fix RNG buffer cache alignment)
Merging ide/master (d681f1166919 ide: remove deprecated use of pci api)
Merging devicetree-current/devicetree/merge (f76502aa9140 of/dynamic: Fix test for PPC_PSERIES)
Merging rr-fixes/fixes (f36963c9d3f6 cpumask_set_cpu_local_first => cpumask_local_spread, lament)
Merging vfio-fixes/for-linus (db7d4d7f4021 vfio: Fix runaway interruptible timeout)
Merging kselftest-fixes/fixes (ba155e2d21f6 Linux 4.1-rc5)
Merging backlight-fixes/for-backlight-fixes (68feaca0b13e backlight: pwm: Handle EPROBE_DEFER while requesting the PWM)
Merging drm-intel-fixes/for-linux-next-fixes (245ec9d85696 Revert "drm/i915: Don't skip request retirement if the active list is empty")
Merging asm-generic/master (643165c8bbc8 Merge tag 'uaccess_for_upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost into asm-generic)
Merging arc/for-next (9907203dd026 ARC: intc: split into ARCompact ISA specific, common bits)
Merging arm/for-next (9ce93bdda7b7 ARM: fix new BSYM() usage introduced via for-arm-soc branch)
Merging arm-perf/for-next/perf (74cf0bc75f16 arm: perf: unify perf_event{,_cpu}.c)
Merging arm-soc/for-next (1f697b6bbd68 Merge branch 'next/dt' into for-next)
Merging at91/at91-next (dd1f58f398fb Merge branch 'at91-4.2-dt' into at91-next)
Merging bcm2835/for-next (b2776bf7149b Linux 3.18)
Merging rpi/for-rpi-next (50b674b89355 Merge branches 'for-rpi-next-soc' and 'for-rpi-next-dt' into for-rpi-next)
Merging berlin/berlin/for-next (7f8ad9c26be9 Merge branch 'berlin/simple-mfd' into berlin/for-next)
Merging cortex-m/for-next (e799b6f37e6c ARM: zImage: add support for ARMv7-M)
Merging imx-mxs/for-next (5bfaa924477b Merge branch 'imx/defconfig' into for-next)
Merging keystone/next (a6ba4234e474 ARM: dts: k2l: fix the netcp range size)
Merging mvebu/for-next (efeda1519ed0 Merge branch 'mvebu/dt' into mvebu/for-next)
Merging omap/for-next (8e638875387f Merge tag 'omap-for-v4.2/wakeirq-drivers-v2' into for-next)
Merging omap-pending/for-next (30aa18d3bea5 MAINTAINERS: add maintainer for OMAP hwmod data)
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/omap_hwmod_7xx_data.c
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/omap_hwmod_43xx_data.c
Merging renesas/next (613915220fbc Merge branch 'heads/dt-for-v4.2' into next)
Merging samsung/for-next (7585f44e561e Merge branch 'v4.2-next/dt64-samsung' into for-next)
Merging sunxi/sunxi/for-next (11f9fb71e172 Merge branch 'sunxi/dt-for-4.2' into sunxi/for-next)
Merging tegra/for-next (a9460d4a7ed1 Merge branch for-4.2/cpufreq into for-next)
Merging arm64/for-next/core (4e2ee96a63d4 arm64: compat: print compat_sp instead of sp)
Merging blackfin/for-linus (d91e14b3b9e1 eth: bf609 eth clock: add pclk clock for stmmac driver probe)
Merging c6x/for-linux-next (3083ca2376a7 c6x: platforms: cache: Export symbol L1P_cache_block_invalidate and L1D_cache_block_writeback)
Merging cris/for-next (1e4d6e13d050 cris: don't use module_init for non-modular core eeprom.c code)
Merging h8300/h8300-next (1c948ec63ab3 Merge branch 'h8300-next' of git.sourceforge.jp:/gitroot/uclinux-h8/linux into h8300-next)
CONFLICT (content): Merge conflict in drivers/irqchip/Makefile
CONFLICT (content): Merge conflict in drivers/clocksource/Kconfig
Merging hexagon/linux-next (8914d7e85780 Hexagon: fix signal delivery for debug traps)
Merging ia64/next (ae40b7e28752 Merge branch 'misc-4.2' into next)
Merging m68k/for-next (1214c525484c m68k: Use for_each_sg())
Merging m68knommu/for-next (73cb9dc0cd8d m68k: Use vsprintf %pM extension)
Merging metag/for-next (40346a0327fe metag: copy_thread(): rename 'arg' argument to 'kthread_arg')
Merging microblaze/next (c4fa9a6ae285 microblaze/PCI: Remove unnecessary struct pci_dev declaration)
Merging mips/mips-for-linux-next (939bc40371c1 Merge branch '4.1-fixes' into mips-for-linux-next)
CONFLICT (content): Merge conflict in drivers/tty/serial/8250/Makefile
CONFLICT (content): Merge conflict in drivers/tty/serial/8250/Kconfig
CONFLICT (content): Merge conflict in drivers/irqchip/Makefile
CONFLICT (content): Merge conflict in drivers/irqchip/Kconfig
CONFLICT (content): Merge conflict in drivers/clk/Makefile
Merging nios2/nios2-next (1a70db49a735 nios2: rework cache)
Merging parisc-hd/for-next (4b470f120817 Merge branch 'parisc-4.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux)
Merging powerpc-mpe/next (b5926430dfa0 powerpc/iommu/ioda2: Enable compile with IOV=on and IOMMU_API=off)
Merging powerpc/next (65e7bb2a34fe Merge branch 'next-sriov' into next)
Merging fsl/next (f1b3b4450dcb powerpc/85xx: Replace CONFIG_USB_ISP1760_HCD by CONFIG_USB_ISP1760)
Merging mpc5xxx/next (9e813308a5c1 powerpc/thp: Add tracepoints to track hugepage invalidate)
Merging s390/features (7fc611ff3ff1 s390/pci: improve handling of hotplug event 0x301)
Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
Merging tile/master (5316a64ce518 tile: avoid a "label not used" warning in do_page_fault())
Merging uml/linux-next (6c684465587a um: Fix warning in setup_signal_stack_si())
Merging unicore32/unicore32 (d670878e2c9a unicore32: Remove ARCH_HAS_CPUFREQ config option)
Merging xtensa/for_next (ba155e2d21f6 Linux 4.1-rc5)
Merging btrfs/next (e082f56313f3 btrfs: quota: Update quota tree after qgroup relationship change.)
Merging ceph/master (84b54fefaa05 libceph: announce support for straw2 buckets)
Merging cifs/for-next (843b06f1f0cb client MUST ignore EncryptionKeyLength if CAP_EXTENDED_SECURITY is set)
Merging ecryptfs/next (6d65261a09ad eCryptfs: don't pass fs-specific ioctl commands through)
Merging ext3/for_next (792352cb160e udf: fix udf_load_pvoldesc())
Merging ext4/dev (8b6d8f1be835 jbd2: get rid of open coded allocation retry loop)
Merging f2fs/dev (3c4541452748 f2fs: do not trim preallocated blocks when truncating after i_size)
Merging fscache/fscache (b00c2ae2ed3c FS-Cache: Don't override netfs's primary_index if registering failed)
Merging fuse/for-next (780e2a3f06e7 fuse: update MAINTAINERS entry)
Merging gfs2/for-next (e7ccaf5fe159 GFS2: Don't add all glocks to the lru)
Merging jfs/jfs-next (f7f31adf07d1 jfs: fix indentation on if statement)
Merging nfs/linux-next (dfad7000f32e nfs: Fix comment for nfs_pageio_init() and nfs_pageio_complete_mirror())
Merging nfsd/nfsd-next (185406191af5 nfsd: Allows user un-mounting filesystem where nfsd exports base on)
Merging overlayfs/overlayfs-next (3ed6b3b4255d ovl: allow distributed fs as lower layer)
Merging squashfs/master (62421645bb70 Squashfs: Add LZ4 compression configuration option)
Merging v9fs/for-next (3d99e3fe13d4 Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile)
Merging ubifs/linux-next (98fb1ffd8154 UBI: block: Add missing cache flushes)
Merging xfs/for-next (4ea79766168b Merge branch 'xfs-commit-cleanup' into for-next)
Merging file-locks/linux-next (7505256626b0 Merge tag 'devicetree-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/glikely/linux)
Merging vfs/for-next (4ef51e8b7aaa Merge branch 'for-linus' into for-next)
CONFLICT (content): Merge conflict in fs/namei.c
CONFLICT (modify/delete): fs/hppfs/hppfs.c deleted in HEAD and modified in vfs/for-next. Version vfs/for-next of fs/hppfs/hppfs.c left in tree.
CONFLICT (content): Merge conflict in fs/ext4/symlink.c
$ git rm -f fs/hppfs/hppfs.c
Applying: f2fs: merge fix for follow_link changes
Merging pci/next (7a3e9b247e80 Merge branches 'pci/host-xgene' and 'pci/hotplug' into next)
Merging hid/for-next (c0f37da04b5b Merge branch 'for-4.2/upstream' into for-next)
Merging i2c/i2c/for-next (36f909cdafdc Merge branch 'i2c/for-current' into i2c/for-next)
Merging jdelvare-hwmon/master (2b30464a2c87 hwmon: Document which I2C addresses can be probed)
Merging dmi/master (bec755ee1080 firmware: dmi: struct dmi_header should be packed)
Merging hwmon-staging/hwmon-next (f6725ae2f1ae hwmon: (ntc_thermistor) Improve precision of resistance calculation)
Merging v4l-dvb/master (fdf11845cbc1 bdisp-debug: don't try to divide by s64)
Merging kbuild/for-next (31d61069530b Merge branch 'kbuild/kconfig' into kbuild/for-next)
Merging kconfig/for-next (bfa76d495765 Linux 3.19)
Merging libata/for-next (fad6f9d58c07 Merge branch 'for-4.2' into for-next)
Merging pm/linux-next (782e4c3c06e0 Merge branches 'pnp' and 'pm-tools')
Merging idle/next (a576d08d4eb2 Merge branches 'cpuidle' and 'turbostat' into release)
Merging apm/for-next (53675abbd1e5 x86, apm: Remove unused variable)
Merging thermal/next (111b23cf895b Merge branches 'release' and 'thermal-soc' of .git into next)
Merging thermal-soc/next (b89384e9e8c0 Merge branch 'work-linus' into work-next)
Merging ieee1394/for-next (d71e6a11737f firewire: core: use correct vendor/model IDs)
Merging dlm/next (2ab4bd8ea3a6 dlm: adopt orphan locks)
Merging swiotlb/linux-next (023600f192be swiotlb: do not export map_single function)
Merging slave-dma/next (abea4d0a025b Merge branch 'topic/xdmac' into next)
Merging net-next/master (b67ea97fcd4e Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue)
CONFLICT (content): Merge conflict in drivers/net/ethernet/mellanox/mlx4/main.c
Merging ipsec-next/master (493be55ac3d8 xen-netfront: Use setup_timer)
Merging wireless-drivers-next/master (40b503c76481 brcmfmac: make brcmf_p2p_detach() call conditional)
Merging bluetooth/master (952497b15946 Bluetooth: Fix warning of potentially uninitialized adv_instance variable)
Merging rdma/for-next (8e4349d13f33 IB/mad: Add final OPA MAD processing)
CONFLICT (content): Merge conflict in net/sunrpc/xprtrdma/verbs.c
CONFLICT (content): Merge conflict in net/sunrpc/xprtrdma/frwr_ops.c
CONFLICT (content): Merge conflict in drivers/net/ethernet/chelsio/cxgb4/sge.c
CONFLICT (content): Merge conflict in drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
CONFLICT (content): Merge conflict in drivers/infiniband/hw/mlx5/main.c
CONFLICT (content): Merge conflict in drivers/infiniband/hw/mlx4/mad.c
Merging mtd/master (e26081808eda Linux 4.1-rc4)
Merging l2-mtd/master (0eb8618bd075 mtd: docg3: Fix kasprintf() usage)
CONFLICT (content): Merge conflict in MAINTAINERS
Merging crypto/master (596103cf8fb0 crypto: drivers - Fix Kconfig selects)
CONFLICT (content): Merge conflict in net/ipv6/esp6.c
CONFLICT (content): Merge conflict in net/ipv4/esp4.c
Merging drm/drm-next (0dc499aff57f Merge branch 'virtio-gpu-drm-next' of git://git.kraxel.org/linux into drm-next)
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_ringbuffer.c
Applying: drm/amdgpu: fix the build on big endian
Merging drm-panel/drm/panel/for-next (4946b0430c69 drm/panel: simple: Add bus format for HannStar HSD100PXN1)
Merging drm-intel/for-linux-next (4ed9fb371ccd drm/i915: Don't set enabled value of all CRTCs when restoring the mode)
Merging drm-tegra/drm/tegra/for-next (8a8005e3e199 drm/tegra: dpaux: Registers are 32-bit)
Merging drm-misc/topic/drm-misc (30616e4fe017 drm: Avoid the double clflush on the last cache line in drm_clflush_virt_range())
Merging drm-exynos/exynos-drm/for-next (fb6ba97a9015 drm/exynos: fimd: fix page fault issue with iommu)
Merging drm-msm/msm-next (1a370be9ac51 drm/msm: restart queued submits after hang)
Merging sound/for-next (d39513f85163 ALSA: HDAC: move SND_HDA_PREALLOC_SIZE to core)
Merging sound-asoc/for-next (ba0875610d5f Merge remote-tracking branches 'asoc/topic/wm8741' and 'asoc/topic/wm8995' into asoc-next)
Merging modules/modules-next (6727bb9c6abe kernel/module.c: avoid ifdefs for sig_enforce declaration)
Merging input/next (84c88ef9affb MAINTAINERS: remove non existent input mt git tree)
Merging block/for-next (940ce5604f91 Merge branch 'for-4.2/writeback' into for-next)
CONFLICT (content): Merge conflict in mm/page-writeback.c
CONFLICT (content): Merge conflict in mm/backing-dev.c
CONFLICT (content): Merge conflict in include/linux/blkdev.h
CONFLICT (content): Merge conflict in drivers/md/dm.c
CONFLICT (content): Merge conflict in drivers/block/nvme-core.c
CONFLICT (content): Merge conflict in arch/um/include/asm/Kbuild
CONFLICT (content): Merge conflict in arch/cris/include/asm/Kbuild
CONFLICT (content): Merge conflict in MAINTAINERS
Merging device-mapper/for-next (e262f3474152 dm stats: add support for request-based DM devices)
Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards)
Merging mmc/mmc-next (11bc9381b277 mmc: sdhci-s3c: use mmc_of_parse and remove the card_tasklet)
Merging mmc-uh/next (a8c27c0bea45 mmc: queue: prevent soft lockups on PREEMPT=n)
Merging kgdb/kgdb-next (2d289f14f00a kdb: Fix handling of kallsyms_symbol_next() return value)
Merging md/for-next (53f1d5b6f311 md: clear Blocked flag on failed devices when array is read-only.)
Merging mfd/for-mfd-next (00479c6fe51f mfd: lpc_ich: Assign subdevice ids automatically)
CONFLICT (content): Merge conflict in MAINTAINERS
Merging backlight/for-backlight-next (a7f6d4571393 backlight: pwm_bl: Simplify usage of devm_gpiod_get_optional)
Merging battery/master (85a5965e1dc5 wm831x_power: Fix off-by-one at free_irq())
Merging omap_dss2/for-next (a8998202c1d8 Merge omapdss componentization work)
Merging regulator/for-next (af937c032fc6 Merge remote-tracking branches 'regulator/topic/of', 'regulator/topic/pwm', 'regulator/topic/qcom' and 'regulator/topic/soft-start' into regulator-next)
Merging security/next (b3bddffd35a0 Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity into next)
CONFLICT (content): Merge conflict in security/security.c
CONFLICT (modify/delete): security/capability.c deleted in security/next and modified in HEAD. Version HEAD of security/capability.c left in tree.
CONFLICT (content): Merge conflict in include/linux/security.h
$ git rm -f security/capability.c
Applying: LSM: merge fix for follow_link API changes
Merging integrity/next (24fd03c87695 ima: update builtin policies)
Merging selinux/next (9fc2b4b436cf selinux: fix setting of security labels on NFS)
Merging lblnet/next (b2776bf7149b Linux 3.18)
Merging watchdog/master (e72cb910fd8d watchdog: da9062: DA9062 watchdog driver)
CONFLICT (add/add): Merge conflict in drivers/watchdog/st_lpc_wdt.c
CONFLICT (content): Merge conflict in drivers/watchdog/Kconfig
Merging iommu/next (49d25d04b661 Merge branches 'arm/rockchip', 'arm/exynos', 'arm/smmu', 'x86/vt-d', 'x86/amd', 'default-domains' and 'core' into next)
Merging dwmw2-iommu/master (c83b2f20fdde iommu/vt-d: Only enable extended context tables if PASID is supported)
Merging vfio/next (20f300175a1e vfio/pci: Fix racy vfio_device_get_from_dev() call)
Merging osd/linux-next (1fa3a002b254 Boaz Harrosh - fix email in Documentation)
Merging jc_docs/docs-next (f8785d94fc4e Merge branch 'doc/4.2' into docs-next)
Merging trivial/for-next (79ce48df755e lpfc: Grammar s/an negative/a negative/)
Merging audit/next (0b08c5e59441 audit: Fix check of return value of strnlen_user())
CONFLICT (content): Merge conflict in security/lsm_audit.c
Merging devicetree/devicetree/next (ce32f859646b of/fdt: fix argument name and add comments of unflatten_dt_node())
Merging dt-rh/for-next (63a4aea55670 of: clean-up unnecessary libfdt include paths)
Merging mailbox/mailbox-for-next (07a7dba17132 dt: mailbox: Remove 'mbox-names property is discouraged' message from binding)
Merging spi/for-next (fda052b0a522 Merge remote-tracking branches 'spi/topic/sirf', 'spi/topic/spidev' and 'spi/topic/zynq' into spi-next)
Merging tip/auto-latest (9028a5f33a9f Merge branch 'x86/platform')
CONFLICT (content): Merge conflict in include/linux/rcupdate.h
CONFLICT (content): Merge conflict in drivers/iommu/intel_irq_remapping.c
CONFLICT (content): Merge conflict in drivers/iommu/dmar.c
CONFLICT (content): Merge conflict in drivers/crypto/vmx/ghash.c
CONFLICT (content): Merge conflict in drivers/crypto/vmx/aes_cbc.c
CONFLICT (content): Merge conflict in drivers/crypto/vmx/aes.c
CONFLICT (content): Merge conflict in drivers/clocksource/Makefile
Applying: rcu: merge fix for Convert ACCESS_ONCE() to READ_ONCE() and WRITE_ONCE()
Merging clockevents/clockevents/next (645d558b1cd5 Merge branch 'clockevents/4.2' into clockevents/next)
CONFLICT (add/add): Merge conflict in drivers/clocksource/timer-stm32.c
CONFLICT (content): Merge conflict in drivers/clocksource/Makefile
Merging edac/linux_next (fa2ce64f85be sb_edac: support for Broadwell -EP and -EX)
Merging edac-amd/for-next (f75be5d2efa9 EDAC, mce_amd_inj: Make it depend on AMD_NB)
CONFLICT (content): Merge conflict in arch/x86/Kconfig
CONFLICT (content): Merge conflict in arch/tile/Kconfig
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/apm/apm-storm.dtsi
Merging irqchip/irqchip/for-next (a8bcdc32fafb Merge branch 'irqchip/core' into irqchip/for-next)
Merging tiny/tiny/next (f114040e3ea6 Linux 3.18-rc1)
Merging ftrace/for-next (33d657d13810 ring-buffer-benchmark: Fix the wrong type)
Merging rcu/rcu/next (66709041ffca cpu: Wait for RCU grace periods concurrently)
Merging kvm/linux-next (e80a4a9426ad KVM: x86: mark legacy PCI device assignment as deprecated)
CONFLICT (content): Merge conflict in arch/x86/kvm/x86.c
CONFLICT (content): Merge conflict in arch/x86/kvm/mmu.c
CONFLICT (content): Merge conflict in arch/x86/kvm/lapic.c
CONFLICT (content): Merge conflict in arch/x86/include/asm/kvm_host.h
Applying: kvm: bad merge fix patch for arch/x86/kvm/cpuid.c
Merging kvm-arm/next (c62e631d4a8e KVM: arm/arm64: vgic: Remove useless arm-gic.h #include)
Merging kvm-ppc/kvm-ppc-next (b79013b2449c Merge tag 'staging-4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging)
Merging kvms390/next (ea2cdd27dce6 KVM: s390: introduce KMSG_COMPONENT for kvm-s390)
Merging xen-tip/linux-next (ffb7dbed47da xen/arm: Define xen_arch_suspend())
Merging percpu/for-next (4c907baf36d8 percpu_ref: implement percpu_ref_is_dying())
Merging workqueues/for-next (402dd89d6cdb workqueue: fix typos in comments)
Merging drivers-x86/for-next (5ee7041e5bc0 MAINTAINERS: Orphan x86 driver msi-wmi)
CONFLICT (content): Merge conflict in drivers/platform/x86/samsung-laptop.c
CONFLICT (content): Merge conflict in drivers/platform/x86/ideapad-laptop.c
CONFLICT (content): Merge conflict in drivers/platform/x86/asus-wmi.c
CONFLICT (content): Merge conflict in drivers/platform/x86/apple-gmux.c
Merging chrome-platform/for-next (96cba9b00e29 platform/chrome: chromeos_laptop - instantiate Atmel at primary address)
Merging regmap/for-next (970284e6d6f5 Merge remote-tracking branches 'regmap/topic/defaults', 'regmap/topic/irq' and 'regmap/topic/reg-params' into regmap-next)
Merging hsi/for-next (1269594a93bb HSI: nokia-modem: use flags argument of devm_gpiod_get to set direction)
Merging leds/for-next (e0dd268a2c98 leds: aat1290: pass flags parameter to devm_gpiod_get)
Merging ipmi/for-next (cc5c8d2cc014 ipmi: Make some data const that was only read)
Merging driver-core/driver-core-next (0e6c861f73ec Revert "base/platform: Only insert MEM and IO resources")
Merging tty/tty-next (48a6092fb41f serial: stm32-usart: Add STM32 USART Driver)
Merging usb/usb-next (50641056d833 usb: dwc3: Use ASCII space in Kconfig)
CONFLICT (content): Merge conflict in drivers/phy/Makefile
Merging usb-gadget/next (e18b7975c885 usb: dwc3: gadget: don't clear EP_BUSY too early)
Merging usb-serial/usb-next (f05b7cb6f2be USB: serial: mos7840: Use setup_timer)
Merging staging/staging-next (8efba0e0d013 staging: sm7xxfb: fix camelcase)
CONFLICT (content): Merge conflict in tools/Makefile
CONFLICT (modify/delete): drivers/staging/media/dt3155v4l/dt3155v4l.c deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/dt3155v4l/dt3155v4l.c left in tree.
CONFLICT (content): Merge conflict in drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c
$ git rm -f drivers/staging/media/dt3155v4l/dt3155v4l.c
Applying: staging: wilc1000: fix call to cfg80211_disconnecteddue to API change
Applying: staging: disable the WILC1000 driver
Merging char-misc/char-misc-next (5069288bd477 MAINTAINERS: mei: add mei_cl_bus.h to maintained file list)
CONFLICT (content): Merge conflict in include/linux/mfd/axp20x.h
CONFLICT (content): Merge conflict in include/dt-bindings/mfd/arizona.h
Applying: power: axp288_charger: fix for API change
Merging extcon/extcon-next (f8df88081183 extcon: Remove optional print_name() function pointer of extcon_dev)
Merging kdbus/kdbus (cf15adc8b481 kdbus: use FIELD_SIZEOF in kdbus_member_set_user macro)
Merging cgroup/for-next (8a0792ef8e01 cgroup: add delegation section to unified hierarchy documentation)
Merging scsi/for-next (24136f2c0b3b snic: driver for Cisco SCSI HBA)
CONFLICT (content): Merge conflict in drivers/target/target_core_user.c
Merging target-updates/for-next (7517784592fc target/user: Fix inconsistent kmap_atomic/kunmap_atomic)
Merging target-merge/for-next-merge (b28a960c42fc Linux 3.14-rc2)
Merging pinctrl/for-next (323de9efdf3e pinctrl: make pinctrl_register() return proper error code)
Merging vhost/linux-next (fa5f6add30c7 tun, macvtap: higher order allocations for skbs)
Merging remoteproc/for-next (8de3dbd0895b remoteproc: fix !CONFIG_OF build breakage)
Merging rpmsg/for-next (b1b9891441fa rpmsg: use less buffers when vrings are small)
Merging gpio/for-next (f35bbf61ab77 gpio / ACPI: Return -EPROBE_DEFER if the gpiochip was not found)
Merging dma-mapping/dma-mapping-next (5ebe6afaf005 Linux 4.1-rc2)
Merging pwm/for-next (361c1066c939 pwm: lpss: pci: Add support for Broxton platform)
Merging dma-buf/for-next (5136629dc5a1 dma-buf: Minor coding style fixes)
Merging userns/for-next (c97648cb2f34 mnt: Update fs_fully_visible to test for permanently empty directories)
CONFLICT (content): Merge conflict in fs/libfs.c
CONFLICT (content): Merge conflict in drivers/firmware/efi/efi.c
Merging ktest/for-next (7c2c49eceb79 ktest: Place quotes around item variable)
Merging clk/clk-next (a85fa007b772 MAINTAINERS: update email for Michael Turquette)
CONFLICT (content): Merge conflict in drivers/clk/Makefile
Merging random/dev (7185ad2672a7 crypto: memzero_explicit - make sure to clear out sensitive data)
Merging aio/master (5f785de58873 aio: Skip timer for io_getevents if timeout=0)
Merging llvmlinux/for-next (25d4aee23af2 arm: LLVMLinux: Use global stack register variable for percpu)
Merging kselftest/next (c99ee51a9d97 selftests: add seccomp suite)
Merging y2038/y2038 (ed8c2241c1ae coredump: Use 64bit time for unix time of coredump)
CONFLICT (content): Merge conflict in drivers/staging/media/lirc/lirc_parallel.c
Merging luto-misc/next (a6c5170d1ede Merge branch 'for-4.0' of git://linux-nfs.org/~bfields/linux)
Merging access_once/linux-next (bc465aa9d045 Linux 4.0-rc5)
Merging livepatching/for-next (507a76d5f701 Merge branch 'for-4.1/upstream-fixes' into for-next)
Merging coresight/next (486ea46dfc88 coresight-etm3x: Add Qualcomm PTM v1.1 peripheral ID)
CONFLICT (add/add): Merge conflict in drivers/hwtracing/coresight/coresight-replicator-qcom.c
CONFLICT (add/add): Merge conflict in drivers/hwtracing/coresight/coresight-etm4x.c
CONFLICT (content): Merge conflict in drivers/hwtracing/coresight/coresight-etm3x.c
Merging rtc/rtc-next (5dc75a07f884 rtc: pfc8563: fix uninitialized variable warning)
Merging init/init-v4.1-rc6 (bc3e452003d0 module: relocate module_init from init.h to module.h)
CONFLICT (content): Merge conflict in arch/arm/mach-keystone/platsmp.c
CONFLICT (modify/delete): arch/arm/mach-hisi/headsmp.S deleted in HEAD and modified in init/init-v4.1-rc6. Version init/init-v4.1-rc6 of arch/arm/mach-hisi/headsmp.S left in tree.
$ git rm -f arch/arm/mach-hisi/headsmp.S
Applying: drivers/hwtracing: fix coresight-replicator-qcom implicit <module.h> usage
Applying: drivers/hwtracing: fix coresight-etm4x implicit <module.h> usage
Merging akpm-current/current (d74235fc3a7f scsi-resolve-sg-buffer-const-ness-issue-fix)
CONFLICT (content): Merge conflict in drivers/staging/android/lowmemorykiller.c
CONFLICT (content): Merge conflict in arch/x86/kernel/machine_kexec_64.c
CONFLICT (content): Merge conflict in arch/x86/Kconfig
$ git checkout -b akpm remotes/origin/akpm/master
Applying: drivers/block/nvme-core.c: fix build with gcc-4.4.4
Applying: drivers/gpu/drm/i915/intel_sprite.c: fix build
Applying: drivers/gpu/drm/i915/intel_tv.c: fix build
Applying: net/netfilter/ipset: work around gcc-4.4.4 initializer bug
Applying: arch/unicore32/kernel/fpu-ucf64.c: remove unnecessary KERN_ERR
Applying: printk: improve the description of /dev/kmsg line format
Applying: kernel/relay.c: use kvfree() in relay_free_page_array()
Applying: cxgb3: use kvfree() in cxgb_free_mem()
Applying: cxgb4: use kvfree() in t4_free_mem()
Applying: drm: use kvfree() in drm_free_large()
Applying: drm/nouveau/gem: use kvfree() in u_free()
Applying: IB/ehca: use kvfree() in ipz_queue_{cd}tor()
Applying: target: use kvfree() in session alloc and free
Applying: libcxgbi: use kvfree() in cxgbi_free_big_mem()
Applying: bcache: use kvfree() in various places
Applying: fs/seq_file: convert int seq_vprint/seq_printf/etc... returns to void
Applying: MAINTAINERS: update Emulex ocrdma email addresses
Applying: MAINTAINERS: remove website for paride
Applying: MAINTAINERS: update sound soc intel patterns
Applying: MAINTAINERS: update brcm dts pattern
Applying: MAINTAINERS: update brcm gpio filename pattern
Applying: MAINTAINERS: remove unused nbd.h pattern
Applying: MAINTAINERS: move Jens Osterkamp to CREDITS
Applying: MAINTAINERS: BCACHE: Kent Overstreet has changed email address
Applying: MAINTAINERS: add zpool
Applying: x86: opt into HAVE_COPY_THREAD_TLS, for both 32-bit and 64-bit
Applying: mm: provide new get_vaddr_frames() helper
Applying: mm-provide-new-get_vaddr_frames-helper-fix
Applying: media: omap_vout: convert omap_vout_uservirt_to_phys() to use get_vaddr_pfns()
Applying: vb2: provide helpers for mapping virtual addresses
Applying: media: vb2: convert vb2_dma_sg_get_userptr() to use frame vector
Applying: media: vb2: Convert vb2_vmalloc_get_userptr() to use frame vector
Applying: media: vb2: convert vb2_dc_get_userptr() to use frame vector
Applying: media: vb2: remove unused functions
Applying: drm/exynos: convert g2d_userptr_get_dma_addr() to use get_vaddr_frames()
Applying: mm: move get_vaddr_frames() behind a config option
Applying: mm-move-get_vaddr_frames-behind-a-config-option-fix
Applying: genalloc: rename dev_get_gen_pool() to gen_pool_get()
Applying: genalloc: rename of_get_named_gen_pool() to of_gen_pool_get()
Applying: drivers/w1/w1_int.c: call put_device if device_register fails
Merging akpm/master (95bc0492c9be drivers/w1/w1_int.c: call put_device if device_register fails)
^ permalink raw reply [flat|nested] 9+ messages in thread
* linux-next: Tree for Jun 19
@ 2014-06-19 6:16 Stephen Rothwell
0 siblings, 0 replies; 9+ messages in thread
From: Stephen Rothwell @ 2014-06-19 6:16 UTC (permalink / raw)
To: linux-next; +Cc: linux-kernel
[-- Attachment #1: Type: text/plain, Size: 24663 bytes --]
Hi all,
The powerpc allyesconfig is again broken more than usual.
Changes since 20140618:
The mfd-lj tree gained a build failure for which I reverted a commit.
Non-merge commits (relative to Linus' tree): 1197
1276 files changed, 33969 insertions(+), 21500 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 219 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.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
$ git checkout master
$ git reset --hard stable
Merging origin/master (e99cfa2d0634 Merge tag 'dt-fixes-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux)
Merging fixes/master (4b660a7f5c80 Linux 3.15-rc6)
Merging kbuild-current/rc-fixes (c14105628b2e kbuild: fix a typo in a kbuild document)
Merging arc-current/for-curr (89ca3b881987 Linux 3.15-rc4)
Merging arm-current/fixes (870cbe8cb204 ARM: 8069/1: Make thread_save_fp macro aware of THUMB2 mode)
Merging m68k-current/for-linus (e8d6dc5ad26e m68k/hp300: Convert printk to pr_foo())
Merging metag-fixes/fixes (ffe6902b66aa asm-generic: remove _STK_LIM_MAX)
Merging powerpc-merge/merge (68986c9f0f45 Revert "offb: Add palette hack for little endian")
Merging sparc/master (8ecc1bad4c9b sparc64: fix format string mismatch in arch/sparc/kernel/sysfs.c)
Merging net/master (6f9a093b66ce net: filter: fix upper BPF instruction limit)
Merging ipsec/master (7171511eaec5 Linux 3.16-rc1)
Merging sound-current/for-linus (74b0c2d75fb4 drm/i915, HD-audio: Don't continue probing when nomodeset is given)
Merging pci-current/for-linus (d066c946a866 PCI: Fix unaligned access in AF transaction pending test)
Merging wireless/master (616a8394b5df rt2x00: fix rfkill regression on rt2500pci)
Merging driver-core.current/driver-core-linus (7171511eaec5 Linux 3.16-rc1)
Merging tty.current/tty-linus (a859c8b2c309 serial: samsung: Fix build error)
Merging usb.current/usb-linus (32b36eeae6a8 USB: usbtest: add a timeout for scatter-gather tests)
Merging usb-gadget-fixes/fixes (886c7c426d46 usb: gadget: at91-udc: fix irq and iomem resource retrieval)
Merging staging.current/staging-linus (88513624be04 staging: comedi: addi_apci_1564: add addi_watchdog dependency)
Merging char-misc.current/char-misc-linus (b29f680c4fe3 Revert "uio: fix vma io range check in mmap")
Merging input-current/for-linus (31972f6e517d Input: ti_am335x_tsc - warn about incorrect spelling)
Merging md-current/for-linus (d47648fcf061 raid5: avoid finding "discard" stripe)
Merging crypto-current/master (3901c1124ec5 crypto: s390 - fix aes,des ctr mode concurrency finding.)
Merging ide/master (5b40dd30bbfa ide: Fix SC1200 dependencies)
Merging dwmw2/master (5950f0803ca9 pcmcia: remove RPX board stuff)
Merging devicetree-current/devicetree/merge (4b660a7f5c80 Linux 3.15-rc6)
Merging rr-fixes/fixes (79465d2fd48e module: remove warning about waiting module removal.)
Merging mfd-fixes/master (73beb63d290f mfd: rtsx_pcr: Disable interrupts before 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 for-linus)
Merging drm-intel-fixes/for-linux-next-fixes (15d24aa5602f drm/i915: BDW: Adding missing cursor offsets.)
Merging asm-generic/master (fb9de7ebc3a2 xtensa: Use generic asm/mmu.h for nommu)
Merging arc/for-next (230a15f171ba ARC: remove checks for CONFIG_ARC_MMU_V4)
Merging arm/for-next (a6d997d18aa4 Merge branches 'fixes' and 'misc' into for-next)
Merging arm-perf/for-next/perf (7171511eaec5 Linux 3.16-rc1)
Merging arm-soc/for-next (f2592714cddc ARM: use menuconfig for sub-arch menus)
Merging bcm2835/for-next (fa389e220254 Linux 3.14-rc6)
Merging berlin/berlin/for-next (251f72d06c59 Merge branch 'berlin/soc' into berlin/for-next)
Merging cortex-m/for-next (f0d7515372ff ARM: v7m: add trivial suspend support)
Merging ep93xx/ep93xx-for-next (bfb0709fd17b Merge branch 'ep93xx-fixes' into ep93xx-for-next)
Merging imx-mxs/for-next (1bee3d4b1624 Merge branch 'imx/dt' into for-next)
CONFLICT (content): Merge conflict in arch/arm/mach-imx/Kconfig
Merging ixp4xx/next (19f949f52599 Linux 3.8)
Merging keystone/next (c9eaa447e77e Linux 3.15-rc1)
Merging msm/for-next (81cf1e061d00 ARM: msm: Rename msm devicetrees to have standard 'qcom' prefix)
Merging mvebu/for-next (7171511eaec5 Linux 3.16-rc1)
Merging renesas/next (44751c65eb0a Merge branch 'soc-cleanup-for-v3.17' into devel)
Merging samsung/for-next (c0c3c3590d0d ARM: EXYNOS: fix pm code to check for cortex A9 rather than the SoC)
Merging tegra/for-next (78d401aefcbb Merge branch for-3.17/defconfig into for-next)
Merging arm64/for-next/core (7171511eaec5 Linux 3.16-rc1)
Merging blackfin/for-linus (51fdc6bf9880 blackfin: defconfigs: add MTD_SPI_NOR (new dependency for M25P80))
Merging c6x/for-linux-next (ae72758f1dd9 c6x: fix build failure caused by cache.h)
Merging cris/for-next (cd065a010a97 CRISv10: Readd missing header)
Merging hexagon/linux-next (a9a44fdf3296 Hexagon: update CR year for elf.h)
Merging ia64/next (e32634f5d57f pstore: Fix memory leak when decompress using big_oops_buf)
Merging m68k/for-next (e8d6dc5ad26e m68k/hp300: Convert printk to pr_foo())
Merging m68knommu/for-next (83c6bdb827c9 m68knommu: Implement gpio support for m54xx.)
Merging metag/for-next (8bc613befaec metag: hugetlbpage: Remove null pointer checks that could never happen)
Merging microblaze/next (225fba216261 microblaze: Fix typo in head.S s/substract/subtract/)
Merging mips/mips-for-linux-next (2879f1360851 Merge branch '3.16-fixes' into mips-for-linux-next)
Merging openrisc/for-upstream (548dafe880ad openrisc: Use get_signal() signal_setup_done())
Merging parisc/for-next (6c700d71f7fa [PARISC] hpux: Remove obsolete regs parameter from do_execve() in hpux_execve())
Merging parisc-hd/for-next (455c6fdbd219 Linux 3.14)
Merging powerpc/next (68986c9f0f45 Revert "offb: Add palette hack for little endian")
Merging fsl/next (e83eb028bb98 powerpc/fsl: Add fsl,portid-mapping to corenet1-cf chips)
Merging mpc5xxx/next (bc7505942233 powerpc/512x: dts: add MPC5125 clock specs)
Merging s390/features (fa73eb4738fc s390/ccwgroup: use ccwgroup_ungroup wrapper)
Merging sparc-next/master (311b8935ad4e Merge branch 'sparc_sparse_fixes')
CONFLICT (content): Merge conflict in arch/sparc/include/asm/pgtable_64.h
Merging tile/master (8dfb6948f7d8 tile: use ARRAY_SIZE)
Merging uml/next (989e59fa41c5 um: Include generic barrier.h)
CONFLICT (content): Merge conflict in arch/um/include/asm/Kbuild
Merging unicore32/unicore32 (8c76c188d498 unicore32: Remove ARCH_HAS_CPUFREQ config option)
Merging xtensa/for_next (55b441be5cd6 xtensa: ISS: don't depend on CONFIG_TTY)
Merging btrfs/next (c7548af69d9e Btrfs: convert smp_mb__{before,after}_clear_bit)
Merging ceph/master (437f2c0d0c01 rbd: fix ida/idr memory leak)
Merging cifs/for-next (a1d0b84c308d fs/cifs: fix regression in cifs_create_mf_symlink())
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 (19ef1229bc2e reiserfs: Fix compilation breakage with CONFIG_REISERFS_CHECK)
Merging ext4/dev (f8409abdc592 Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4)
Merging f2fs/dev (395fd9094524 f2fs: avoid to truncate non-updated page partially)
Merging fscache/fscache (fe02fb3ec109 FS-Cache: Handle removal of unadded object to the fscache_object_list rb tree)
Merging fuse/for-next (1560c974dcd4 fuse: add renameat2 support)
Merging gfs2/master (0e48e055a7df GFS2: Prevent recovery before the local journal is set)
Merging jfs/jfs-next (bb5e50aaa805 fs/jfs/super.c: convert simple_str to kstr)
Merging logfs/master (339466142b3f Fix the call to BUG() caused by no free segment found)
Merging nfs/linux-next (886023c676af NFSv4: test SECINFO RPC_AUTH_GSS pseudoflavors for support)
Merging nfsd/nfsd-next (48385408b455 nfsd4: fix FREE_STATEID lockowner leak)
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 (380347e9ca76 UBIFS: Add an assertion for clean_zn_cnt)
Merging xfs/for-next (7691283d0561 Merge branch 'xfs-misc-fixes-3-for-3.16' into for-next)
Merging file-private-locks/linux-next (7dfeba1f206f locks: set fl_owner for leases back to current->files)
Merging vfs/for-next (cd67b9ac44ea switch iov_iter_get_pages() to passing maximal number of pages)
Merging pci/next (7171511eaec5 Linux 3.16-rc1)
Merging hid/for-next (8e4cfb08c532 Merge branch 'for-3.17/hid-gt683r' into for-next)
Merging i2c/i2c/for-next (f0b1f6442b50 Merge tag 'v3.16-rc1' into i2c/for-next)
Merging jdelvare-hwmon/master (c7208164e66f Linux 3.15-rc7)
Merging hwmon-staging/hwmon-next (2a3c653051b1 hwmon: (gpio-fan) Convert to devm_hwmon_device_register_with_groups)
Merging v4l-dvb/master (656111f4b9cb Merge branch 'topic/omap3isp' into to_next)
Merging kbuild/for-next (bfbf2e950ac8 Merge branch 'kbuild/rc-fixes' into kbuild/for-next)
Merging kconfig/for-next (95edca5c523c localmodconfig: Add config depends by default settings)
Merging libata/for-next (341434ff1abc Merge branch 'for-3.17' into for-next)
Merging pm/linux-next (85e1ab79ec13 Merge branch 'pm-cpuidle' into linux-next)
Merging idle/next (23a299cd9378 Merge branches 'turbostat' and 'intel_idle' into release)
Merging apm/for-next (158204397034 apm-emulation: add hibernation APM events to support suspend2disk)
Merging cpupowerutils/master (f16603386b38 cpupower tools: add install target to the debug tools' makefiles)
Merging thermal/next (63745aa72ed1 Merge branches 'armada-375-380-soc-support', 'eduardo-thermal-soc-fixes', 'intel-soc-dts-thermal' and 'thermal-soc-fixes' of .git into next)
Merging ieee1394/for-next (165d560bb267 Merge branch 'master' into for-next)
Merging dlm/next (883854c5457a dlm: keep listening connection alive with sctp mode)
Merging swiotlb/linux-next (0cb637bff80d swiotlb: Don't DoS us with 'swiotlb buffer is full' (v2))
Merging slave-dma/next (7171511eaec5 Linux 3.16-rc1)
Merging dmaengine/next (fbeec99ad5c0 dma: mv_xor: Rename __mv_xor_slot_cleanup() to mv_xor_slot_cleanup())
Merging net-next/master (e0f802fbcaa3 tcp: move ir_mark initialization to tcp_openreq_init)
Merging ipsec-next/master (7171511eaec5 Linux 3.16-rc1)
Merging wireless-next/master (7171511eaec5 Linux 3.16-rc1)
Merging bluetooth/master (62db8f2ff628 Bluetooth: Fix checking for master LTKs)
Merging infiniband/for-next (eeaddf3670d4 Merge branches 'core', 'cxgb3', 'cxgb4', 'iser', 'iwpm', 'misc', 'mlx4', 'mlx5', 'noio', 'ocrdma', 'qib', 'srp' and 'usnic' into for-next)
Merging mtd/master (7171511eaec5 Linux 3.16-rc1)
Merging l2-mtd/master (7171511eaec5 Linux 3.16-rc1)
Merging crypto/master (5208ed2ca165 crypto: testmgr - add aead cbc des, des3_ede tests)
Merging drm/drm-next (bc1dfff04a5d Merge branch 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-next)
Merging drm-panel/drm/panel/for-next (7e40b5162b3c drm/panel: make DRM_PANEL_LD9040 depend on SPI)
Merging drm-intel/for-linux-next (5d0cf3d6e079 Merge branch 'topic/soix' into drm-intel-next-queued)
Merging drm-tegra/drm/tegra/for-next (1f64ae7c5af0 drm/tegra: sor - Remove obsolete comment)
Merging sound/for-next (7f0f20486f4d ALSA: Use dma_zalloc_coherent)
Merging sound-asoc/for-next (e1f422c43498 Merge remote-tracking branches 'asoc/topic/spdif', 'asoc/topic/wm8904' and 'asoc/topic/wm8985' into asoc-next)
Merging modules/modules-next (4982223e51e8 module: set nx before marking module MODULE_STATE_COMING.)
Merging virtio/virtio-next (c77fba9ab058 virtio_scsi: don't call virtqueue_add_sgs(... GFP_NOIO) holding spinlock.)
Merging input/next (68807a0c2015 Input: atmel_mxt_ts - fix invalid return from mxt_get_bootloader_version)
Merging input-mt/for-next (5e01dc7b26d9 Linux 3.12)
Merging block/for-next (a2d445d44000 block: add __init to blkcg_policy_register)
Merging device-mapper/for-next (a27595b04b91 dm crypt: sort writes)
Merging embedded/master (4744b43431e8 embedded: fix vc_translate operator precedence)
Merging firmware/master (6e03a201bbe8 firmware: speed up request_firmware(), v3)
Merging pcmcia/master (80af9e6d7ae6 pcmcia at91_cf: fix raw gpio number usage)
Merging mmc/mmc-next (11bc9381b277 mmc: sdhci-s3c: use mmc_of_parse and remove the card_tasklet)
Merging mmc-uh/next (e9c729860d84 mmc: core: Fix DT documentation of eMMC high-speed DDR 1.8/1.2V bindings)
Merging kgdb/kgdb-next (6bedf31c25dd kdb: Remove unhandled ssb command)
Merging slab/for-next (201ed0edb712 Merge branch 'slab/next' into for-next)
Merging uclinux/for-next (6dbe51c251a3 Linux 3.9-rc1)
Merging md/for-next (053f5b6525ae raid5: speedup sync_request processing)
Merging mfd/master (90b128ed1557 Merge tag 'mfd-lee-3.13-3' of git://git.linaro.org/people/ljones/mfd)
Merging mfd-lj/for-mfd-next (37c7576e624b mfd: Add driver for Maxim 77802 Power Management IC)
Merging battery/master (ac323d8d8070 power: max17040: Fix NULL pointer dereference when there is no platform_data)
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 (7171511eaec5 Linux 3.16-rc1)
Merging regulator/for-next (b753a93f7437 Merge remote-tracking branch 'regulator/topic/tps6586x' into regulator-next)
Merging security/next (2fd4e6698f08 Merge branch 'smack-for-3.16' of git://git.gitorious.org/smack-next/kernel into next)
Merging integrity/next (0430e49b6e7c ima: introduce ima_kernel_read())
Merging selinux/next (5c7001b84be5 SELinux: use ARRAY_SIZE)
Merging lblnet/next (d8ec26d7f828 Linux 3.13)
Merging watchdog/master (7171511eaec5 Linux 3.16-rc1)
Merging iommu/next (c0981b863a31 Merge branches 'iommu/fixes', 'arm/omap', 'arm/smmu', 'arm/shmobile', 'x86/amd', 'arm/exynos', 'arm/renesas', 'ppc/pamu' and 'arm/msm' into next)
Merging dwmw2-iommu/master (1860e379875d Linux 3.15)
Merging vfio/next (fd49c81f080a drivers/vfio/pci: Fix wrong MSI interrupt count)
Merging osd/linux-next (ce5d36aac26c ore: Support for raid 6)
Merging jc_docs/docs-next (5c050fb96380 docs: update the development process document)
Merging trivial/for-next (31789538e3ba staging: go7007: remove reference to CONFIG_KMOD)
Merging audit/master (3efe33f5d2da audit: x86: drop arch from __audit_syscall_entry() interface)
CONFLICT (content): Merge conflict in kernel/audit.c
CONFLICT (content): Merge conflict in arch/x86/Kconfig
CONFLICT (content): Merge conflict in arch/mips/kernel/ptrace.c
CONFLICT (content): Merge conflict in arch/mips/include/asm/syscall.h
Merging fsnotify/for-next (1ca39ab9d21a inotify: automatically restart syscalls)
Merging devicetree/devicetree/next (c9e0fb3bb3aa tty: Update hypervisor tty drivers to use core stdout parsing code.)
Merging dt-rh/for-next (99de64984c3a OF: fix of_find_node_by_path() assumption that of_allnodes is root)
Merging spi/for-next (0d6c97f4e585 Merge remote-tracking branches 'spi/topic/cleanup' and 'spi/topic/rspi' into spi-next)
Merging tip/auto-latest (01e47cc27060 Merge branch 'x86/xsave')
Merging clockevents/clockevents/next (2529c3a33079 clocksource: Add Freescale FlexTimer Module (FTM) timer support)
Merging edac/linux_next (49856dc973cd sb_edac: mark MCE messages as KERN_DEBUG)
Merging edac-amd/for-next (aa2064d7dd35 EDAC: Fix MC scrub mode comparsion bug for correctable errors)
Merging irqchip/irqchip/for-next (7171511eaec5 Linux 3.16-rc1)
Merging ftrace/for-next (da9c3413a27b tracing: Fix check of ftrace_trace_arrays list_empty() check)
Merging rcu/rcu/next (61f38db3e3c0 rcu: Provide API to suppress stall warnings while sysrc runs)
Merging uprobes/for-next (0326f5a94dde uprobes/core: Handle breakpoint and singlestep exceptions)
Merging kvm/linux-next (5c02c392cd23 Merge tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux)
Merging kvm-arm/next (1252b3313642 arm64: KVM: Enable minimalistic support for Cortex-A53)
Merging kvm-ppc/kvm-ppc-next (5c02c392cd23 Merge tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux)
Merging oprofile/for-next (6ce4eac1f600 Linux 3.13-rc1)
Merging fw-nohz/nohz/next (74876a98a87a printk: Wake up klogd using irq_work)
Merging xen-tip/linux-next (77945ca73e9a x86/xen: map foreign pfns for autotranslated guests)
Merging percpu/for-next (6fbc07bbe2b5 percpu: invoke __verify_pcpu_ptr() from the generic part of accessors and operations)
Merging workqueues/for-next (015af06e103f kernel/workqueue.c: pr_warning/pr_warn & printk/pr_info)
Merging drivers-x86/linux-next (f82bdd0d77b6 hp-wmi: Enable hotkeys on some systems)
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 (7171511eaec5 Linux 3.16-rc1)
Merging hsi/for-next (b357d7b58f37 hsi: omap_ssi_port: use normal module refcounting)
Merging leds/for-next (0c9a03b68511 leds: Remove duplicated OOM message for individual driver)
Merging driver-core/driver-core-next (7171511eaec5 Linux 3.16-rc1)
Merging tty/tty-next (7171511eaec5 Linux 3.16-rc1)
Merging usb/usb-next (7171511eaec5 Linux 3.16-rc1)
Merging usb-gadget/next (7751b6fb0586 usb: musb: tusb6010: Use musb->tusb_revision instead of tusb_get_revision call.)
Merging staging/staging-next (98e11370052a staging: lustre: lclient: lcommon_cl.c fixing coding style issues)
Merging char-misc/char-misc-next (7171511eaec5 Linux 3.16-rc1)
Merging cgroup/for-next (99bae5f94185 cgroup: fix broken css_has_online_children())
Merging scsi/for-next (11a5dc7ff2fb Merge remote-tracking branch 'scsi-queue/drivers-for-3.16-2' into for-next)
Merging scsi-core/core-for-3.16 (63ff05910d96 include/scsi/osd_protocol.h: remove unnecessary __constant)
Merging scsi-drivers/drivers-for-3.16 (e90b25fa40a4 mvsas: Recognise device/subsystem 9485/9485 as 88SE9485)
Merging target-updates/for-next (0ed6e189e3f6 target: Fix NULL pointer dereference for XCOPY in target_put_sess_cmd)
Merging target-merge/for-next-merge (b28a960c42fc Linux 3.14-rc2)
Merging writeback/writeback-for-next (f9b0e058cbd0 writeback: Fix data corruption on NFS)
Merging hwspinlock/linux-next (8b37fcfc9b34 hwspinlock: add MAINTAINERS entries)
Merging pinctrl/for-next (ff4e41904b42 pinctrl: sunxi: Fix potential null pointer dereference)
Merging vhost/linux-next (970379f59d81 vhost: move memory pointer to VQs)
Merging remoteproc/for-next (bd88acba5f98 remoteproc/ste_modem: staticize local symbols)
Merging rpmsg/for-next (397944df3290 rpmsg: fix kconfig dependencies for VIRTIO)
Merging gpio/for-next (06fc3b70f1dc gpio: of: Fix handling for deferred probe for -gpio suffix)
Merging dma-mapping/dma-mapping-next (f70e3c4f8b6a CMA: correct unlock target)
Merging pwm/for-next (39fd3f99aba3 pwm: fsl-ftm: set pwm_chip can_sleep flag)
Merging dma-buf/for-next (dfb945473ae8 Merge git://www.linux-watchdog.org/linux-watchdog)
Merging userns/for-next (3efe1ac78e99 vfs: Block intuitively in the case of BSD accounting files)
CONFLICT (content): Merge conflict in fs/namespace.c
CONFLICT (content): Merge conflict in fs/namei.c
CONFLICT (content): Merge conflict in fs/dcache.c
CONFLICT (content): Merge conflict in fs/btrfs/ioctl.c
Merging ktest/for-next (4c16b1d6d5e0 ktest: Update documentation on config_bisect)
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 (b640a6037c9e Merge tag 'sunxi-clk-for-3.16-2' of https://github.com/mripard/linux into clk-next)
Merging random/dev (5458c2fecbb8 hw_random: fix sparse warning (NULL vs 0 for pointer))
Merging lzo-update/lzo-update (42b775abafaf lib/lzo: huge LZO decompression speedup on ARM by using unaligned access)
Merging aio/master (fa88b6f8803c aio: cleanup: flatten kill_ioctx())
Merging llvmlinux/for-next (f9da455b93f6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next)
Merging powernv-cpuidle/powernv-cpuidle (0888839c5b62 cpuidle/powernv: Parse device tree to setup idle states)
Merging rd-docs/master (93df5e1c88f7 These days most people use git to send patches so I have added a section about that.)
[master 8e8bbe588896] Revert "gpio: Add support for Intel Crystal Cove PMIC"
Merging akpm-current/current (8e4b408a34b4 fix build error of v3.15-mmotm-2014-06-12-16-38)
CONFLICT (content): Merge conflict in fs/ocfs2/file.c
CONFLICT (content): Merge conflict in arch/x86/vdso/vdso2c.h
CONFLICT (content): Merge conflict in Makefile
$ git checkout -b akpm remotes/origin/akpm/master
Applying: drivers/gpio/gpio-zevio.c: fix build
Applying: mm/page_io.c: work around gcc bug
Applying: init/main.c: code clean-up
Applying: kernel/kprobes.c: convert printk to pr_foo()
Applying: memcg, mm: introduce lowlimit reclaim
Applying: memcg-mm-introduce-lowlimit-reclaim-fix
Applying: memcg-mm-introduce-lowlimit-reclaim-fix2.patch
Applying: memcg: allow setting low_limit
Applying: memcg, doc: clarify global vs. limit reclaims
Applying: memcg-doc-clarify-global-vs-limit-reclaims-fix
Applying: memcg: document memory.low_limit_in_bytes
Applying: vmscan: memcg: check whether the low limit should be ignored
Applying: mm: replace remap_file_pages() syscall with emulation
Applying: mm-replace-remap_file_pages-syscall-with-emulation-fix
Applying: mm: remap_file_pages: initialize populate before usage
Applying: mm: remap_file_pages: grab file ref to prevent race while mmaping
Applying: memcg: deprecate memory.force_empty knob
Applying: memcg-deprecate-memoryforce_empty-knob-fix
Applying: fat: add i_disksize to represent uninitialized size
Applying: fat: add fat_fallocate operation
Applying: fat: zero out seek range on _fat_get_block
Applying: fat: fallback to buffered write in case of fallocated region on direct IO
Applying: fat: permit to return phy block number by fibmap in fallocated region
Applying: Documentation/filesystems/vfat.txt: update the limitation for fat fallocate
Applying: nmi: provide the option to issue an NMI back trace to every cpu but current
Applying: nmi-provide-the-option-to-issue-an-nmi-back-trace-to-every-cpu-but-current-fix
Applying: kernel/watchdog.c: print traces for all cpus on lockup detection
Applying: kernel-watchdogc-print-traces-for-all-cpus-on-lockup-detection-fix
Applying: kernel-watchdogc-print-traces-for-all-cpus-on-lockup-detection-fix-2
Applying: kernel/watchdog.c: convert printk/pr_warning to pr_foo()
Applying: bio: modify __bio_add_page() to accept pages that don't start a new segment
Applying: drivers/w1/w1_int.c: call put_device if device_register fails
Applying: mm: add strictlimit knob
Merging akpm/master (05f330fb7361 mm: add strictlimit knob)
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* linux-next: Tree for Jun 19
@ 2013-06-19 8:21 ` Stephen Rothwell
0 siblings, 0 replies; 9+ messages in thread
From: Stephen Rothwell @ 2013-06-19 8:21 UTC (permalink / raw)
To: linux-next; +Cc: linux-kernel
[-- Attachment #1: Type: text/plain, Size: 71131 bytes --]
Hi all,
Changes since 20130618:
The arm-mpidr tree gained a conflict against the arm tree.
The ceph tree gained a conflict against Linus' tree.
The mfd tree lost its build failure.
The block tree gained a conflict against the cgroup tree.
The leds tree still had its build failure, so I used the version from
next-20130607.
The driver-core tree gained a conflict against the driver-core.current
tree.
The staging tree gained a build failure for which I disabled some code.
The imx-mxs tree gained a conflict against the arm-soc tree.
The samsung tree gained a conflict against the usb tree.
The akpm tree gained conflicts against the ext4 and arm-current trees. It
also lost a few patches that turned up elsewhere.
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one. You should use "git fetch" as mentioned in the FAQ on the wiki
(see below).
You can see which trees have been included by looking in the Next/Trees
file in the source. There are also quilt-import.log and merge.log files
in the Next directory. Between each merge, the tree was built with
a ppc64_defconfig for powerpc and an allmodconfig for x86_64. After the
final fixups (if any), it is also built with powerpc allnoconfig (32 and
64 bit), ppc44x_defconfig and allyesconfig (minus
CONFIG_PROFILE_ALL_BRANCHES - this fails its final link) and i386, sparc,
sparc64 and arm defconfig. These builds also have
CONFIG_ENABLE_WARN_DEPRECATED, CONFIG_ENABLE_MUST_CHECK and
CONFIG_DEBUG_INFO disabled when necessary.
Below is a summary of the state of the merge.
We are up to 229 trees (counting Linus' and 31 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.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
$ git checkout master
$ git reset --hard stable
Merging origin/master (17858ca Merge tag 'please-pull-fixia64' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux)
Merging fixes/master (8177a9d lseek(fd, n, SEEK_END) does *not* go to eof - n)
Merging kbuild-current/rc-fixes (42a0940 Merge branch 'yem-kconfig-rc-fixes' of git://gitorious.org/linux-kconfig/linux-kconfig into kbuild/rc-fixes)
Merging arc-current/for-curr (ce3f808 ARC: [plat-arcfpga] Fix build breakage when !CONFIG_ARC_SERIAL)
Merging arm-current/fixes (19ab428 ARM: 7759/1: decouple CPU offlining from reboot/shutdown)
Merging m68k-current/for-linus (7d13205 Linux 3.10-rc6)
Merging powerpc-merge/merge (230b303 powerpc: Fix missing/delayed calls to irq_work)
Merging sparc/master (de9c9f8 Merge tag 'remoteproc-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc)
Merging net/master (33be081 ipv6: ndisc: fix ndisc_send_redirect writing to the wrong skb)
Merging ipsec/master (01cb71d net_sched: restore "overhead xxx" handling)
Merging sound-current/for-linus (e32aa85 ALSA: hda - Add models for Dell headset jacks)
Merging pci-current/for-linus (65694c5 x86/PCI: Map PCI setup data with ioremap() so it can be in highmem)
Merging wireless/master (fcb3701 brcmfmac: free primary net_device when brcmf_bus_start() fails)
Merging driver-core.current/driver-core-linus (8759793 firmware loader: fix use-after-free by double abort)
Merging tty.current/tty-linus (7c61c3d tty: Fix transient pty write() EIO)
Merging usb.current/usb-linus (035978b usb: phy: Improve Kconfig help for CONFIG_USB_PHY)
Merging staging.current/staging-linus (7d13205 Linux 3.10-rc6)
Merging char-misc.current/char-misc-linus (7d13205 Linux 3.10-rc6)
Merging input-current/for-linus (150e592 Input: add missing dependencies on CONFIG_HAS_IOMEM)
Merging md-current/for-linus (32f9f57 MD: ignore discard request for hard disks of hybid raid1/raid10 array)
Merging audit-current/for-linus (c158a35 audit: no leading space in audit_log_d_path prefix)
Merging crypto-current/master (fe6510b crypto: aesni_intel - fix accessing of unaligned memory)
Merging ide/master (bf6b438 ide: gayle: use module_platform_driver_probe())
Merging dwmw2/master (5950f08 pcmcia: remove RPX board stuff)
Merging sh-current/sh-fixes-for-linus (4403310 SH: Convert out[bwl] macros to inline functions)
Merging irqdomain-current/irqdomain/merge (d94ea3f irqchip: Return -EPERM for reserved IRQs)
Merging devicetree-current/devicetree/merge (706b78f dtc: ensure #line directives don't consume data from the next line)
Merging spi-current/spi/merge (0d2d0cc spi/davinci: fix module build error)
Merging gpio-current/gpio/merge (e97f9b5 gpio/gpio-ich: fix ichx_gpio_check_available() return what callers expect)
Merging rr-fixes/fixes (6407d75 virtio_console: fix uapi header)
Merging mfd-fixes/master (5649d8f mfd: ab8500-sysctrl: Let sysctrl driver work without pdata)
Merging vfio-fixes/for-linus (9a6aa27 vfio: fix crash on rmmod)
Merging asm-generic/master (fb9de7e xtensa: Use generic asm/mmu.h for nommu)
Merging arc/for-next (21a2299 ARC: [PTE] Fold PTE K/U access flags (MMUv4 preps))
Merging arm/for-next (7e74d1d Merge branch 'devel-stable' into for-next)
Merging arm-mpidr/for-next (3fed6a1 ARM: kernel: implement stack pointer save array through MPIDR hashing)
CONFLICT (content): Merge conflict in arch/arm/kernel/suspend.c
Merging arm-perf/for-next/perf (e4aa937 Linux 3.10-rc3)
Merging davinci/davinci-next (fe0d422 Linux 3.0-rc6)
Merging xilinx/arm-next (64e3fd3 arm: zynq: Add support for pmu)
CONFLICT (content): Merge conflict in drivers/clocksource/tegra20_timer.c
CONFLICT (content): Merge conflict in drivers/clocksource/Makefile
CONFLICT (add/add): Merge conflict in arch/arm/mach-zynq/platsmp.c
CONFLICT (content): Merge conflict in arch/arm/mach-vexpress/v2m.c
CONFLICT (content): Merge conflict in arch/arm/mach-spear/spear13xx.c
CONFLICT (content): Merge conflict in arch/arm/mach-imx/mach-imx6q.c
CONFLICT (content): Merge conflict in arch/arm/mach-highbank/highbank.c
Merging arm64/upstream (63917f0 Merge branch 'kvm-arm64/kvm-for-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into upstream)
CONFLICT (content): Merge conflict in include/uapi/linux/kvm.h
Merging blackfin/blackfin-linus (5ae89ee bfin cache: dcplb map: add 16M dcplb map for BF60x)
Merging c6x/for-linux-next (f934af0 add memory barrier to arch_local_irq_restore)
Merging cris/for-next (32ade6a CRIS: Add kvm_para.h which includes generic file)
Merging hexagon/linux-next (de44443 HEXAGON: Remove non existent reference to GENERIC_KERNEL_EXECVE & GENERIC_KERNEL_THREAD)
Merging ia64/next (09bf4de Merge branch 'pstore' into next)
Merging m68k/for-next (40d1f31 Merge branch 'exotic-arch-fixes' into for-next)
CONFLICT (content): Merge conflict in arch/cris/arch-v32/drivers/Kconfig
Merging m68knommu/for-next (e4aa937 Linux 3.10-rc3)
Merging metag/for-next (1a5719a metag/.gitignore: Extend the *.dtb pattern to match the dtb.S files)
Merging microblaze/next (62bc82a microblaze: Use static inline functions in cacheflush.h)
Merging mips/mips-for-linux-next (aedc598 Merge branch '3.10-fixes' into mips-for-linux-next)
Merging openrisc/for-upstream (6af6095 openrisc: remove HAVE_VIRT_TO_BUS)
Merging parisc/for-next (6c700d7 [PARISC] hpux: Remove obsolete regs parameter from do_execve() in hpux_execve())
Merging parisc-hd/for-next (a2648eb Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs)
Merging powerpc/next (25e33ed Merge tag 'acpi-3.10-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm)
Merging 4xx/next (2074b1d powerpc: Fix irq distribution)
Merging mpc5xxx/next (a4f4124 powerpc/mpc512x: initialize board restart earlier)
Merging galak/next (9e2ecdb powerpc/fsl-booke: add the reg prop for pci bridge device node for T4/B4)
Merging s390/features (461e265 s390/chsc: Use snprintf instead of sprintf)
Merging sh/sh-latest (37284bd Merge branches 'sh/hw-breakpoints' and 'sh/serial-of' into sh-latest)
CONFLICT (content): Merge conflict in arch/sh/kernel/cpu/sh2a/Makefile
Merging sparc-next/master (f8ce1fa Merge tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux)
Merging tile/master (9fc1894 arch/tile: Fix syscall return value passed to tracepoint)
Merging unicore32/unicore32 (c284464 arch/unicore32: remove CONFIG_EXPERIMENTAL)
Merging xtensa/for_next (0756a12 xtensa: tell git to ignore copied zlib source files)
Merging btrfs/next (667e7d9 Btrfs: allow superblock mismatch from older mkfs)
Merging ceph/master (ed80a59 ceph: move inode to proper flushing list when auth MDS changes)
CONFLICT (content): Merge conflict in drivers/block/rbd.c
Merging cifs/for-next (7311ef6 [CIFS] Add some missing SMB3 and SMB3.02 flags)
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 (0df5ed6 eCryptfs: Make extent and scatterlist crypt function parameters similar)
Merging ext3/for_next (e162b2f jbd: use kmem_cache_zalloc instead of kmem_cache_alloc/memset)
Merging ext4/dev (3c99d09 ext3,ext4: don't mess with dir_file->f_pos in htree_dirblock_to_tree())
Merging f2fs/dev (696c018 f2fs: add remount_fs callback support)
Merging fscache/fscache (bbd645c FS-Cache: Don't use spin_is_locked() in assertions)
Merging fuse/for-next (e5c5f05 fuse: fix alignment in short read optimization for async_dio)
Merging gfs2/master (512cbf0 GFS2: fix regression in dir_double_exhash)
Merging jfs/jfs-next (eb8630d jfs: Update jfs_error)
Merging logfs/master (3394661 Fix the call to BUG() caused by no free segment found)
Merging nfs/linux-next (a102b58 Merge branch 'labeled-nfs' into linux-next)
Merging nfsd/nfsd-next (1a9357f nfsd: avoid undefined signed overflow)
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 (7a0d932 fs/9p: xattr: add trusted and security namespaces)
Merging ubifs/linux-next (c1be5a5 Linux 3.9)
Merging xfs/for-next (1ebdf36 xfs: Remove struct xfs_chash from xfs_mount)
Merging vfs/for-next (ac3e3c5 don't bother with deferred freeing of fdtables)
Merging pci/next (df58f46 Merge branch 'pci/jiang-bus-lock-v3' into next)
CONFLICT (content): Merge conflict in include/linux/aer.h
CONFLICT (content): Merge conflict in drivers/pci/probe.c
CONFLICT (content): Merge conflict in drivers/acpi/pci_root.c
Merging hid/for-next (bbb6be8 Merge branch 'for-3.11/wiimote' into for-next)
Merging i2c/i2c/for-next (7a10f47 i2c-pxa: prepare clock before use)
Merging jdelvare-hwmon/master (1aaf6d3 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging hwmon-staging/hwmon-next (4cfda46 hwmon: (ds1621) Update documentation)
Merging v4l-dvb/master (d3fa77a Merge /home/v4l/v4l/patchwork)
Merging kbuild/for-next (2d7d88bd Merge branches 'kbuild/kbuild' and 'kbuild/misc' into kbuild/for-next)
Merging kconfig/for-next (4eae518 localmodconfig: Fix localyesconfig to set to 'y' not 'm')
Merging libata/for-next (5d0ae05 Merge branch 'for-3.11' into for-next)
Merging infiniband/for-next (c9a2433 Merge branches 'iser' and 'qib' into for-next)
Merging pstore/master (bd08ec3 pstore/ram: Restore ecc information block)
Merging pm/linux-next (a913b18 Merge branch 'acpica-next' into linux-next)
Merging idle/next (5c99726b Merge branch 'fspin' into next)
Merging apm/for-next (fb9d78a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm)
Merging cpuidle/cpuidle-next (817c876 Merge branch 'pm-fixes-next' into fixes-next)
CONFLICT (content): Merge conflict in drivers/base/power/qos.c
CONFLICT (content): Merge conflict in drivers/acpi/processor_driver.c
Merging cpupowerutils/master (f166033 cpupower tools: add install target to the debug tools' makefiles)
Merging thermal/next (9d1968f Merge branch 'cpu-package-thermal' of .git into next)
Merging ieee1394/for-next (bcabcfd firewire: remove support of fw_driver.driver.probe and .remove methods)
Merging ubi/linux-next (584d462 UBI: fastmap break out of used PEB search)
Merging dlm/next (86e92ad dlm: disable nagle for SCTP)
Merging swiotlb/linux-next (af51a9f swiotlb: Do not export swiotlb_bounce since there are no external consumers)
Merging scsi/for-next (002edf2 Merge branch 'misc' into for-next)
Merging target-updates/for-next (9185bc5 qla_target: remove qlt_check_fcport_exist)
Merging target-merge/for-next-merge (317ddd2 Linux 3.10-rc5)
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 (755013f Merge branch 'for-linus' into next)
Merging dmaengine/next (41ef2d5 Linux 3.9-rc7)
Merging net-next/master (a267a60 staging/rtl8192u: convert skb->tail into skb_tail_pointer(skb))
CONFLICT (content): Merge conflict in net/batman-adv/bat_iv_ogm.c
CONFLICT (content): Merge conflict in drivers/net/xen-netback/netback.c
CONFLICT (content): Merge conflict in drivers/net/wireless/ath/ath9k/Kconfig
Merging ipsec-next/master (4c4d41f xfrm: add LINUX_MIB_XFRMACQUIREERROR statistic counter)
Merging wireless-next/master (354b75b brcmfmac: add sdio sg list support)
Merging bluetooth/master (cd60aab Bluetooth: Add missing reset_resume dev_pm_ops)
CONFLICT (content): Merge conflict in net/bluetooth/mgmt.c
Merging mtd/master (a637b0d Merge tag 'for-linus-20130509' of git://git.infradead.org/linux-mtd)
Merging l2-mtd/master (449e74c mtd: tests: don't print error messages when out-of-memory)
Merging crypto/master (beca35d hwrng: nomadik - use clk_prepare_enable())
Merging drm/drm-next (2791197 drm/mgag200: Don't do full cleanup if mgag200_device_init fails)
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_sdvo.c
Merging drm-intel/for-linux-next (854c94a drm/i915: remove a superflous semi-colon)
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_sdvo.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_fb.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_display.c
Merging drm-tegra/drm/for-next (726ecef gpu: host1x: Rework CPU syncpoint increment)
Merging sound/for-next (fd678ca ALSA: hda - Use snd_hda_check_power_state() in patch_hdmi.c)
Merging sound-asoc/for-next (84bbc4a Merge remote-tracking branch 'asoc/topic/x86' into asoc-next)
Merging modules/modules-next (06df44e modpost.c: Add .text.unlikely to TEXT_SECTIONS)
Merging virtio/virtio-next (b3087e4 virtio: remove virtqueue_add_buf().)
Merging input/next (e93d85a Input: pxa27x-keypad - make platform data const)
Merging input-mt/for-next (257867d Input: MT - Specify that ABS_MT_SLOT must have a minimum of 0)
Merging cgroup/for-next (a6c1839 Merge branch 'for-3.11' into for-next)
Merging block/for-next (f4d5f94 Merge branch 'for-linus' into for-next)
CONFLICT (content): Merge conflict in include/linux/cgroup.h
Merging device-mapper/master (11531a4 Fix detection of the need to resize the dm thin metadata device.)
Merging embedded/master (4744b43 embedded: fix vc_translate operator precedence)
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 (b9ec274 mmc: tmio: reset the controller after power-up)
Merging kgdb/kgdb-next (6bedf31 kdb: Remove unhandled ssb command)
Merging slab/for-next (c55d728 Merge branch 'slab/next' into for-next)
Merging uclinux/for-next (6dbe51c Linux 3.9-rc1)
Merging md/for-next (52c6ede raid5: make release_stripe lockless)
Merging mfd/master (e578438 mfd: ssbi: Use devm_* and simplify code)
Merging battery/master (e5409cb charger-manager: Add missing newlines, fix a couple of typos, add pr_fmt)
Merging fbdev/for-next (8ea2c86 Merge branch 'fbdev-3.11' of git://gitorious.org/linux-omap-dss2/linux into fbdev/for-next)
CONFLICT (content): Merge conflict in drivers/video/of_display_timing.c
Merging viafb/viafb-next (838ac78 viafb: avoid refresh and mode lookup in set_par)
Merging omap_dss2/for-next (e72b753 fbdev/ps3fb: fix compile warning)
Merging regulator/for-next (5d03353 Merge remote-tracking branch 'regulator/topic/tps62360' into regulator-next)
Merging security/next (1ca0072 Merge branch 'smack-for-3.11' of git://git.gitorious.org/smack-next/kernel into ra-next)
Merging selinux/master (c2d7b24 Merge tag 'v3.4' into 20120409)
Merging lblnet/master (7e27d6e Linux 2.6.35-rc3)
Merging watchdog/master (28b7e09 watchdog: wdrtas: don't use custom version of print_hex_dump)
Merging dwmw2-iommu/master (6491d4d intel-iommu: Free old page tables before creating superpage)
Merging iommu/next (0c4513b Merge branches 'iommu/fixes', 'x86/vt-d', 'x86/amd', 'ppc/pamu', 'core' and 'arm/tegra' into next)
Merging vfio/next (3655b22 Merge tag 'stable/for-linus-3.10-rc3-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen)
Merging osd/linux-next (861d666 exofs: don't leak io_state and pages on read error)
Merging jc_docs/docs-next (5c050fb docs: update the development process document)
Merging trivial/for-next (278cee0 treewide: Fix typo in printk)
CONFLICT (content): Merge conflict in Documentation/networking/netlink_mmap.txt
Merging audit/for-next (dcd6c92 Linux 3.3-rc1)
Merging fsnotify/for-next (1ca39ab inotify: automatically restart syscalls)
Merging edac/linux_next (de4772c edac: sb_edac.c should not require prescence of IMC_DDRIO device)
Merging edac-amd/for-next (aad19e5 EDAC, MCE, AMD: Add an MCE signature for new Fam15h models)
Merging devicetree/devicetree/next (ba166e9 of: remove CONFIG_OF_DEVICE)
Merging dt-rh/for-next (d683b96 Linux 3.10-rc4)
Merging spi/spi/next (00ab539 spi/s3c64xx: let device core setup the default pin configuration)
Merging spi-mb/for-next (7017e5d Merge remote-tracking branch 'spi/topic/xilinx' into spi-next)
Merging tip/auto-latest (e4aa937 Linux 3.10-rc3)
Merging ftrace/for-next (4c69e6e tracepoints: Prevent null probe from being added)
Merging rcu/rcu/next (be77f87 Merge branches 'cbnum.2013.06.10a', 'doc.2013.06.10a', 'fixes.2013.06.10a', 'srcu.2013.06.10a' and 'tiny.2013.06.10a' into HEAD)
Merging cputime/cputime (c3e0ef9 [S390] fix cputime overflow in uptime_proc_show)
Merging uprobes/for-next (0326f5a uprobes/core: Handle breakpoint and singlestep exceptions)
Merging kvm/linux-next (aeb87c3 KVM: s390: Fix epsw instruction decoding)
CONFLICT (content): Merge conflict in arch/s390/include/asm/pgtable.h
Merging kvm-arm/kvm-arm-next (a1b02cb fixup! ARM: KVM: Allow host virt timer irq to be different from guest timer virt irq)
Merging kvm-ppc/kvm-ppc-next (5975a2e KVM: PPC: Book3S: Add API for in-kernel XICS emulation)
Merging oprofile/for-next (f722406 Linux 3.10-rc1)
Merging fw-nohz/nohz/next (74876a9 printk: Wake up klogd using irq_work)
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 (6c63f3c Merge branch 'stable/pvh.v8' into linux-next)
Merging xen-arm/linux-next (3a88558 xen/arm: account for stolen ticks)
Merging percpu/for-next (a424445 percpu-refcount: use RCU-sched insted of normal RCU)
Merging workqueues/for-next (bbe2a23 Merge branch 'for-3.10-fixes' into for-next)
Merging drivers-x86/linux-next (a1ec56e Add support for fan button on Ideapad Z580)
Merging hwpoison/hwpoison (46e387b Merge branch 'hwpoison-hugepages' into hwpoison)
Merging sysctl/master (4e474a0 sysctl: protect poll() in entries that may go away)
Merging regmap/for-next (467c1c5 Merge remote-tracking branch 'regmap/topic/field' into regmap-next)
Merging hsi/for-next (43139a6 HSI: hsi_char: Update ioctl-number.txt)
Merging leds/for-next (2ca3a45 leds: leds-mc13783: Add devicetree support)
$ git reset --hard HEAD^
Merging next-20130607 version of leds
Merging driver-core/driver-core-next (bb07b00 Merge 3.10-rc6 into driver-core-next)
CONFLICT (content): Merge conflict in include/linux/platform_device.h
CONFLICT (content): Merge conflict in drivers/base/memory.c
CONFLICT (content): Merge conflict in drivers/base/firmware_class.c
CONFLICT (content): Merge conflict in drivers/base/cpu.c
Merging tty/tty-next (64e377d tty: Reset itty for other pty)
Merging usb/usb-next (4134126 usb: check usb_hub_to_struct_hub() return value)
Merging usb-gadget/next (b1fd6cb usb: dwc3: omap: Adds dwc3_omap_readl/writel wrappers)
Merging staging/staging-next (d0941b1 Staging: silicom: move more assignments out of if conditions)
CONFLICT (content): Merge conflict in drivers/thermal/ti-soc-thermal/ti-thermal-common.c
CONFLICT (content): Merge conflict in drivers/staging/silicom/bpctl_mod.c
CONFLICT (content): Merge conflict in drivers/staging/serqt_usb2/serqt_usb2.c
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/thermal/ti_soc_thermal.txt
Applying: staging/lustre: fix for invalidatepage() API change
Merging char-misc/char-misc-next (e3a3c3a UIO: fix uio_pdrv_genirq with device tree but no interrupt)
Merging bcon/master (e284f34 netconsole: s/syslogd/cancd/ in documentation)
CONFLICT (content): Merge conflict in drivers/block/Kconfig
Merging tmem/linux-next (8f0d816 Linux 3.7-rc3)
Merging writeback/writeback-for-next (ed84825 Negative (setpoint-dirty) in bdi_position_ratio())
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 (a5d811b pinctrl: add Intel BayTrail GPIO/pinctrl support)
CONFLICT (content): Merge conflict in drivers/net/ethernet/ti/davinci_mdio.c
Merging vhost/linux-next (f722406 Linux 3.10-rc1)
Merging memblock/memblock-kill-early_node_map (7bd0b0f memblock: Reimplement memblock allocation using reverse free area iterator)
Merging remoteproc/for-next (b977785 remoteproc: fix kconfig dependencies for VIRTIO)
Merging rpmsg/for-next (397944d rpmsg: fix kconfig dependencies for VIRTIO)
Merging irqdomain/irqdomain/next (b7ba09c irqdomain: Fix flubbed irq_domain_associate_many refactoring)
CONFLICT (content): Merge conflict in kernel/irq/irqdomain.c
Merging gpio/gpio/next (644c8df gpio: sx150x: convert to use devm_* functions)
Merging gpio-lw/for-next (62ffac1 gpio-sta2x11: Convert to use devm_ioremap_resource)
Merging mailbox/dbx500-prcmu-mailbox (c497eba mailbox: fix invalid use of sizeof in mailbox_msg_send())
Merging arm-soc/for-next (31d0421 Merge branch 'next/cleanup' into for-next)
CONFLICT (content): Merge conflict in drivers/usb/phy/phy-rcar-usb.c
CONFLICT (content): Merge conflict in drivers/tty/serial/xilinx_uartps.c
CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/clock-r8a7778.c
CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/clock-r8a7740.c
Merging bcm2835/for-next (7d13205 Linux 3.10-rc6)
Merging cortex/for-next (6fae9cd ARM: ARMv7-M: implement read_cpuid_ext)
Merging ep93xx/ep93xx-for-next (7ec4429 Merge branch 'ep93xx-fixes' into ep93xx-for-next)
Merging imx-mxs/for-next (01ff97e Merge branch 'imx/dt' into for-next)
CONFLICT (content): Merge conflict in arch/arm/mach-mxs/mach-mxs.c
CONFLICT (content): Merge conflict in arch/arm/Kconfig.debug
Merging ixp4xx/next (19f949f Linux 3.8)
Merging msm/for-next (30c42f2 Merge branch 'msm-clock' into for-next)
Merging mvebu/for-next (50531ed Merge branch 'mvebu/regmap' into for-next)
CONFLICT (content): Merge conflict in arch/arm/boot/dts/kirkwood-6281.dtsi
Merging renesas/next (4e8ee67 Merge branch 'heads/phy-rcar-usb' into next)
CONFLICT (content): Merge conflict in include/uapi/linux/serial_core.h
CONFLICT (content): Merge conflict in include/linux/serial_sci.h
CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/include/mach/r8a7778.h
CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/clock-r8a7778.c
CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/board-bockw.c
Merging samsung/for-next (bc40c11 Merge branch 'v3.11-next/samsung-pwm' into for-next)
CONFLICT (content): Merge conflict in drivers/usb/Kconfig
Merging tegra/for-next (7d13205 Linux 3.10-rc6)
Merging dma-mapping/dma-mapping-next (c1be5a5 Linux 3.9)
Merging pwm/for-next (88b613e pwm: add pca9685 driver)
Merging dma-buf/for-next (844ce9f Merge tag 'mmc-fixes-for-3.10-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc)
Merging userns/for-next (78008c4 proc: Restrict mounting the proc filesystem)
Merging ktest/for-next (df5f7c6 ktest: Reset grub menu cache with different machines)
Merging signal/for-next (20b4fb4 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
Merging clk/clk-next (0457799 clk: gate: add CLK_GATE_HIWORD_MASK)
CONFLICT (content): Merge conflict in drivers/clk/tegra/clk-tegra114.c
Merging random/dev (b980955 random: fix locking dependency with the tasklist_lock)
Merging lzo-update/lzo-update (42b775a lib/lzo: huge LZO decompression speedup on ARM by using unaligned access)
Merging arm64-hugepages/for-next/hugepages (af07484 ARM64: mm: THP support.)
CONFLICT (content): Merge conflict in arch/arm64/include/asm/pgtable.h
CONFLICT (content): Merge conflict in arch/arm64/include/asm/pgtable-hwdef.h
CONFLICT (content): Merge conflict in arch/arm64/Kconfig
Merging scsi-post-merge/merge-base:master (65112dc Merge git://git.samba.org/sfrench/cifs-2.6)
Applying: fix up for fw_load_abort API change
Merging akpm-current/current (17858ca Merge tag 'please-pull-fixia64' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux)
$ git checkout -b akpm remotes/origin/akpm/master
Applying: fput-task_work_add-can-fail-if-the-caller-has-passed-exit_task_work-fix
Applying: metag: fix mm/hugetlb.c build breakage
Applying: include/linux/smp.h:on_each_cpu(): switch back to a macro
Applying: drivers/platform/x86/intel_ips.c: convert to module_pci_driver
Applying: x86: fix trigger_all_cpu_backtrace() implementation
Applying: sound/soc/codecs/si476x.c: don't use 0bNNN
Applying: x86: make 'mem=' option to work for efi platform
Applying: audit: fix mq_open and mq_unlink to add the MQ root as a hidden parent audit_names record
Applying: kernel/auditfilter.c: fixing build warning
Applying: kernel/auditfilter.c: fix leak in audit_add_rule() error path
Applying: drivers/pcmcia/pd6729.c: convert to module_pci_driver
Applying: drivers/pcmcia/yenta_socket.c: convert to module_pci_driver
Applying: drm/fb-helper: don't sleep for screen unblank when an oops is in progress
Applying: drm/cirrus: correct register values for 16bpp
Applying: drm/nouveau: make vga_switcheroo code depend on VGA_SWITCHEROO
Applying: drivers/media/pci/mantis/mantis_cards.c: convert to module_pci_driver
Applying: drivers/media/pci/dm1105/dm1105.c: convert to module_pci_driver
Applying: drivers/media/pci/mantis/hopper_cards.c: convert to module_pci_driver
Applying: drivers/media/pci/pluto2/pluto2.c: convert to module_pci_driver
Applying: drivers/media/pci/pt1/pt1.c: convert to module_pci_driver
Applying: drivers/video/smscufx.c: use NULL instead of 0
Applying: drivers/video/udlfb.c: use NULL instead of 0
Applying: drivers/video/udlfb.c: make local symbol static
Applying: drivers/video/imxfb.c: make local symbols static
Applying: drivers/video/acornfb.c: remove dead code
Applying: cyber2000fb: avoid palette corruption at higher clocks
Applying: fanotify: info leak in copy_event_to_user()
Applying: fanotify: fix races when adding/removing marks
Applying: fanotify: put duplicate code for adding vfsmount/inode marks into an own function
Applying: dnotify: replace dnotify_mark_mutex with mark mutex of dnotify_group
Applying: inotify: fix race when adding a new watch
Applying: fsnotify: update comments concerning locking scheme
Applying: drivers/iommu/msm_iommu_dev.c: fix leak and clean up error paths
Applying: drivers-iommu-msm_iommu_devc-fix-leak-and-clean-up-error-paths-fix
Applying: posix_cpu_timer: consolidate expiry time type
Applying: posix_cpu_timers: consolidate timer list cleanups
Applying: posix_cpu_timers: consolidate expired timers check
Applying: selftests: add basic posix timers selftests
Applying: posix-timers: correctly get dying task time sample in posix_cpu_timer_schedule()
Applying: posix_timers: fix racy timer delta caching on task exit
Applying: kernel/timer.c: fix jiffies wrap behavior of round_jiffies*()
Applying: hrtimer: one more expiry time overflow check in hrtimer_interrupt
Applying: drivers/infiniband/core/cm.c: convert to using idr_alloc_cyclic()
Applying: scripts/setlocalversion on write-protected source tree
Applying: drivers/ide/delkin_cb.c: convert to module_pci_driver
Applying: drivers/mtd/chips/gen_probe.c: refactor call to request_module()
Applying: virtio_balloon: leak_balloon(): only tell host if we got pages deflated
Applying: configfs: use capped length for ->store_attribute()
Applying: drivers/net/ethernet/ibm/ehea/ehea_main.c: add alias entry for portN properties
Applying: mISDN: add support for group membership check
Applying: drivers/atm/he.c: convert to module_pci_driver
Applying: isdn: clean up debug format string usage
Applying: fs/ocfs2/dlm/dlmrecovery.c: remove duplicate declarations
Applying: fs/ocfs2/dlm/dlmrecovery.c:dlm_request_all_locks(): ret should be int instead of enum
Applying: ocfs2: should not use le32_add_cpu to set ocfs2_dinode i_flags
Applying: ocfs2: add missing dlm_put() in dlm_begin_reco_handler()
Applying: ocfs2: remove unecessary variable needs_checkpoint
Applying: ocfs2: fix mutex_unlock and possible memory leak in ocfs2_remove_btree_range
Applying: fs/ocfs2/journal.h: add bits_wanted while calculating credits in ocfs2_calc_extend_credits
Applying: fs/ocfs2/cluster/tcp.c: free sc->sc_page in sc_kref_release()
Applying: softirq: use _RET_IP_
Applying: include/linux/sched.h: don't use task->pid/tgid in same_thread_group/has_group_leader_pid
Applying: lockdep: introduce lock_acquire_exclusive/shared helper macros
Applying: lglock: update lockdep annotations to report recursive local locks
Applying: drivers/scsi/a100u2w.c: convert to module_pci_driver
Applying: drivers/scsi/dc395x.c: convert to module_pci_driver
Applying: drivers/scsi/dmx3191d.c: convert to module_pci_driver
Applying: drivers/scsi/initio.c: convert to module_pci_driver
Applying: drivers/scsi/mvumi.c: convert to module_pci_driver
Applying: drivers/net/irda/donauboe.c: convert to module_pci_driver
Applying: drivers/cdrom/gdrom.c: fix device number leak
Applying: block/compat_ioctl.c: do not leak info to user-space
Applying: drivers/cdrom/cdrom.c: use kzalloc() for failing hardware
Applying: block: do not pass disk names as format strings
Applying: block: restore /proc/partitions to not display non-partitionable removable devices
Applying: fput: turn "list_head delayed_fput_list" into llist_head
Applying: llist: fix/simplify llist_add() and llist_add_batch()
Applying: llist: llist_add() can use llist_add_batch()
Applying: watchdog: trigger all-cpu backtrace when locked up and going to panic
Applying: crypto: sanitize argument for format string
Applying: clear_refs: sanitize accepted commands declaration
Applying: clear_refs: introduce private struct for mm_walk
Applying: pagemap: introduce pagemap_entry_t without pmshift bits
Applying: pagemap-introduce-pagemap_entry_t-without-pmshift-bits-v4
Applying: mm: soft-dirty bits for user memory changes tracking
Applying: soft-dirty: call mmu notifiers when write-protecting ptes
Applying: pagemap: prepare to reuse constant bits with page-shift
Applying: mm, memcg: don't take task_lock in task_in_mem_cgroup
Applying: mm: remove free_area_cache
Applying: mm: remove compressed copy from zram in-memory
Applying: mm-remove-compressed-copy-from-zram-in-memory-fix
Applying: non-swapcache pages in end_swap_bio_read()
Applying: mm-remove-compressed-copy-from-zram-in-memory-fix-2-fix
Applying: swap: add a simple detector for inappropriate swapin readahead
Applying: swap: swapin_nr_pages() can be static
Applying: mm: use vma_pages() to replace (vm_end - vm_start) >> PAGE_SHIFT
Applying: ncpfs: use vma_pages() to replace (vm_end - vm_start) >> PAGE_SHIFT
Applying: uio: use vma_pages() to replace (vm_end - vm_start) >> PAGE_SHIFT
Applying: mm/page_alloc: factor out setting of pcp->high and pcp->batch
Applying: mm/page_alloc: prevent concurrent updaters of pcp ->batch and ->high
Applying: mm/page_alloc: insert memory barriers to allow async update of pcp batch and high
Applying: mm/page_alloc: protect pcp->batch accesses with ACCESS_ONCE
Applying: mm/page_alloc: convert zone_pcp_update() to rely on memory barriers instead of stop_machine()
Applying: mm/page_alloc: when handling percpu_pagelist_fraction, don't unneedly recalulate high
Applying: mm/page_alloc: factor setup_pageset() into pageset_init() and pageset_set_batch()
Applying: mm/page_alloc: relocate comment to be directly above code it refers to.
Applying: mm/page_alloc: factor zone_pageset_init() out of setup_zone_pageset()
Applying: mm/page_alloc: in zone_pcp_update(), uze zone_pageset_init()
Applying: mm/page_alloc: rename setup_pagelist_highmark() to match naming of pageset_set_batch()
Applying: mm/page_alloc: don't re-init pageset in zone_pcp_update()
Applying: mm/thp: use the correct function when updating access flags
Applying: mm/THP: add pmd args to pgtable deposit and withdraw APIs
Applying: mm/THP: withdraw the pgtable after pmdp related operations
Applying: mm/THP: don't use HPAGE_SHIFT in transparent hugepage code
Applying: thp: define HPAGE_PMD_* constants as BUILD_BUG() if !THP
Applying: mm/THP: deposit the transpare huge pgtable before set_pmd
Applying: mm: vmscan: limit the number of pages kswapd reclaims at each priority
Applying: mm: vmscan: obey proportional scanning requirements for kswapd
Applying: mm: vmscan: flatten kswapd priority loop
Applying: mm: vmscan: decide whether to compact the pgdat based on reclaim progress
Applying: mm: vmscan: do not allow kswapd to scan at maximum priority
Applying: mm: vmscan: have kswapd writeback pages based on dirty pages encountered, not priority
Applying: mm: vmscan: block kswapd if it is encountering pages under writeback
Applying: mm-vmscan-block-kswapd-if-it-is-encountering-pages-under-writeback-fix
Applying: mm-vmscan-block-kswapd-if-it-is-encountering-pages-under-writeback-fix-2
Applying: mm: vmscan: check if kswapd should writepage once per pgdat scan
Applying: mm: vmscan: move logic from balance_pgdat() to kswapd_shrink_zone()
Applying: mm: vmscan: stall page reclaim and writeback pages based on dirty/writepage pages encountered
Applying: mm: vmscan: stall page reclaim after a list of pages have been processed
Applying: mm: vmscan: set zone flags before blocking
Applying: mm: vmscan: move direct reclaim wait_iff_congested into shrink_list
Applying: mm: vmscan: treat pages marked for immediate reclaim as zone congestion
Applying: mm: vmscan: take page buffers dirty and locked state into account
Applying: fs: nfs: inform the VM about pages being committed or unstable
Applying: mm: fix comment referring to non-existent size_seqlock, change to span_seqlock
Applying: mmzone: note that node_size_lock should be manipulated via pgdat_resize_lock()
Applying: memory_hotplug: use pgdat_resize_lock() in online_pages()
Applying: memory_hotplug: use pgdat_resize_lock() in __offline_pages()
Applying: memory_hotplug-use-pgdat_resize_lock-in-__offline_pages-fix
Applying: include/linux/mm.h: add PAGE_ALIGNED() helper
Applying: vmcore: clean up read_vmcore()
Applying: vmcore: allocate buffer for ELF headers on page-size alignment
Applying: vmcore-allocate-buffer-for-elf-headers-on-page-size-alignment-fix
Applying: vmcore: treat memory chunks referenced by PT_LOAD program header entries in page-size boundary in vmcore_list
Applying: vmalloc: make find_vm_area check in range
Applying: vmalloc: introduce remap_vmalloc_range_partial
Applying: vmalloc-introduce-remap_vmalloc_range_partial-fix
Applying: vmcore: allocate ELF note segment in the 2nd kernel vmalloc memory
Applying: vmcore-allocate-elf-note-segment-in-the-2nd-kernel-vmalloc-memory-fix
Applying: vmcore: allow user process to remap ELF note segment buffer
Applying: vmcore-allow-user-process-to-remap-elf-note-segment-buffer-fix
Applying: vmcore: calculate vmcore file size from buffer size and total size of vmcore objects
Applying: vmcore: support mmap() on /proc/vmcore
Applying: vmcore-support-mmap-on-proc-vmcore-fix
Applying: vmcore: disable mmap_vmcore() if CONFIG_MMU is not defined
Applying: memcg: update TODO list in Documentation
Applying: mm: add tracepoints for LRU activation and insertions
Applying: mm: pagevec: defer deciding which LRU to add a page to until pagevec drain time
Applying: mm: activate !PageLRU pages on mark_page_accessed if page is on local pagevec
Applying: mm: remove lru parameter from __pagevec_lru_add and remove parts of pagevec API
Applying: mm: remove lru parameter from __lru_cache_add and lru_cache_add_lru
Applying: mm: Clear page active before releasing pages
Applying: mm/page_alloc.c: add additional checking and return value for the 'table->data'
Applying: mm/nommu.c: add additional check for vread() just like vwrite() has done
Applying: mm/memory-failure.c: fix memory leak in successful soft offlining
Applying: mm/memory_hotplug.c: change normal message to use pr_debug
Applying: mm/memory-hotplug: fix lowmem count overflow when offline pages
Applying: mm-memory-hotplug-fix-lowmem-count-overflow-when-offline-pages-fix
Applying: mm/pageblock: remove get/set_pageblock_flags
Applying: mm/hugetlb: remove hugetlb_prefault
Applying: mm/hugetlb: use already existing interface huge_page_shift
Applying: mm: tune vm_committed_as percpu_counter batching size
Applying: mm-tune-vm_committed_as-percpu_counter-batching-size-fix
Applying: swap: discard while swapping only if SWAP_FLAG_DISCARD_PAGES
Applying: swap-discard-while-swapping-only-if-swap_flag_discard_pages-fix
Applying: mm: change signature of free_reserved_area() to fix building warnings
Applying: mm: enhance free_reserved_area() to support poisoning memory with zero
Applying: mm/ARM64: kill poison_init_mem()
Applying: mm/x86: use free_reserved_area() to simplify code
Applying: mm/tile: use common help functions to free reserved pages
Applying: mm: fix some trivial typos in comments
Applying: mm: use managed_pages to calculate default zonelist order
Applying: mm: accurately calculate zone->managed_pages for highmem zones
Applying: mm: use a dedicated lock to protect totalram_pages and zone->managed_pages
Applying: mm-use-a-dedicated-lock-to-protect-totalram_pages-and-zone-managed_pages-fix
Applying: mm: make __free_pages_bootmem() only available at boot time
Applying: mm: correctly update zone->managed_pages
Applying: mm-correctly-update-zone-managed_pages-fix
Applying: mm-correctly-update-zone-managed_pages-fix-fix
Applying: mm-correctly-update-zone-managed_pages-fix-fix-fix
Applying: mm: concentrate modification of totalram_pages into the mm core
Applying: mm: report available pages as "MemTotal" for each NUMA node
Applying: memcg: Kconfig info update
Applying: mm: Fix the TLB range flushed when __tlb_remove_page() runs out of slots
Applying: vmlinux.lds: add comments for global variables and clean up useless declarations
Applying: avr32: normalize global variables exported by vmlinux.lds
Applying: c6x: normalize global variables exported by vmlinux.lds
Applying: h8300: normalize global variables exported by vmlinux.lds
Applying: score: normalize global variables exported by vmlinux.lds
Applying: tile: normalize global variables exported by vmlinux.lds
Applying: UML: normalize global variables exported by vmlinux.lds
Applying: mm: introduce helper function mem_init_print_info() to simplify mem_init()
Applying: mm: use totalram_pages instead of num_physpages at runtime
Applying: mm/hotplug: prepare for removing num_physpages
Applying: mm/alpha: prepare for removing num_physpages and simplify mem_init()
Applying: mm/ARC: prepare for removing num_physpages and simplify mem_init()
Applying: mm/ARM: prepare for removing num_physpages and simplify mem_init()
Applying: mm/ARM64: prepare for removing num_physpages and simplify mem_init()
Applying: mm/AVR32: prepare for removing num_physpages and simplify mem_init()
Applying: mm/blackfin: prepare for removing num_physpages and simplify mem_init()
Applying: mm/c6x: prepare for removing num_physpages and simplify mem_init()
Applying: mm/cris: prepare for removing num_physpages and simplify mem_init()
Applying: mm/frv: prepare for removing num_physpages and simplify mem_init()
Applying: mm/h8300: prepare for removing num_physpages and simplify mem_init()
Applying: mm/hexagon: prepare for removing num_physpages and simplify mem_init()
Applying: mm/IA64: prepare for removing num_physpages and simplify mem_init()
Applying: mm/m32r: prepare for removing num_physpages and simplify mem_init()
Applying: mm/m68k: prepare for removing num_physpages and simplify mem_init()
Applying: mm/metag: prepare for removing num_physpages and simplify mem_init()
Applying: mm/microblaze: prepare for removing num_physpages and simplify mem_init()
Applying: mm, arch: fix two errors in calling mem_init_print_info()
Applying: mm/MIPS: prepare for removing num_physpages and simplify mem_init()
Applying: mm/mn10300: prepare for removing num_physpages and simplify mem_init()
Applying: mm/openrisc: prepare for removing num_physpages and simplify mem_init()
Applying: mm/PARISC: prepare for removing num_physpages and simplify mem_init()
Applying: mm/ppc: prepare for removing num_physpages and simplify mem_init()
Applying: mm/s390: prepare for removing num_physpages and simplify mem_init()
Applying: mm/score: prepare for removing num_physpages and simplify mem_init()
Applying: mm/SH: prepare for removing num_physpages and simplify mem_init()
Applying: mm/SPARC: prepare for removing num_physpages and simplify mem_init()
Applying: mm/tile: prepare for removing num_physpages and simplify mem_init()
Applying: mm/um: prepare for removing num_physpages and simplify mem_init()
Applying: mm/unicore32: prepare for removing num_physpages and simplify mem_init()
Applying: mm/x86: prepare for removing num_physpages and simplify mem_init()
Applying: mm/xtensa: prepare for removing num_physpages and simplify mem_init()
Applying: mm: kill global variable num_physpages
Applying: mm: introduce helper function set_max_mapnr()
Applying: mm/AVR32: prepare for killing free_all_bootmem_node()
Applying: mm/IA64: prepare for killing free_all_bootmem_node()
Applying: mm/m32r: prepare for killing free_all_bootmem_node()
Applying: mm/m68k: prepare for killing free_all_bootmem_node()
Applying: mm/metag: prepare for killing free_all_bootmem_node()
Applying: mm/MIPS: prepare for killing free_all_bootmem_node()
Applying: mm/PARISC: prepare for killing free_all_bootmem_node()
Applying: mm/PPC: prepare for killing free_all_bootmem_node()
Applying: mm/SH: prepare for killing free_all_bootmem_node()
Applying: mm: kill free_all_bootmem_node()
Applying: mm/alpha: unify mem_init() for both UMA and NUMA architectures
Applying: mm/m68k: fix build warning of unused variable
Applying: mm/ALPHA: clean up unused VALID_PAGE()
Applying: mm/ARM: fix stale comment about VALID_PAGE()
Applying: mm/CRIS: clean up unused VALID_PAGE()
Applying: mm/microblaze: clean up unused VALID_PAGE()
Applying: mm/unicore32: fix stale comment about VALID_PAGE()
Applying: sparsemem: add BUILD_BUG_ON when sizeof mem_section is non-power-of-2
Applying: documentation: update address_space_operations
Applying: documentation: document the is_dirty_writeback aops callback
Applying: fs/fs-writeback.c: : make wb_do_writeback() as static
Applying: mm, vmalloc: only call setup_vmalloc_vm() only in __get_vm_area_node()
Applying: mm, vmalloc: call setup_vmalloc_vm() instead of insert_vmalloc_vm()
Applying: mm, vmalloc: remove insert_vmalloc_vm()
Applying: mm, vmalloc: use clamp() to simplify code
Applying: mm: memcontrol: factor out reclaim iterator loading and updating
Applying: fs: bump inode and dentry counters to long
Applying: super: fix calculation of shrinkable objects for small numbers
Applying: dcache: convert dentry_stat.nr_unused to per-cpu counters
Applying: dentry: move to per-sb LRU locks
Applying: dcache: remove dentries from LRU before putting on dispose list
Applying: mm: new shrinker API
Applying: shrinker: convert superblock shrinkers to new API
Applying: shrinker-convert-superblock-shrinkers-to-new-api-fix
Applying: list: add a new LRU list type
Applying: inode: convert inode lru list to generic lru list code.
Applying: dcache: convert to use new lru list infrastructure
Applying: list_lru: per-node list infrastructure
Applying: list_lru: per-node API
Applying: shrinker: add node awareness
Applying: vmscan: per-node deferred work
Applying: fs: convert inode and dentry shrinking to be node aware
Applying: xfs: convert buftarg LRU to generic code
Applying: xfs-convert-buftarg-lru-to-generic-code-fix
Applying: xfs: rework buffer dispose list tracking
Applying: xfs: convert dquot cache lru to list_lru
Applying: xfs-convert-dquot-cache-lru-to-list_lru-fix
Applying: fs: convert fs shrinkers to new scan/count API
CONFLICT (content): Merge conflict in fs/ext4/extents_status.c
Applying: fs-convert-fs-shrinkers-to-new-scan-count-api-fix
CONFLICT (content): Merge conflict in fs/ext4/extents_status.c
Applying: UBIFS: signedness bug in ubifs_shrink_count()
Applying: drivers: convert shrinkers to new count/scan API
Applying: drivers-convert-shrinkers-to-new-count-scan-api-fix
Applying: drivers-convert-shrinkers-to-new-count-scan-api-fix-2
Applying: i915: bail out earlier when shrinker cannot acquire mutex
Applying: shrinker: convert remaining shrinkers to count/scan API
Applying: shrinker-convert-remaining-shrinkers-to-count-scan-api-fix
Applying: hugepage: convert huge zero page shrinker to new shrinker API
Applying: hugepage-convert-huge-zero-page-shrinker-to-new-shrinker-api-fix
Applying: shrinker: Kill old ->shrink API.
Applying: shrinker-kill-old-shrink-api-fix
Applying: list_lru: dynamically adjust node arrays
Applying: mm: mremap: validate input before taking lock
Applying: memcg: clean up memcg->nodeinfo
Applying: mm: invoke oom-killer from remaining unconverted page fault handlers
Applying: mm: remove duplicated call of get_pfn_range_for_nid
Applying: mm-remove-duplicated-call-of-get_pfn_range_for_nid-v2
Applying: mm-remove-duplicated-call-of-get_pfn_range_for_nid-v2-fix
Applying: mm/vmalloc.c: unbreak __vunmap()
Applying: mm/vmalloc.c: remove dead code in vb_alloc
Applying: mm/vmalloc.c: remove unused purge_fragmented_blocks_thiscpu
Applying: mm/vmalloc.c: remove alloc_map from vmap_block
Applying: mm/vmalloc.c: emit the failure message before return
Applying: mm/vmalloc.c: rename VM_UNLIST to VM_UNINITIALIZED
Applying: mm/vmalloc.c: check VM_UNINITIALIZED flag in s_show instead of show_numa_info
Applying: memcg: also test for skip accounting at the page allocation level
Applying: memcg: do not account memory used for cache creation
Applying: include/linux/gfp.h: fix the comment for GFP_ZONE_TABLE
Applying: zbud: add to mm/
Applying: zswap: init under_reclaim
Applying: zswap: add to mm/
Applying: zswap: add documentation
Applying: MAINTAINERS: add zswap and zbud maintainer
Applying: mm/page_alloc.c: remove zone_type argument of build_zonelists_node
Applying: mm: remove unused functions is_{normal_idx, normal, dma32, dma}
Applying: mm/page_alloc.c: remove unlikely() from the current_order test
Applying: vfree: don't schedule free_work() if llist_add() returns false
Applying: mm: remove unused __put_page()
Applying: mm/sparse.c: put clear_hwpoisoned_pages within CONFIG_MEMORY_HOTREMOVE
Applying: include/linux/mmzone.h: cleanups
Applying: mm: memmap_init_zone() performance improvement
Applying: drop_caches: add some documentation and info message
Applying: drivers/usb/gadget/amd5536udc.c: avoid calling dma_pool_create() with NULL dev
Applying: mm/dmapool.c: fix null dev in dma_pool_create()
Applying: mm: add vm event counters for balloon pages compaction
Applying: arch/frv/kernel/traps.c: using vsnprintf() instead of vsprintf()
Applying: arch/frv/kernel/setup.c: use strncmp() instead of memcmp()
Applying: err.h: IS_ERR() can accept __user pointers
Applying: clean up scary strncpy(dst, src, strlen(src)) uses
Applying: clean-up-scary-strncpydst-src-strlensrc-uses-fix
Applying: drivers: avoid format string in dev_set_name
Applying: drivers: avoid format strings in names passed to alloc_workqueue()
Applying: drivers: avoid parsing names as kthread_run() format strings
Applying: dump_stack: serialize the output from dump_stack()
Applying: dump_stack-serialize-the-output-from-dump_stack-fix
Applying: panic: add cpu/pid to warn_slowpath_common in WARNING printk()s
Applying: panic-add-cpu-pid-to-warn_slowpath_common-in-warning-printks-fix
Applying: kernel/sys.c: sys_reboot(): fix malformed panic message
Applying: kernel/sys.c:do_sysinfo(): use get_monotonic_boottime()
Applying: dmi: add support for exact DMI matches in addition to substring matching
Applying: drm/i915: quirk away phantom LVDS on Intel's D510MO mainboard
Applying: drm/i915: quirk away phantom LVDS on Intel's D525MW mainboard
Applying: smp: Give WARN()ing when calling smp_call_function_many()/single() in serving irq
Applying: drivers/misc/sgi-gru/grufault.c: fix a sanity test in gru_set_context_option()
Applying: MAINTAINERS: fix tape driver file mappings
Applying: backlight: atmel-pwm-bl: remove unnecessary platform_set_drvdata()
Applying: backlight: ep93xx: remove unnecessary platform_set_drvdata()
Applying: backlight: lp8788: remove unnecessary platform_set_drvdata()
Applying: backlight: pcf50633: remove unnecessary platform_set_drvdata()
Applying: backlight: add devm_backlight_device_{register,unregister}()
Applying: lcd: add devm_lcd_device_{register,unregister}()
Applying: MAINTAINERS: add Backlight subsystem co-maintainer
Applying: backlight: convert from legacy pm ops to dev_pm_ops
Applying: backlight: add CONFIG_PM_SLEEP to suspend/resume functions
Applying: rbtree: remove unneeded include
Applying: rbtree-remove-unneeded-include-fix
Applying: radeon: remove redundant __list_for_each definition from mkregtable.c
Applying: ipw2200: convert __list_for_each usage to list_for_each
Applying: sctp: convert __list_for_each use to list_for_each
Applying: list: remove __list_for_each()
Applying: checkpatch: change CamelCase test and make it --strict
Applying: checkpatch: warn when using gcc's binary constant ("0b") extension
Applying: checkpatch: add --strict preference for p = kmalloc(sizeof(*p)...
Applying: checkpatch: remove quote from CamelCase test
Applying: checkpatch: improve network block comment test and message
Applying: checkpatch: warn when networking block comment lines don't start with *
Applying: checkpatch: warn on comparisons to jiffies
Applying: checkpatch: warn on comparisons to get_jiffies_64()
Applying: checkpatch: reduce false positive rate of "complex macros"
Applying: checkpatch: add a placeholder to check blank lines before declarations
Applying: checkpatch: don't warn on blank lines before/after braces as often
Applying: checkpatch: add a --strict test for comparison to true/false
Applying: checkpatch: improve "no space after cast" test
Applying: checkpatch: create an EXPERIMENTAL --fix option to correct patches
Applying: checkpatch: move test for space before semicolon after operator spacing
Applying: checkpatch: ignore SI unit CamelCase variants like "_uV"
Applying: binfmt_elf.c: use get_random_int() to fix entropy depleting
Applying: init: remove permanent string buffer from do_one_initcall()
Applying: insert missing space in printk line of root_delay
Applying: kprobes: handle empty/invalid input to debugfs "enabled" file
Applying: autofs4: allow autofs to work outside the initial PID namespace
Applying: autofs4: translate pids to the right namespace for the daemon
Applying: rtc: rtc-88pm80x: remove unnecessary platform_set_drvdata()
Applying: drivers/rtc/rtc-v3020.c: remove redundant goto
Applying: drivers/rtc/interface.c: fix checkpatch errors
Applying: drivers/rtc/rtc-at32ap700x.c: fix checkpatch error
Applying: drivers/rtc/rtc-at91rm9200.c: include <linux/uaccess.h>
Applying: drivers/rtc/rtc-cmos.c: fix whitespace related errors
Applying: drivers/rtc/rtc-davinci.c: fix whitespace warning
Applying: drivers/rtc/rtc-ds1305.c: add missing braces around sizeof
Applying: drivers/rtc/rtc-ds1374.c: fix spacing related issues
Applying: drivers/rtc/rtc-ds1511.c: fix issues related to spaces and braces
Applying: drivers/rtc/rtc-ds3234.c: fix whitespace issue
Applying: drivers/rtc/rtc-fm3130.c: fix whitespace related issue
Applying: drivers/rtc/rtc-m41t80.c: fix spacing related issue
Applying: drivers/rtc/rtc-max6902.c: remove unwanted spaces
Applying: drivers/rtc/rtc-max77686.c: remove space before semicolon
Applying: drivers/rtc/rtc-max8997.c: remove space before semicolon
Applying: drivers/rtc/rtc-mpc5121.c: remove space before tab
Applying: drivers/rtc/rtc-msm6242.c: use pr_warn
Applying: drivers/rtc/rtc-mxc.c: fix checkpatch error
Applying: drivers/rtc/rtc-omap.c: include <linux/io.h> instead of <asm/io.h>
Applying: drivers/rtc/rtc-pcf2123.c: remove space before tabs
Applying: drivers/rtc/rtc-pcf8583.c: move assignment outside if condition
Applying: drivers/rtc/rtc-rs5c313.c: include <linux/io.h> instead of <asm/io.h>
Applying: drivers/rtc/rtc-rs5c313.c: fix spacing related issues
Applying: drivers/rtc/rtc-v3020.c: fix spacing issues
Applying: drivers/rtc/rtc-vr41xx.c: fix spacing issues
Applying: drivers/rtc/rtc-x1205.c: fix checkpatch issues
Applying: rtc: rtc-88pm860x: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-ab3100: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-ab8500: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-at32ap700x: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-at91rm9200: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-at91sam9: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-au1xxx: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-bfin: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-bq4802: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-coh901331: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-da9052: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-da9055: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-davinci: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-dm355evm: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-ds1302: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-ep93xx: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-jz4740: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-lp8788: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-lpc32xx: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-ls1x: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-m48t59: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-max8925: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-max8998: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-mc13xxx: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-msm6242: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-mxc: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-nuc900: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-pcap: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-pm8xxx: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-s3c: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-sa1100: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-sh: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-spear: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-stmp3xxx: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-twl: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-vr41xx: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-vt8500: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-m48t86: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-puv3: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-rp5c01: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-tile: remove unnecessary platform_set_drvdata()
Applying: drivers/rtc/rtc-rv3029c2.c: fix disabling AIE irq
Applying: drivers/rtc/rtc-m48t86.c: remove empty function
Applying: drivers/rtc/rtc-tile.c: remove empty function
Applying: drivers/rtc/rtc-nuc900.c: remove empty function
Applying: drivers/rtc/rtc-msm6242.c: remove empty function
Applying: drivers/rtc/rtc-max8998.c: remove empty function
Applying: drivers/rtc/rtc-max8925.c: remove empty function
Applying: drivers/rtc/rtc-ls1x.c: remove empty function
Applying: drivers/rtc/rtc-lp8788.c: remove empty function
Applying: drivers/rtc/rtc-ds1302.c: remove empty function
Applying: drivers/rtc/rtc-dm355evm.c: remove empty function
Applying: drivers/rtc/rtc-da9055.c: remove empty function
Applying: drivers/rtc/rtc-da9052.c: remove empty function
Applying: drivers/rtc/rtc-bq4802.c: remove empty function
Applying: drivers/rtc/rtc-au1xxx.c: remove empty function
Applying: drivers/rtc/rtc-ab3100.c: remove empty function
Applying: rtc: rtc-hid-sensor-time: allow full years (16bit) in HID reports
Applying: rtc: rtc-hid-sensor-time: allow 16 and 32 bit values for all attributes.
Applying: rtc: add ability to push out an existing wakealarm using sysfs
Applying: drivers/rtc/rtc-vr41xx.c: fix error return code in rtc_probe()
Applying: rtc: rtc-ds1307: use devm_*() functions
Applying: rtc: rtc-jz4740: use devm_*() functions
Applying: rtc: rtc-mpc5121: use devm_*() functions
Applying: rtc: rtc-m48t59: use devm_*() functions
Applying: rtc: rtc-pm8xxx: use devm_*() functions
Applying: rtc: rtc-pxa: use devm_*() functions
Applying: rtc: rtc-rx8025: use devm_*() functions
Applying: rtc: rtc-sh: use devm_*() functions
Applying: rtc: rtc-coh901331: use platform_{get,set}_drvdata()
Applying: rtc: rtc-rc5t583: use platform_{get,set}_drvdata()
Applying: drivers/rtc/rtc-bq32k.c: remove empty function
Applying: drivers/rtc/rtc-ds1216.c: remove empty function
Applying: drivers/rtc/rtc-ds1286.c: remove empty function
Applying: drivers/rtc/rtc-ds1672.c: remove empty function
Applying: drivers/rtc/rtc-ds3234.c: remove empty function
Applying: drivers/rtc/rtc-ds1390.c: remove empty function
Applying: drivers/rtc/rtc-efi.c: remove empty function
Applying: drivers/rtc/rtc-em3027.c: remove empty function
Applying: drivers/rtc/rtc-fm3130.c: remove empty function
Applying: drivers/rtc/rtc-isl12022.c: remove empty function
Applying: drivers/rtc/rtc-m41t93.c: remove empty function
Applying: drivers/rtc/rtc-m48t35.c: remove empty function
Applying: drivers/rtc/rtc-generic.c: remove empty function
Applying: drivers/rtc/rtc-m41t94.c: remove empty function
Applying: drivers/rtc/rtc-max6902.c: remove empty function
Applying: drivers/rtc/rtc-max6900.c: remove empty function
Applying: drivers/rtc/rtc-max8907.c: remove empty function
Applying: drivers/rtc/rtc-max77686.c: remove empty function
Applying: drivers/rtc/rtc-max8997.c: remove empty function
Applying: drivers/rtc/rtc-pcf8523.c: remove empty function
Applying: drivers/rtc/rtc-pcf8563.c: remove empty function
Applying: drivers/rtc/rtc-pcf8583.c: remove empty function
Applying: drivers/rtc/rtc-ps3.c: remove empty function
Applying: drivers/rtc/rtc-rs5c313.c: remove empty function
Applying: drivers/rtc/rtc-rv3029c2.c: remove empty function
Applying: drivers/rtc/rtc-rx4581.c: remove empty function
Applying: drivers/rtc/rtc-rs5c348.c: remove empty function
Applying: drivers/rtc/rtc-rx8581.c: remove empty function
Applying: drivers/rtc/rtc-snvs.c: remove empty function
Applying: drivers/rtc/rtc-starfire.c: remove empty function
Applying: drivers/rtc/rtc-sun4v.c: remove empty function
Applying: drivers/rtc/rtc-tps80031.c: remove empty function
Applying: drivers/rtc/rtc-wm831x.c: remove empty function
Applying: drivers/rtc/rtc-ab8500.c: add second resolution to rtc driver
Applying: drivers/rtc/rtc-ds1302.c: handle write protection
Applying: drivers/rtc/rtc-mpc5121.c: use platform_{get,set}_drvdata()
Applying: drivers/rtc/rtc-da9052.c: use PTR_RET()
Applying: drivers/rtc/rtc-isl12022.c: use PTR_RET()
Applying: drivers/rtc/rtc-m48t35.c: use PTR_RET()
Applying: drivers/rtc/rtc-pcf8563.c: use PTR_RET()
Applying: drivers/rtc/rtc-pcf8583.c: use PTR_RET()
Applying: drivers/rtc/rtc-twl.c: ensure IRQ is wakeup enabled
Applying: drivers/rtc/rtc-cmos.c: work around bios clearing rtc control
Applying: drivers/rtc/rtc-twl.c: fix rtc_reg_map initialization
Applying: drivers/rtc/rtc-twl.c: cleanup with module_platform_driver() conversion
Applying: drivers/rtc/interface.c: return -EBUSY, not -EACCES when device is busy
Applying: drivers/rtc/rtc-pcf2123.c: replace strict_strtoul() with kstrtoul()
Applying: drivers/rtc/class: convert from Legacy pm ops to dev_pm_ops
Applying: minix: bug widening a binary "not" operation
Applying: nilfs2: implement calculation of free inodes count
Applying: ] nilfs2: use atomic64_t type for inodes_count and blocks_count fields in nilfs_root struct
Applying: fs/fat: use fat_msg() to replace printk() in __fat_fs_error()
Applying: fat: additions to support fat_fallocate
Applying: fat-additions-to-support-fat_fallocate-fix
Applying: Documentation/CodingStyle: allow multiple return statements per function
Applying: docbook: add futexes to kernel-locking docbook
Applying: ptrace/x86: revert "hw_breakpoints: Fix racy access to ptrace breakpoints"
Applying: ptrace/powerpc: revert "hw_breakpoints: Fix racy access to ptrace breakpoints"
Applying: ptrace/arm: revert "hw_breakpoints: Fix racy access to ptrace breakpoints"
Applying: ptrace/sh: revert "hw_breakpoints: Fix racy access to ptrace breakpoints"
Applying: ptrace: revert "Prepare to fix racy accesses on task breakpoints"
Applying: ptrace/x86: simplify the "disable" logic in ptrace_write_dr7()
Applying: ptrace/x86: dont delay "disable" till second pass in ptrace_write_dr7()
Applying: ptrace/x86: introduce ptrace_register_breakpoint()
Applying: ptrace/x86: ptrace_write_dr7() should create bp if !disabled
Applying: ptrace/x86: cleanup ptrace_set_debugreg()
Applying: ptrace: PTRACE_DETACH should do flush_ptrace_hw_breakpoint(child)
Applying: ptrace/x86: flush_ptrace_hw_breakpoint() shoule clear the virtual debug registers
Applying: x86: kill TIF_DEBUG
Applying: ptrace: add ability to get/set signal-blocked mask
Applying: ptrace-add-ability-to-get-set-signal-blocked-mask-fix
Applying: usermodehelper: kill the sub_info->path[0] check
Applying: coredump: format_corename() can leak cn->corename
Applying: coredump: introduce cn_vprintf()
Applying: coredump: cn_vprintf() has no reason to call vsnprintf() twice
Applying: coredump: kill cn_escape(), introduce cn_esc_printf()
Applying: coredump: kill call_count, add core_name_size
Applying: coredump: '% at the end' shouldn't bypass core_uses_pid logic
Applying: coredump: avoid the uninitialized cn->corename if core_pattern is empty
Applying: fs/exec.c:de_thread(): use change_pid() rather than detach_pid/attach_pid
Applying: move-exit_task_namespaces-outside-of-exit_notify-fix
Applying: exit.c: unexport __set_special_pids()
Applying: fs/proc/uptime.c:uptime_proc_show(): use get_monotonic_boottime()
Applying: fork: reorder permissions when violating number of processes limits
Applying: kernel/fork.c:copy_process(): unify CLONE_THREAD-or-thread_group_leader code
Applying: kernel/fork.c:copy_process(): don't add the uninitialized child to thread/task/pid lists
Applying: kernel/fork.c:copy_process(): consolidate the lockless CLONE_THREAD checks
Applying: fs/exec.c: do_execve_common(): use current_user()
Applying: fs/exec.c:de_thread: mt-exec should update ->real_start_time
Applying: /dev/oldmem: Remove the interface
Applying: dev-oldmem-remove-the-interface-fix
Applying: Documentation/kdump/kdump.txt: remove /dev/oldmem description
Applying: mips: remove savemaxmem parameter setup
Applying: powerpc: Remove savemaxmem parameter setup
Applying: ia64: remove setting for saved_max_pfn
Applying: s390: remove setting for saved_max_pfn
Applying: idr: print a stack dump after ida_remove warning
Applying: idr-print-a-stack-dump-after-ida_remove-warning-fix
Applying: ipc/shmc.c: eliminate ugly 80-col tricks
Applying: ipc: move rcu lock out of ipc_addid
Applying: ipc: restore rcu locking in ipc_addid
Applying: ipc: introduce ipc object locking helpers
Applying: ipc: close open coded spin lock calls
Applying: ipc: move locking out of ipcctl_pre_down_nolock
Applying: ipc,msg: shorten critical region in msgctl_down
Applying: ipc,msg: introduce msgctl_nolock
Applying: ipc,msg: introduce lockless functions to obtain the ipc object
Applying: ipc,msg: make msgctl_nolock lockless
Applying: ipc,msg: shorten critical region in msgsnd
Applying: ipc,msg: shorten critical region in msgrcv
Applying: ipc: remove unused functions
Applying: ipc/util.c, ipc_rcu_alloc: cacheline align allocation
Applying: ipc-utilc-ipc_rcu_alloc-cacheline-align-allocation-checkpatch-fixes
Applying: ipc/sem.c: cacheline align the semaphore structures
Applying: ipc/sem: separate wait-for-zero and alter tasks into seperate queues
Applying: ipc/sem.c: scan complex wait-for-zero after undefined updates
Applying: ipc/sem.c: always use only one queue for alter operations
Applying: ipc/sem.c: replace shared sem_otime with per-semaphore value
Applying: ipc/sem.c: rename try_atomic_semop() to perform_atomic_semop(), docu update
Applying: mwave: fix info leak in mwave_ioctl()
Applying: partitions/msdos.c: end-of-line whitespace and semicolon cleanup
Applying: partitions: add aix lvm partition support files
Applying: partitions-add-aix-lvm-partition-support-files-v2
Applying: partitions-add-aix-lvm-partition-support-files-checkpatch-fixes
Applying: partitions-add-aix-lvm-partition-support-files: compile aix.c if configured
Applying: partitions-add-aix-lvm-partition-support-files: add the AIX_PARTITION entry
Applying: partitions/msdos: enumerate also AIX LVM partitions
Applying: rapidio/switches: remove tsi500 driver
Applying: drivers/rapidio/rio-scan.c: make functions static
Applying: kernel/pid.c: move statement
Applying: nbd: remove bogus BUG_ON in NBD_CLEAR_QUE
Applying: Documentation/accounting/getdelays.c: avoid strncpy in accounting tool
Applying: documentation-accounting-getdelaysc-avoid-strncpy-in-accounting-tool-fix
Applying: drivers/parport/share.c: use kzalloc
Applying: drivers/pps/clients/pps-gpio.c: convert to devm_* helpers
Applying: drivers/pps/clients/pps-gpio.c: convert to module_platform_driver
Applying: pps-gpio: add device-tree binding and support
Applying: drivers/memstick/host/jmb38x_ms: convert to module_pci_driver
Applying: drivers/memstick/host/r592.c: convert to module_pci_driver
Applying: drivers/w1/slaves/w1_ds2408.c: add magic sequence to disable P0 test mode
Applying: drivers-w1-slaves-w1_ds2408c-add-magic-sequence-to-disable-p0-test-mode-fix
Applying: relay: fix timer madness
Applying: kernel/resource.c: remove the unneeded assignment in function __find_resource
Applying: reboot: remove -stable friendly PF_THREAD_BOUND define
Applying: reboot: move shutdown/reboot related functions to kernel/reboot.c
Applying: reboot: checkpatch.pl the new kernel/reboot.c file
Applying: reboot: x86: prepare reboot_mode for moving to generic kernel code
Applying: reboot: unicore32: prepare reboot_mode for moving to generic kernel code
Applying: reboot: arm: remove unused restart_mode fields from some arm subarchs
Applying: reboot: arm: prepare reboot_mode for moving to generic kernel code
Applying: reboot: arm: change reboot_mode to use enum reboot_mode
CONFLICT (content): Merge conflict in arch/arm/mach-exynos/common.h
Applying: reboot-arm-change-reboot_mode-to-use-enum-reboot_mode-fix
Applying: reboot: move arch/x86 reboot= handling to generic kernel
CONFLICT (content): Merge conflict in arch/arm/kernel/process.c
Applying: lib: add weak clz/ctz functions
Applying: decompressor: add LZ4 decompressor module
Applying: lib: add support for LZ4-compressed kernel
Applying: kbuild: fix for updated LZ4 tool with the new streaming format
Applying: arm: add support for LZ4-compressed kernel
CONFLICT (content): Merge conflict in arch/arm/boot/compressed/Makefile
Applying: arm: Remove enforced Os flag for LZ4 decompressor
Applying: x86: add support for LZ4-compressed kernel
Applying: x86, doc: Add LZ4 magic number for the new compression
Applying: lib: add lz4 compressor module
Applying: lib-add-lz4-compressor-module-fix
Applying: crypto: add lz4 Cryptographic API
Applying: crypto-add-lz4-cryptographic-api-fix
Applying: scripts/sortextable.c: fix building on non-Linux systems
Applying: staging/lustre/ldlm: convert to shrinkers to count/scan API
Applying: staging/lustre/obdclass: convert lu_object shrinker to count/scan API
Applying: staging/lustre/ptlrpc: convert to new shrinker API
Applying: staging/lustre/libcfs: cleanup linux-mem.h
Applying: staging/lustre: replace num_physpages with totalram_pages
Merging akpm/master (02d2edd staging/lustre: replace num_physpages with totalram_pages)
[master 6cc97e2] Revert "Revert "Revert "staging/lustre: drop CONFIG_BROKEN dependency"""
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* linux-next: Tree for Jun 19
@ 2013-06-19 8:21 ` Stephen Rothwell
0 siblings, 0 replies; 9+ messages in thread
From: Stephen Rothwell @ 2013-06-19 8:21 UTC (permalink / raw)
To: linux-next; +Cc: linux-kernel
[-- Attachment #1: Type: text/plain, Size: 71131 bytes --]
Hi all,
Changes since 20130618:
The arm-mpidr tree gained a conflict against the arm tree.
The ceph tree gained a conflict against Linus' tree.
The mfd tree lost its build failure.
The block tree gained a conflict against the cgroup tree.
The leds tree still had its build failure, so I used the version from
next-20130607.
The driver-core tree gained a conflict against the driver-core.current
tree.
The staging tree gained a build failure for which I disabled some code.
The imx-mxs tree gained a conflict against the arm-soc tree.
The samsung tree gained a conflict against the usb tree.
The akpm tree gained conflicts against the ext4 and arm-current trees. It
also lost a few patches that turned up elsewhere.
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one. You should use "git fetch" as mentioned in the FAQ on the wiki
(see below).
You can see which trees have been included by looking in the Next/Trees
file in the source. There are also quilt-import.log and merge.log files
in the Next directory. Between each merge, the tree was built with
a ppc64_defconfig for powerpc and an allmodconfig for x86_64. After the
final fixups (if any), it is also built with powerpc allnoconfig (32 and
64 bit), ppc44x_defconfig and allyesconfig (minus
CONFIG_PROFILE_ALL_BRANCHES - this fails its final link) and i386, sparc,
sparc64 and arm defconfig. These builds also have
CONFIG_ENABLE_WARN_DEPRECATED, CONFIG_ENABLE_MUST_CHECK and
CONFIG_DEBUG_INFO disabled when necessary.
Below is a summary of the state of the merge.
We are up to 229 trees (counting Linus' and 31 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.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
$ git checkout master
$ git reset --hard stable
Merging origin/master (17858ca Merge tag 'please-pull-fixia64' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux)
Merging fixes/master (8177a9d lseek(fd, n, SEEK_END) does *not* go to eof - n)
Merging kbuild-current/rc-fixes (42a0940 Merge branch 'yem-kconfig-rc-fixes' of git://gitorious.org/linux-kconfig/linux-kconfig into kbuild/rc-fixes)
Merging arc-current/for-curr (ce3f808 ARC: [plat-arcfpga] Fix build breakage when !CONFIG_ARC_SERIAL)
Merging arm-current/fixes (19ab428 ARM: 7759/1: decouple CPU offlining from reboot/shutdown)
Merging m68k-current/for-linus (7d13205 Linux 3.10-rc6)
Merging powerpc-merge/merge (230b303 powerpc: Fix missing/delayed calls to irq_work)
Merging sparc/master (de9c9f8 Merge tag 'remoteproc-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc)
Merging net/master (33be081 ipv6: ndisc: fix ndisc_send_redirect writing to the wrong skb)
Merging ipsec/master (01cb71d net_sched: restore "overhead xxx" handling)
Merging sound-current/for-linus (e32aa85 ALSA: hda - Add models for Dell headset jacks)
Merging pci-current/for-linus (65694c5 x86/PCI: Map PCI setup data with ioremap() so it can be in highmem)
Merging wireless/master (fcb3701 brcmfmac: free primary net_device when brcmf_bus_start() fails)
Merging driver-core.current/driver-core-linus (8759793 firmware loader: fix use-after-free by double abort)
Merging tty.current/tty-linus (7c61c3d tty: Fix transient pty write() EIO)
Merging usb.current/usb-linus (035978b usb: phy: Improve Kconfig help for CONFIG_USB_PHY)
Merging staging.current/staging-linus (7d13205 Linux 3.10-rc6)
Merging char-misc.current/char-misc-linus (7d13205 Linux 3.10-rc6)
Merging input-current/for-linus (150e592 Input: add missing dependencies on CONFIG_HAS_IOMEM)
Merging md-current/for-linus (32f9f57 MD: ignore discard request for hard disks of hybid raid1/raid10 array)
Merging audit-current/for-linus (c158a35 audit: no leading space in audit_log_d_path prefix)
Merging crypto-current/master (fe6510b crypto: aesni_intel - fix accessing of unaligned memory)
Merging ide/master (bf6b438 ide: gayle: use module_platform_driver_probe())
Merging dwmw2/master (5950f08 pcmcia: remove RPX board stuff)
Merging sh-current/sh-fixes-for-linus (4403310 SH: Convert out[bwl] macros to inline functions)
Merging irqdomain-current/irqdomain/merge (d94ea3f irqchip: Return -EPERM for reserved IRQs)
Merging devicetree-current/devicetree/merge (706b78f dtc: ensure #line directives don't consume data from the next line)
Merging spi-current/spi/merge (0d2d0cc spi/davinci: fix module build error)
Merging gpio-current/gpio/merge (e97f9b5 gpio/gpio-ich: fix ichx_gpio_check_available() return what callers expect)
Merging rr-fixes/fixes (6407d75 virtio_console: fix uapi header)
Merging mfd-fixes/master (5649d8f mfd: ab8500-sysctrl: Let sysctrl driver work without pdata)
Merging vfio-fixes/for-linus (9a6aa27 vfio: fix crash on rmmod)
Merging asm-generic/master (fb9de7e xtensa: Use generic asm/mmu.h for nommu)
Merging arc/for-next (21a2299 ARC: [PTE] Fold PTE K/U access flags (MMUv4 preps))
Merging arm/for-next (7e74d1d Merge branch 'devel-stable' into for-next)
Merging arm-mpidr/for-next (3fed6a1 ARM: kernel: implement stack pointer save array through MPIDR hashing)
CONFLICT (content): Merge conflict in arch/arm/kernel/suspend.c
Merging arm-perf/for-next/perf (e4aa937 Linux 3.10-rc3)
Merging davinci/davinci-next (fe0d422 Linux 3.0-rc6)
Merging xilinx/arm-next (64e3fd3 arm: zynq: Add support for pmu)
CONFLICT (content): Merge conflict in drivers/clocksource/tegra20_timer.c
CONFLICT (content): Merge conflict in drivers/clocksource/Makefile
CONFLICT (add/add): Merge conflict in arch/arm/mach-zynq/platsmp.c
CONFLICT (content): Merge conflict in arch/arm/mach-vexpress/v2m.c
CONFLICT (content): Merge conflict in arch/arm/mach-spear/spear13xx.c
CONFLICT (content): Merge conflict in arch/arm/mach-imx/mach-imx6q.c
CONFLICT (content): Merge conflict in arch/arm/mach-highbank/highbank.c
Merging arm64/upstream (63917f0 Merge branch 'kvm-arm64/kvm-for-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into upstream)
CONFLICT (content): Merge conflict in include/uapi/linux/kvm.h
Merging blackfin/blackfin-linus (5ae89ee bfin cache: dcplb map: add 16M dcplb map for BF60x)
Merging c6x/for-linux-next (f934af0 add memory barrier to arch_local_irq_restore)
Merging cris/for-next (32ade6a CRIS: Add kvm_para.h which includes generic file)
Merging hexagon/linux-next (de44443 HEXAGON: Remove non existent reference to GENERIC_KERNEL_EXECVE & GENERIC_KERNEL_THREAD)
Merging ia64/next (09bf4de Merge branch 'pstore' into next)
Merging m68k/for-next (40d1f31 Merge branch 'exotic-arch-fixes' into for-next)
CONFLICT (content): Merge conflict in arch/cris/arch-v32/drivers/Kconfig
Merging m68knommu/for-next (e4aa937 Linux 3.10-rc3)
Merging metag/for-next (1a5719a metag/.gitignore: Extend the *.dtb pattern to match the dtb.S files)
Merging microblaze/next (62bc82a microblaze: Use static inline functions in cacheflush.h)
Merging mips/mips-for-linux-next (aedc598 Merge branch '3.10-fixes' into mips-for-linux-next)
Merging openrisc/for-upstream (6af6095 openrisc: remove HAVE_VIRT_TO_BUS)
Merging parisc/for-next (6c700d7 [PARISC] hpux: Remove obsolete regs parameter from do_execve() in hpux_execve())
Merging parisc-hd/for-next (a2648eb Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs)
Merging powerpc/next (25e33ed Merge tag 'acpi-3.10-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm)
Merging 4xx/next (2074b1d powerpc: Fix irq distribution)
Merging mpc5xxx/next (a4f4124 powerpc/mpc512x: initialize board restart earlier)
Merging galak/next (9e2ecdb powerpc/fsl-booke: add the reg prop for pci bridge device node for T4/B4)
Merging s390/features (461e265 s390/chsc: Use snprintf instead of sprintf)
Merging sh/sh-latest (37284bd Merge branches 'sh/hw-breakpoints' and 'sh/serial-of' into sh-latest)
CONFLICT (content): Merge conflict in arch/sh/kernel/cpu/sh2a/Makefile
Merging sparc-next/master (f8ce1fa Merge tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux)
Merging tile/master (9fc1894 arch/tile: Fix syscall return value passed to tracepoint)
Merging unicore32/unicore32 (c284464 arch/unicore32: remove CONFIG_EXPERIMENTAL)
Merging xtensa/for_next (0756a12 xtensa: tell git to ignore copied zlib source files)
Merging btrfs/next (667e7d9 Btrfs: allow superblock mismatch from older mkfs)
Merging ceph/master (ed80a59 ceph: move inode to proper flushing list when auth MDS changes)
CONFLICT (content): Merge conflict in drivers/block/rbd.c
Merging cifs/for-next (7311ef6 [CIFS] Add some missing SMB3 and SMB3.02 flags)
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 (0df5ed6 eCryptfs: Make extent and scatterlist crypt function parameters similar)
Merging ext3/for_next (e162b2f jbd: use kmem_cache_zalloc instead of kmem_cache_alloc/memset)
Merging ext4/dev (3c99d09 ext3,ext4: don't mess with dir_file->f_pos in htree_dirblock_to_tree())
Merging f2fs/dev (696c018 f2fs: add remount_fs callback support)
Merging fscache/fscache (bbd645c FS-Cache: Don't use spin_is_locked() in assertions)
Merging fuse/for-next (e5c5f05 fuse: fix alignment in short read optimization for async_dio)
Merging gfs2/master (512cbf0 GFS2: fix regression in dir_double_exhash)
Merging jfs/jfs-next (eb8630d jfs: Update jfs_error)
Merging logfs/master (3394661 Fix the call to BUG() caused by no free segment found)
Merging nfs/linux-next (a102b58 Merge branch 'labeled-nfs' into linux-next)
Merging nfsd/nfsd-next (1a9357f nfsd: avoid undefined signed overflow)
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 (7a0d932 fs/9p: xattr: add trusted and security namespaces)
Merging ubifs/linux-next (c1be5a5 Linux 3.9)
Merging xfs/for-next (1ebdf36 xfs: Remove struct xfs_chash from xfs_mount)
Merging vfs/for-next (ac3e3c5 don't bother with deferred freeing of fdtables)
Merging pci/next (df58f46 Merge branch 'pci/jiang-bus-lock-v3' into next)
CONFLICT (content): Merge conflict in include/linux/aer.h
CONFLICT (content): Merge conflict in drivers/pci/probe.c
CONFLICT (content): Merge conflict in drivers/acpi/pci_root.c
Merging hid/for-next (bbb6be8 Merge branch 'for-3.11/wiimote' into for-next)
Merging i2c/i2c/for-next (7a10f47 i2c-pxa: prepare clock before use)
Merging jdelvare-hwmon/master (1aaf6d3 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging hwmon-staging/hwmon-next (4cfda46 hwmon: (ds1621) Update documentation)
Merging v4l-dvb/master (d3fa77a Merge /home/v4l/v4l/patchwork)
Merging kbuild/for-next (2d7d88bd Merge branches 'kbuild/kbuild' and 'kbuild/misc' into kbuild/for-next)
Merging kconfig/for-next (4eae518 localmodconfig: Fix localyesconfig to set to 'y' not 'm')
Merging libata/for-next (5d0ae05 Merge branch 'for-3.11' into for-next)
Merging infiniband/for-next (c9a2433 Merge branches 'iser' and 'qib' into for-next)
Merging pstore/master (bd08ec3 pstore/ram: Restore ecc information block)
Merging pm/linux-next (a913b18 Merge branch 'acpica-next' into linux-next)
Merging idle/next (5c99726b Merge branch 'fspin' into next)
Merging apm/for-next (fb9d78a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm)
Merging cpuidle/cpuidle-next (817c876 Merge branch 'pm-fixes-next' into fixes-next)
CONFLICT (content): Merge conflict in drivers/base/power/qos.c
CONFLICT (content): Merge conflict in drivers/acpi/processor_driver.c
Merging cpupowerutils/master (f166033 cpupower tools: add install target to the debug tools' makefiles)
Merging thermal/next (9d1968f Merge branch 'cpu-package-thermal' of .git into next)
Merging ieee1394/for-next (bcabcfd firewire: remove support of fw_driver.driver.probe and .remove methods)
Merging ubi/linux-next (584d462 UBI: fastmap break out of used PEB search)
Merging dlm/next (86e92ad dlm: disable nagle for SCTP)
Merging swiotlb/linux-next (af51a9f swiotlb: Do not export swiotlb_bounce since there are no external consumers)
Merging scsi/for-next (002edf2 Merge branch 'misc' into for-next)
Merging target-updates/for-next (9185bc5 qla_target: remove qlt_check_fcport_exist)
Merging target-merge/for-next-merge (317ddd2 Linux 3.10-rc5)
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 (755013f Merge branch 'for-linus' into next)
Merging dmaengine/next (41ef2d5 Linux 3.9-rc7)
Merging net-next/master (a267a60 staging/rtl8192u: convert skb->tail into skb_tail_pointer(skb))
CONFLICT (content): Merge conflict in net/batman-adv/bat_iv_ogm.c
CONFLICT (content): Merge conflict in drivers/net/xen-netback/netback.c
CONFLICT (content): Merge conflict in drivers/net/wireless/ath/ath9k/Kconfig
Merging ipsec-next/master (4c4d41f xfrm: add LINUX_MIB_XFRMACQUIREERROR statistic counter)
Merging wireless-next/master (354b75b brcmfmac: add sdio sg list support)
Merging bluetooth/master (cd60aab Bluetooth: Add missing reset_resume dev_pm_ops)
CONFLICT (content): Merge conflict in net/bluetooth/mgmt.c
Merging mtd/master (a637b0d Merge tag 'for-linus-20130509' of git://git.infradead.org/linux-mtd)
Merging l2-mtd/master (449e74c mtd: tests: don't print error messages when out-of-memory)
Merging crypto/master (beca35d hwrng: nomadik - use clk_prepare_enable())
Merging drm/drm-next (2791197 drm/mgag200: Don't do full cleanup if mgag200_device_init fails)
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_sdvo.c
Merging drm-intel/for-linux-next (854c94a drm/i915: remove a superflous semi-colon)
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_sdvo.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_fb.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_display.c
Merging drm-tegra/drm/for-next (726ecef gpu: host1x: Rework CPU syncpoint increment)
Merging sound/for-next (fd678ca ALSA: hda - Use snd_hda_check_power_state() in patch_hdmi.c)
Merging sound-asoc/for-next (84bbc4a Merge remote-tracking branch 'asoc/topic/x86' into asoc-next)
Merging modules/modules-next (06df44e modpost.c: Add .text.unlikely to TEXT_SECTIONS)
Merging virtio/virtio-next (b3087e4 virtio: remove virtqueue_add_buf().)
Merging input/next (e93d85a Input: pxa27x-keypad - make platform data const)
Merging input-mt/for-next (257867d Input: MT - Specify that ABS_MT_SLOT must have a minimum of 0)
Merging cgroup/for-next (a6c1839 Merge branch 'for-3.11' into for-next)
Merging block/for-next (f4d5f94 Merge branch 'for-linus' into for-next)
CONFLICT (content): Merge conflict in include/linux/cgroup.h
Merging device-mapper/master (11531a4 Fix detection of the need to resize the dm thin metadata device.)
Merging embedded/master (4744b43 embedded: fix vc_translate operator precedence)
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 (b9ec274 mmc: tmio: reset the controller after power-up)
Merging kgdb/kgdb-next (6bedf31 kdb: Remove unhandled ssb command)
Merging slab/for-next (c55d728 Merge branch 'slab/next' into for-next)
Merging uclinux/for-next (6dbe51c Linux 3.9-rc1)
Merging md/for-next (52c6ede raid5: make release_stripe lockless)
Merging mfd/master (e578438 mfd: ssbi: Use devm_* and simplify code)
Merging battery/master (e5409cb charger-manager: Add missing newlines, fix a couple of typos, add pr_fmt)
Merging fbdev/for-next (8ea2c86 Merge branch 'fbdev-3.11' of git://gitorious.org/linux-omap-dss2/linux into fbdev/for-next)
CONFLICT (content): Merge conflict in drivers/video/of_display_timing.c
Merging viafb/viafb-next (838ac78 viafb: avoid refresh and mode lookup in set_par)
Merging omap_dss2/for-next (e72b753 fbdev/ps3fb: fix compile warning)
Merging regulator/for-next (5d03353 Merge remote-tracking branch 'regulator/topic/tps62360' into regulator-next)
Merging security/next (1ca0072 Merge branch 'smack-for-3.11' of git://git.gitorious.org/smack-next/kernel into ra-next)
Merging selinux/master (c2d7b24 Merge tag 'v3.4' into 20120409)
Merging lblnet/master (7e27d6e Linux 2.6.35-rc3)
Merging watchdog/master (28b7e09 watchdog: wdrtas: don't use custom version of print_hex_dump)
Merging dwmw2-iommu/master (6491d4d intel-iommu: Free old page tables before creating superpage)
Merging iommu/next (0c4513b Merge branches 'iommu/fixes', 'x86/vt-d', 'x86/amd', 'ppc/pamu', 'core' and 'arm/tegra' into next)
Merging vfio/next (3655b22 Merge tag 'stable/for-linus-3.10-rc3-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen)
Merging osd/linux-next (861d666 exofs: don't leak io_state and pages on read error)
Merging jc_docs/docs-next (5c050fb docs: update the development process document)
Merging trivial/for-next (278cee0 treewide: Fix typo in printk)
CONFLICT (content): Merge conflict in Documentation/networking/netlink_mmap.txt
Merging audit/for-next (dcd6c92 Linux 3.3-rc1)
Merging fsnotify/for-next (1ca39ab inotify: automatically restart syscalls)
Merging edac/linux_next (de4772c edac: sb_edac.c should not require prescence of IMC_DDRIO device)
Merging edac-amd/for-next (aad19e5 EDAC, MCE, AMD: Add an MCE signature for new Fam15h models)
Merging devicetree/devicetree/next (ba166e9 of: remove CONFIG_OF_DEVICE)
Merging dt-rh/for-next (d683b96 Linux 3.10-rc4)
Merging spi/spi/next (00ab539 spi/s3c64xx: let device core setup the default pin configuration)
Merging spi-mb/for-next (7017e5d Merge remote-tracking branch 'spi/topic/xilinx' into spi-next)
Merging tip/auto-latest (e4aa937 Linux 3.10-rc3)
Merging ftrace/for-next (4c69e6e tracepoints: Prevent null probe from being added)
Merging rcu/rcu/next (be77f87 Merge branches 'cbnum.2013.06.10a', 'doc.2013.06.10a', 'fixes.2013.06.10a', 'srcu.2013.06.10a' and 'tiny.2013.06.10a' into HEAD)
Merging cputime/cputime (c3e0ef9 [S390] fix cputime overflow in uptime_proc_show)
Merging uprobes/for-next (0326f5a uprobes/core: Handle breakpoint and singlestep exceptions)
Merging kvm/linux-next (aeb87c3 KVM: s390: Fix epsw instruction decoding)
CONFLICT (content): Merge conflict in arch/s390/include/asm/pgtable.h
Merging kvm-arm/kvm-arm-next (a1b02cb fixup! ARM: KVM: Allow host virt timer irq to be different from guest timer virt irq)
Merging kvm-ppc/kvm-ppc-next (5975a2e KVM: PPC: Book3S: Add API for in-kernel XICS emulation)
Merging oprofile/for-next (f722406 Linux 3.10-rc1)
Merging fw-nohz/nohz/next (74876a9 printk: Wake up klogd using irq_work)
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 (6c63f3c Merge branch 'stable/pvh.v8' into linux-next)
Merging xen-arm/linux-next (3a88558 xen/arm: account for stolen ticks)
Merging percpu/for-next (a424445 percpu-refcount: use RCU-sched insted of normal RCU)
Merging workqueues/for-next (bbe2a23 Merge branch 'for-3.10-fixes' into for-next)
Merging drivers-x86/linux-next (a1ec56e Add support for fan button on Ideapad Z580)
Merging hwpoison/hwpoison (46e387b Merge branch 'hwpoison-hugepages' into hwpoison)
Merging sysctl/master (4e474a0 sysctl: protect poll() in entries that may go away)
Merging regmap/for-next (467c1c5 Merge remote-tracking branch 'regmap/topic/field' into regmap-next)
Merging hsi/for-next (43139a6 HSI: hsi_char: Update ioctl-number.txt)
Merging leds/for-next (2ca3a45 leds: leds-mc13783: Add devicetree support)
$ git reset --hard HEAD^
Merging next-20130607 version of leds
Merging driver-core/driver-core-next (bb07b00 Merge 3.10-rc6 into driver-core-next)
CONFLICT (content): Merge conflict in include/linux/platform_device.h
CONFLICT (content): Merge conflict in drivers/base/memory.c
CONFLICT (content): Merge conflict in drivers/base/firmware_class.c
CONFLICT (content): Merge conflict in drivers/base/cpu.c
Merging tty/tty-next (64e377d tty: Reset itty for other pty)
Merging usb/usb-next (4134126 usb: check usb_hub_to_struct_hub() return value)
Merging usb-gadget/next (b1fd6cb usb: dwc3: omap: Adds dwc3_omap_readl/writel wrappers)
Merging staging/staging-next (d0941b1 Staging: silicom: move more assignments out of if conditions)
CONFLICT (content): Merge conflict in drivers/thermal/ti-soc-thermal/ti-thermal-common.c
CONFLICT (content): Merge conflict in drivers/staging/silicom/bpctl_mod.c
CONFLICT (content): Merge conflict in drivers/staging/serqt_usb2/serqt_usb2.c
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/thermal/ti_soc_thermal.txt
Applying: staging/lustre: fix for invalidatepage() API change
Merging char-misc/char-misc-next (e3a3c3a UIO: fix uio_pdrv_genirq with device tree but no interrupt)
Merging bcon/master (e284f34 netconsole: s/syslogd/cancd/ in documentation)
CONFLICT (content): Merge conflict in drivers/block/Kconfig
Merging tmem/linux-next (8f0d816 Linux 3.7-rc3)
Merging writeback/writeback-for-next (ed84825 Negative (setpoint-dirty) in bdi_position_ratio())
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 (a5d811b pinctrl: add Intel BayTrail GPIO/pinctrl support)
CONFLICT (content): Merge conflict in drivers/net/ethernet/ti/davinci_mdio.c
Merging vhost/linux-next (f722406 Linux 3.10-rc1)
Merging memblock/memblock-kill-early_node_map (7bd0b0f memblock: Reimplement memblock allocation using reverse free area iterator)
Merging remoteproc/for-next (b977785 remoteproc: fix kconfig dependencies for VIRTIO)
Merging rpmsg/for-next (397944d rpmsg: fix kconfig dependencies for VIRTIO)
Merging irqdomain/irqdomain/next (b7ba09c irqdomain: Fix flubbed irq_domain_associate_many refactoring)
CONFLICT (content): Merge conflict in kernel/irq/irqdomain.c
Merging gpio/gpio/next (644c8df gpio: sx150x: convert to use devm_* functions)
Merging gpio-lw/for-next (62ffac1 gpio-sta2x11: Convert to use devm_ioremap_resource)
Merging mailbox/dbx500-prcmu-mailbox (c497eba mailbox: fix invalid use of sizeof in mailbox_msg_send())
Merging arm-soc/for-next (31d0421 Merge branch 'next/cleanup' into for-next)
CONFLICT (content): Merge conflict in drivers/usb/phy/phy-rcar-usb.c
CONFLICT (content): Merge conflict in drivers/tty/serial/xilinx_uartps.c
CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/clock-r8a7778.c
CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/clock-r8a7740.c
Merging bcm2835/for-next (7d13205 Linux 3.10-rc6)
Merging cortex/for-next (6fae9cd ARM: ARMv7-M: implement read_cpuid_ext)
Merging ep93xx/ep93xx-for-next (7ec4429 Merge branch 'ep93xx-fixes' into ep93xx-for-next)
Merging imx-mxs/for-next (01ff97e Merge branch 'imx/dt' into for-next)
CONFLICT (content): Merge conflict in arch/arm/mach-mxs/mach-mxs.c
CONFLICT (content): Merge conflict in arch/arm/Kconfig.debug
Merging ixp4xx/next (19f949f Linux 3.8)
Merging msm/for-next (30c42f2 Merge branch 'msm-clock' into for-next)
Merging mvebu/for-next (50531ed Merge branch 'mvebu/regmap' into for-next)
CONFLICT (content): Merge conflict in arch/arm/boot/dts/kirkwood-6281.dtsi
Merging renesas/next (4e8ee67 Merge branch 'heads/phy-rcar-usb' into next)
CONFLICT (content): Merge conflict in include/uapi/linux/serial_core.h
CONFLICT (content): Merge conflict in include/linux/serial_sci.h
CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/include/mach/r8a7778.h
CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/clock-r8a7778.c
CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/board-bockw.c
Merging samsung/for-next (bc40c11 Merge branch 'v3.11-next/samsung-pwm' into for-next)
CONFLICT (content): Merge conflict in drivers/usb/Kconfig
Merging tegra/for-next (7d13205 Linux 3.10-rc6)
Merging dma-mapping/dma-mapping-next (c1be5a5 Linux 3.9)
Merging pwm/for-next (88b613e pwm: add pca9685 driver)
Merging dma-buf/for-next (844ce9f Merge tag 'mmc-fixes-for-3.10-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc)
Merging userns/for-next (78008c4 proc: Restrict mounting the proc filesystem)
Merging ktest/for-next (df5f7c6 ktest: Reset grub menu cache with different machines)
Merging signal/for-next (20b4fb4 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
Merging clk/clk-next (0457799 clk: gate: add CLK_GATE_HIWORD_MASK)
CONFLICT (content): Merge conflict in drivers/clk/tegra/clk-tegra114.c
Merging random/dev (b980955 random: fix locking dependency with the tasklist_lock)
Merging lzo-update/lzo-update (42b775a lib/lzo: huge LZO decompression speedup on ARM by using unaligned access)
Merging arm64-hugepages/for-next/hugepages (af07484 ARM64: mm: THP support.)
CONFLICT (content): Merge conflict in arch/arm64/include/asm/pgtable.h
CONFLICT (content): Merge conflict in arch/arm64/include/asm/pgtable-hwdef.h
CONFLICT (content): Merge conflict in arch/arm64/Kconfig
Merging scsi-post-merge/merge-base:master (65112dc Merge git://git.samba.org/sfrench/cifs-2.6)
Applying: fix up for fw_load_abort API change
Merging akpm-current/current (17858ca Merge tag 'please-pull-fixia64' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux)
$ git checkout -b akpm remotes/origin/akpm/master
Applying: fput-task_work_add-can-fail-if-the-caller-has-passed-exit_task_work-fix
Applying: metag: fix mm/hugetlb.c build breakage
Applying: include/linux/smp.h:on_each_cpu(): switch back to a macro
Applying: drivers/platform/x86/intel_ips.c: convert to module_pci_driver
Applying: x86: fix trigger_all_cpu_backtrace() implementation
Applying: sound/soc/codecs/si476x.c: don't use 0bNNN
Applying: x86: make 'mem=' option to work for efi platform
Applying: audit: fix mq_open and mq_unlink to add the MQ root as a hidden parent audit_names record
Applying: kernel/auditfilter.c: fixing build warning
Applying: kernel/auditfilter.c: fix leak in audit_add_rule() error path
Applying: drivers/pcmcia/pd6729.c: convert to module_pci_driver
Applying: drivers/pcmcia/yenta_socket.c: convert to module_pci_driver
Applying: drm/fb-helper: don't sleep for screen unblank when an oops is in progress
Applying: drm/cirrus: correct register values for 16bpp
Applying: drm/nouveau: make vga_switcheroo code depend on VGA_SWITCHEROO
Applying: drivers/media/pci/mantis/mantis_cards.c: convert to module_pci_driver
Applying: drivers/media/pci/dm1105/dm1105.c: convert to module_pci_driver
Applying: drivers/media/pci/mantis/hopper_cards.c: convert to module_pci_driver
Applying: drivers/media/pci/pluto2/pluto2.c: convert to module_pci_driver
Applying: drivers/media/pci/pt1/pt1.c: convert to module_pci_driver
Applying: drivers/video/smscufx.c: use NULL instead of 0
Applying: drivers/video/udlfb.c: use NULL instead of 0
Applying: drivers/video/udlfb.c: make local symbol static
Applying: drivers/video/imxfb.c: make local symbols static
Applying: drivers/video/acornfb.c: remove dead code
Applying: cyber2000fb: avoid palette corruption at higher clocks
Applying: fanotify: info leak in copy_event_to_user()
Applying: fanotify: fix races when adding/removing marks
Applying: fanotify: put duplicate code for adding vfsmount/inode marks into an own function
Applying: dnotify: replace dnotify_mark_mutex with mark mutex of dnotify_group
Applying: inotify: fix race when adding a new watch
Applying: fsnotify: update comments concerning locking scheme
Applying: drivers/iommu/msm_iommu_dev.c: fix leak and clean up error paths
Applying: drivers-iommu-msm_iommu_devc-fix-leak-and-clean-up-error-paths-fix
Applying: posix_cpu_timer: consolidate expiry time type
Applying: posix_cpu_timers: consolidate timer list cleanups
Applying: posix_cpu_timers: consolidate expired timers check
Applying: selftests: add basic posix timers selftests
Applying: posix-timers: correctly get dying task time sample in posix_cpu_timer_schedule()
Applying: posix_timers: fix racy timer delta caching on task exit
Applying: kernel/timer.c: fix jiffies wrap behavior of round_jiffies*()
Applying: hrtimer: one more expiry time overflow check in hrtimer_interrupt
Applying: drivers/infiniband/core/cm.c: convert to using idr_alloc_cyclic()
Applying: scripts/setlocalversion on write-protected source tree
Applying: drivers/ide/delkin_cb.c: convert to module_pci_driver
Applying: drivers/mtd/chips/gen_probe.c: refactor call to request_module()
Applying: virtio_balloon: leak_balloon(): only tell host if we got pages deflated
Applying: configfs: use capped length for ->store_attribute()
Applying: drivers/net/ethernet/ibm/ehea/ehea_main.c: add alias entry for portN properties
Applying: mISDN: add support for group membership check
Applying: drivers/atm/he.c: convert to module_pci_driver
Applying: isdn: clean up debug format string usage
Applying: fs/ocfs2/dlm/dlmrecovery.c: remove duplicate declarations
Applying: fs/ocfs2/dlm/dlmrecovery.c:dlm_request_all_locks(): ret should be int instead of enum
Applying: ocfs2: should not use le32_add_cpu to set ocfs2_dinode i_flags
Applying: ocfs2: add missing dlm_put() in dlm_begin_reco_handler()
Applying: ocfs2: remove unecessary variable needs_checkpoint
Applying: ocfs2: fix mutex_unlock and possible memory leak in ocfs2_remove_btree_range
Applying: fs/ocfs2/journal.h: add bits_wanted while calculating credits in ocfs2_calc_extend_credits
Applying: fs/ocfs2/cluster/tcp.c: free sc->sc_page in sc_kref_release()
Applying: softirq: use _RET_IP_
Applying: include/linux/sched.h: don't use task->pid/tgid in same_thread_group/has_group_leader_pid
Applying: lockdep: introduce lock_acquire_exclusive/shared helper macros
Applying: lglock: update lockdep annotations to report recursive local locks
Applying: drivers/scsi/a100u2w.c: convert to module_pci_driver
Applying: drivers/scsi/dc395x.c: convert to module_pci_driver
Applying: drivers/scsi/dmx3191d.c: convert to module_pci_driver
Applying: drivers/scsi/initio.c: convert to module_pci_driver
Applying: drivers/scsi/mvumi.c: convert to module_pci_driver
Applying: drivers/net/irda/donauboe.c: convert to module_pci_driver
Applying: drivers/cdrom/gdrom.c: fix device number leak
Applying: block/compat_ioctl.c: do not leak info to user-space
Applying: drivers/cdrom/cdrom.c: use kzalloc() for failing hardware
Applying: block: do not pass disk names as format strings
Applying: block: restore /proc/partitions to not display non-partitionable removable devices
Applying: fput: turn "list_head delayed_fput_list" into llist_head
Applying: llist: fix/simplify llist_add() and llist_add_batch()
Applying: llist: llist_add() can use llist_add_batch()
Applying: watchdog: trigger all-cpu backtrace when locked up and going to panic
Applying: crypto: sanitize argument for format string
Applying: clear_refs: sanitize accepted commands declaration
Applying: clear_refs: introduce private struct for mm_walk
Applying: pagemap: introduce pagemap_entry_t without pmshift bits
Applying: pagemap-introduce-pagemap_entry_t-without-pmshift-bits-v4
Applying: mm: soft-dirty bits for user memory changes tracking
Applying: soft-dirty: call mmu notifiers when write-protecting ptes
Applying: pagemap: prepare to reuse constant bits with page-shift
Applying: mm, memcg: don't take task_lock in task_in_mem_cgroup
Applying: mm: remove free_area_cache
Applying: mm: remove compressed copy from zram in-memory
Applying: mm-remove-compressed-copy-from-zram-in-memory-fix
Applying: non-swapcache pages in end_swap_bio_read()
Applying: mm-remove-compressed-copy-from-zram-in-memory-fix-2-fix
Applying: swap: add a simple detector for inappropriate swapin readahead
Applying: swap: swapin_nr_pages() can be static
Applying: mm: use vma_pages() to replace (vm_end - vm_start) >> PAGE_SHIFT
Applying: ncpfs: use vma_pages() to replace (vm_end - vm_start) >> PAGE_SHIFT
Applying: uio: use vma_pages() to replace (vm_end - vm_start) >> PAGE_SHIFT
Applying: mm/page_alloc: factor out setting of pcp->high and pcp->batch
Applying: mm/page_alloc: prevent concurrent updaters of pcp ->batch and ->high
Applying: mm/page_alloc: insert memory barriers to allow async update of pcp batch and high
Applying: mm/page_alloc: protect pcp->batch accesses with ACCESS_ONCE
Applying: mm/page_alloc: convert zone_pcp_update() to rely on memory barriers instead of stop_machine()
Applying: mm/page_alloc: when handling percpu_pagelist_fraction, don't unneedly recalulate high
Applying: mm/page_alloc: factor setup_pageset() into pageset_init() and pageset_set_batch()
Applying: mm/page_alloc: relocate comment to be directly above code it refers to.
Applying: mm/page_alloc: factor zone_pageset_init() out of setup_zone_pageset()
Applying: mm/page_alloc: in zone_pcp_update(), uze zone_pageset_init()
Applying: mm/page_alloc: rename setup_pagelist_highmark() to match naming of pageset_set_batch()
Applying: mm/page_alloc: don't re-init pageset in zone_pcp_update()
Applying: mm/thp: use the correct function when updating access flags
Applying: mm/THP: add pmd args to pgtable deposit and withdraw APIs
Applying: mm/THP: withdraw the pgtable after pmdp related operations
Applying: mm/THP: don't use HPAGE_SHIFT in transparent hugepage code
Applying: thp: define HPAGE_PMD_* constants as BUILD_BUG() if !THP
Applying: mm/THP: deposit the transpare huge pgtable before set_pmd
Applying: mm: vmscan: limit the number of pages kswapd reclaims at each priority
Applying: mm: vmscan: obey proportional scanning requirements for kswapd
Applying: mm: vmscan: flatten kswapd priority loop
Applying: mm: vmscan: decide whether to compact the pgdat based on reclaim progress
Applying: mm: vmscan: do not allow kswapd to scan at maximum priority
Applying: mm: vmscan: have kswapd writeback pages based on dirty pages encountered, not priority
Applying: mm: vmscan: block kswapd if it is encountering pages under writeback
Applying: mm-vmscan-block-kswapd-if-it-is-encountering-pages-under-writeback-fix
Applying: mm-vmscan-block-kswapd-if-it-is-encountering-pages-under-writeback-fix-2
Applying: mm: vmscan: check if kswapd should writepage once per pgdat scan
Applying: mm: vmscan: move logic from balance_pgdat() to kswapd_shrink_zone()
Applying: mm: vmscan: stall page reclaim and writeback pages based on dirty/writepage pages encountered
Applying: mm: vmscan: stall page reclaim after a list of pages have been processed
Applying: mm: vmscan: set zone flags before blocking
Applying: mm: vmscan: move direct reclaim wait_iff_congested into shrink_list
Applying: mm: vmscan: treat pages marked for immediate reclaim as zone congestion
Applying: mm: vmscan: take page buffers dirty and locked state into account
Applying: fs: nfs: inform the VM about pages being committed or unstable
Applying: mm: fix comment referring to non-existent size_seqlock, change to span_seqlock
Applying: mmzone: note that node_size_lock should be manipulated via pgdat_resize_lock()
Applying: memory_hotplug: use pgdat_resize_lock() in online_pages()
Applying: memory_hotplug: use pgdat_resize_lock() in __offline_pages()
Applying: memory_hotplug-use-pgdat_resize_lock-in-__offline_pages-fix
Applying: include/linux/mm.h: add PAGE_ALIGNED() helper
Applying: vmcore: clean up read_vmcore()
Applying: vmcore: allocate buffer for ELF headers on page-size alignment
Applying: vmcore-allocate-buffer-for-elf-headers-on-page-size-alignment-fix
Applying: vmcore: treat memory chunks referenced by PT_LOAD program header entries in page-size boundary in vmcore_list
Applying: vmalloc: make find_vm_area check in range
Applying: vmalloc: introduce remap_vmalloc_range_partial
Applying: vmalloc-introduce-remap_vmalloc_range_partial-fix
Applying: vmcore: allocate ELF note segment in the 2nd kernel vmalloc memory
Applying: vmcore-allocate-elf-note-segment-in-the-2nd-kernel-vmalloc-memory-fix
Applying: vmcore: allow user process to remap ELF note segment buffer
Applying: vmcore-allow-user-process-to-remap-elf-note-segment-buffer-fix
Applying: vmcore: calculate vmcore file size from buffer size and total size of vmcore objects
Applying: vmcore: support mmap() on /proc/vmcore
Applying: vmcore-support-mmap-on-proc-vmcore-fix
Applying: vmcore: disable mmap_vmcore() if CONFIG_MMU is not defined
Applying: memcg: update TODO list in Documentation
Applying: mm: add tracepoints for LRU activation and insertions
Applying: mm: pagevec: defer deciding which LRU to add a page to until pagevec drain time
Applying: mm: activate !PageLRU pages on mark_page_accessed if page is on local pagevec
Applying: mm: remove lru parameter from __pagevec_lru_add and remove parts of pagevec API
Applying: mm: remove lru parameter from __lru_cache_add and lru_cache_add_lru
Applying: mm: Clear page active before releasing pages
Applying: mm/page_alloc.c: add additional checking and return value for the 'table->data'
Applying: mm/nommu.c: add additional check for vread() just like vwrite() has done
Applying: mm/memory-failure.c: fix memory leak in successful soft offlining
Applying: mm/memory_hotplug.c: change normal message to use pr_debug
Applying: mm/memory-hotplug: fix lowmem count overflow when offline pages
Applying: mm-memory-hotplug-fix-lowmem-count-overflow-when-offline-pages-fix
Applying: mm/pageblock: remove get/set_pageblock_flags
Applying: mm/hugetlb: remove hugetlb_prefault
Applying: mm/hugetlb: use already existing interface huge_page_shift
Applying: mm: tune vm_committed_as percpu_counter batching size
Applying: mm-tune-vm_committed_as-percpu_counter-batching-size-fix
Applying: swap: discard while swapping only if SWAP_FLAG_DISCARD_PAGES
Applying: swap-discard-while-swapping-only-if-swap_flag_discard_pages-fix
Applying: mm: change signature of free_reserved_area() to fix building warnings
Applying: mm: enhance free_reserved_area() to support poisoning memory with zero
Applying: mm/ARM64: kill poison_init_mem()
Applying: mm/x86: use free_reserved_area() to simplify code
Applying: mm/tile: use common help functions to free reserved pages
Applying: mm: fix some trivial typos in comments
Applying: mm: use managed_pages to calculate default zonelist order
Applying: mm: accurately calculate zone->managed_pages for highmem zones
Applying: mm: use a dedicated lock to protect totalram_pages and zone->managed_pages
Applying: mm-use-a-dedicated-lock-to-protect-totalram_pages-and-zone-managed_pages-fix
Applying: mm: make __free_pages_bootmem() only available at boot time
Applying: mm: correctly update zone->managed_pages
Applying: mm-correctly-update-zone-managed_pages-fix
Applying: mm-correctly-update-zone-managed_pages-fix-fix
Applying: mm-correctly-update-zone-managed_pages-fix-fix-fix
Applying: mm: concentrate modification of totalram_pages into the mm core
Applying: mm: report available pages as "MemTotal" for each NUMA node
Applying: memcg: Kconfig info update
Applying: mm: Fix the TLB range flushed when __tlb_remove_page() runs out of slots
Applying: vmlinux.lds: add comments for global variables and clean up useless declarations
Applying: avr32: normalize global variables exported by vmlinux.lds
Applying: c6x: normalize global variables exported by vmlinux.lds
Applying: h8300: normalize global variables exported by vmlinux.lds
Applying: score: normalize global variables exported by vmlinux.lds
Applying: tile: normalize global variables exported by vmlinux.lds
Applying: UML: normalize global variables exported by vmlinux.lds
Applying: mm: introduce helper function mem_init_print_info() to simplify mem_init()
Applying: mm: use totalram_pages instead of num_physpages at runtime
Applying: mm/hotplug: prepare for removing num_physpages
Applying: mm/alpha: prepare for removing num_physpages and simplify mem_init()
Applying: mm/ARC: prepare for removing num_physpages and simplify mem_init()
Applying: mm/ARM: prepare for removing num_physpages and simplify mem_init()
Applying: mm/ARM64: prepare for removing num_physpages and simplify mem_init()
Applying: mm/AVR32: prepare for removing num_physpages and simplify mem_init()
Applying: mm/blackfin: prepare for removing num_physpages and simplify mem_init()
Applying: mm/c6x: prepare for removing num_physpages and simplify mem_init()
Applying: mm/cris: prepare for removing num_physpages and simplify mem_init()
Applying: mm/frv: prepare for removing num_physpages and simplify mem_init()
Applying: mm/h8300: prepare for removing num_physpages and simplify mem_init()
Applying: mm/hexagon: prepare for removing num_physpages and simplify mem_init()
Applying: mm/IA64: prepare for removing num_physpages and simplify mem_init()
Applying: mm/m32r: prepare for removing num_physpages and simplify mem_init()
Applying: mm/m68k: prepare for removing num_physpages and simplify mem_init()
Applying: mm/metag: prepare for removing num_physpages and simplify mem_init()
Applying: mm/microblaze: prepare for removing num_physpages and simplify mem_init()
Applying: mm, arch: fix two errors in calling mem_init_print_info()
Applying: mm/MIPS: prepare for removing num_physpages and simplify mem_init()
Applying: mm/mn10300: prepare for removing num_physpages and simplify mem_init()
Applying: mm/openrisc: prepare for removing num_physpages and simplify mem_init()
Applying: mm/PARISC: prepare for removing num_physpages and simplify mem_init()
Applying: mm/ppc: prepare for removing num_physpages and simplify mem_init()
Applying: mm/s390: prepare for removing num_physpages and simplify mem_init()
Applying: mm/score: prepare for removing num_physpages and simplify mem_init()
Applying: mm/SH: prepare for removing num_physpages and simplify mem_init()
Applying: mm/SPARC: prepare for removing num_physpages and simplify mem_init()
Applying: mm/tile: prepare for removing num_physpages and simplify mem_init()
Applying: mm/um: prepare for removing num_physpages and simplify mem_init()
Applying: mm/unicore32: prepare for removing num_physpages and simplify mem_init()
Applying: mm/x86: prepare for removing num_physpages and simplify mem_init()
Applying: mm/xtensa: prepare for removing num_physpages and simplify mem_init()
Applying: mm: kill global variable num_physpages
Applying: mm: introduce helper function set_max_mapnr()
Applying: mm/AVR32: prepare for killing free_all_bootmem_node()
Applying: mm/IA64: prepare for killing free_all_bootmem_node()
Applying: mm/m32r: prepare for killing free_all_bootmem_node()
Applying: mm/m68k: prepare for killing free_all_bootmem_node()
Applying: mm/metag: prepare for killing free_all_bootmem_node()
Applying: mm/MIPS: prepare for killing free_all_bootmem_node()
Applying: mm/PARISC: prepare for killing free_all_bootmem_node()
Applying: mm/PPC: prepare for killing free_all_bootmem_node()
Applying: mm/SH: prepare for killing free_all_bootmem_node()
Applying: mm: kill free_all_bootmem_node()
Applying: mm/alpha: unify mem_init() for both UMA and NUMA architectures
Applying: mm/m68k: fix build warning of unused variable
Applying: mm/ALPHA: clean up unused VALID_PAGE()
Applying: mm/ARM: fix stale comment about VALID_PAGE()
Applying: mm/CRIS: clean up unused VALID_PAGE()
Applying: mm/microblaze: clean up unused VALID_PAGE()
Applying: mm/unicore32: fix stale comment about VALID_PAGE()
Applying: sparsemem: add BUILD_BUG_ON when sizeof mem_section is non-power-of-2
Applying: documentation: update address_space_operations
Applying: documentation: document the is_dirty_writeback aops callback
Applying: fs/fs-writeback.c: : make wb_do_writeback() as static
Applying: mm, vmalloc: only call setup_vmalloc_vm() only in __get_vm_area_node()
Applying: mm, vmalloc: call setup_vmalloc_vm() instead of insert_vmalloc_vm()
Applying: mm, vmalloc: remove insert_vmalloc_vm()
Applying: mm, vmalloc: use clamp() to simplify code
Applying: mm: memcontrol: factor out reclaim iterator loading and updating
Applying: fs: bump inode and dentry counters to long
Applying: super: fix calculation of shrinkable objects for small numbers
Applying: dcache: convert dentry_stat.nr_unused to per-cpu counters
Applying: dentry: move to per-sb LRU locks
Applying: dcache: remove dentries from LRU before putting on dispose list
Applying: mm: new shrinker API
Applying: shrinker: convert superblock shrinkers to new API
Applying: shrinker-convert-superblock-shrinkers-to-new-api-fix
Applying: list: add a new LRU list type
Applying: inode: convert inode lru list to generic lru list code.
Applying: dcache: convert to use new lru list infrastructure
Applying: list_lru: per-node list infrastructure
Applying: list_lru: per-node API
Applying: shrinker: add node awareness
Applying: vmscan: per-node deferred work
Applying: fs: convert inode and dentry shrinking to be node aware
Applying: xfs: convert buftarg LRU to generic code
Applying: xfs-convert-buftarg-lru-to-generic-code-fix
Applying: xfs: rework buffer dispose list tracking
Applying: xfs: convert dquot cache lru to list_lru
Applying: xfs-convert-dquot-cache-lru-to-list_lru-fix
Applying: fs: convert fs shrinkers to new scan/count API
CONFLICT (content): Merge conflict in fs/ext4/extents_status.c
Applying: fs-convert-fs-shrinkers-to-new-scan-count-api-fix
CONFLICT (content): Merge conflict in fs/ext4/extents_status.c
Applying: UBIFS: signedness bug in ubifs_shrink_count()
Applying: drivers: convert shrinkers to new count/scan API
Applying: drivers-convert-shrinkers-to-new-count-scan-api-fix
Applying: drivers-convert-shrinkers-to-new-count-scan-api-fix-2
Applying: i915: bail out earlier when shrinker cannot acquire mutex
Applying: shrinker: convert remaining shrinkers to count/scan API
Applying: shrinker-convert-remaining-shrinkers-to-count-scan-api-fix
Applying: hugepage: convert huge zero page shrinker to new shrinker API
Applying: hugepage-convert-huge-zero-page-shrinker-to-new-shrinker-api-fix
Applying: shrinker: Kill old ->shrink API.
Applying: shrinker-kill-old-shrink-api-fix
Applying: list_lru: dynamically adjust node arrays
Applying: mm: mremap: validate input before taking lock
Applying: memcg: clean up memcg->nodeinfo
Applying: mm: invoke oom-killer from remaining unconverted page fault handlers
Applying: mm: remove duplicated call of get_pfn_range_for_nid
Applying: mm-remove-duplicated-call-of-get_pfn_range_for_nid-v2
Applying: mm-remove-duplicated-call-of-get_pfn_range_for_nid-v2-fix
Applying: mm/vmalloc.c: unbreak __vunmap()
Applying: mm/vmalloc.c: remove dead code in vb_alloc
Applying: mm/vmalloc.c: remove unused purge_fragmented_blocks_thiscpu
Applying: mm/vmalloc.c: remove alloc_map from vmap_block
Applying: mm/vmalloc.c: emit the failure message before return
Applying: mm/vmalloc.c: rename VM_UNLIST to VM_UNINITIALIZED
Applying: mm/vmalloc.c: check VM_UNINITIALIZED flag in s_show instead of show_numa_info
Applying: memcg: also test for skip accounting at the page allocation level
Applying: memcg: do not account memory used for cache creation
Applying: include/linux/gfp.h: fix the comment for GFP_ZONE_TABLE
Applying: zbud: add to mm/
Applying: zswap: init under_reclaim
Applying: zswap: add to mm/
Applying: zswap: add documentation
Applying: MAINTAINERS: add zswap and zbud maintainer
Applying: mm/page_alloc.c: remove zone_type argument of build_zonelists_node
Applying: mm: remove unused functions is_{normal_idx, normal, dma32, dma}
Applying: mm/page_alloc.c: remove unlikely() from the current_order test
Applying: vfree: don't schedule free_work() if llist_add() returns false
Applying: mm: remove unused __put_page()
Applying: mm/sparse.c: put clear_hwpoisoned_pages within CONFIG_MEMORY_HOTREMOVE
Applying: include/linux/mmzone.h: cleanups
Applying: mm: memmap_init_zone() performance improvement
Applying: drop_caches: add some documentation and info message
Applying: drivers/usb/gadget/amd5536udc.c: avoid calling dma_pool_create() with NULL dev
Applying: mm/dmapool.c: fix null dev in dma_pool_create()
Applying: mm: add vm event counters for balloon pages compaction
Applying: arch/frv/kernel/traps.c: using vsnprintf() instead of vsprintf()
Applying: arch/frv/kernel/setup.c: use strncmp() instead of memcmp()
Applying: err.h: IS_ERR() can accept __user pointers
Applying: clean up scary strncpy(dst, src, strlen(src)) uses
Applying: clean-up-scary-strncpydst-src-strlensrc-uses-fix
Applying: drivers: avoid format string in dev_set_name
Applying: drivers: avoid format strings in names passed to alloc_workqueue()
Applying: drivers: avoid parsing names as kthread_run() format strings
Applying: dump_stack: serialize the output from dump_stack()
Applying: dump_stack-serialize-the-output-from-dump_stack-fix
Applying: panic: add cpu/pid to warn_slowpath_common in WARNING printk()s
Applying: panic-add-cpu-pid-to-warn_slowpath_common-in-warning-printks-fix
Applying: kernel/sys.c: sys_reboot(): fix malformed panic message
Applying: kernel/sys.c:do_sysinfo(): use get_monotonic_boottime()
Applying: dmi: add support for exact DMI matches in addition to substring matching
Applying: drm/i915: quirk away phantom LVDS on Intel's D510MO mainboard
Applying: drm/i915: quirk away phantom LVDS on Intel's D525MW mainboard
Applying: smp: Give WARN()ing when calling smp_call_function_many()/single() in serving irq
Applying: drivers/misc/sgi-gru/grufault.c: fix a sanity test in gru_set_context_option()
Applying: MAINTAINERS: fix tape driver file mappings
Applying: backlight: atmel-pwm-bl: remove unnecessary platform_set_drvdata()
Applying: backlight: ep93xx: remove unnecessary platform_set_drvdata()
Applying: backlight: lp8788: remove unnecessary platform_set_drvdata()
Applying: backlight: pcf50633: remove unnecessary platform_set_drvdata()
Applying: backlight: add devm_backlight_device_{register,unregister}()
Applying: lcd: add devm_lcd_device_{register,unregister}()
Applying: MAINTAINERS: add Backlight subsystem co-maintainer
Applying: backlight: convert from legacy pm ops to dev_pm_ops
Applying: backlight: add CONFIG_PM_SLEEP to suspend/resume functions
Applying: rbtree: remove unneeded include
Applying: rbtree-remove-unneeded-include-fix
Applying: radeon: remove redundant __list_for_each definition from mkregtable.c
Applying: ipw2200: convert __list_for_each usage to list_for_each
Applying: sctp: convert __list_for_each use to list_for_each
Applying: list: remove __list_for_each()
Applying: checkpatch: change CamelCase test and make it --strict
Applying: checkpatch: warn when using gcc's binary constant ("0b") extension
Applying: checkpatch: add --strict preference for p = kmalloc(sizeof(*p)...
Applying: checkpatch: remove quote from CamelCase test
Applying: checkpatch: improve network block comment test and message
Applying: checkpatch: warn when networking block comment lines don't start with *
Applying: checkpatch: warn on comparisons to jiffies
Applying: checkpatch: warn on comparisons to get_jiffies_64()
Applying: checkpatch: reduce false positive rate of "complex macros"
Applying: checkpatch: add a placeholder to check blank lines before declarations
Applying: checkpatch: don't warn on blank lines before/after braces as often
Applying: checkpatch: add a --strict test for comparison to true/false
Applying: checkpatch: improve "no space after cast" test
Applying: checkpatch: create an EXPERIMENTAL --fix option to correct patches
Applying: checkpatch: move test for space before semicolon after operator spacing
Applying: checkpatch: ignore SI unit CamelCase variants like "_uV"
Applying: binfmt_elf.c: use get_random_int() to fix entropy depleting
Applying: init: remove permanent string buffer from do_one_initcall()
Applying: insert missing space in printk line of root_delay
Applying: kprobes: handle empty/invalid input to debugfs "enabled" file
Applying: autofs4: allow autofs to work outside the initial PID namespace
Applying: autofs4: translate pids to the right namespace for the daemon
Applying: rtc: rtc-88pm80x: remove unnecessary platform_set_drvdata()
Applying: drivers/rtc/rtc-v3020.c: remove redundant goto
Applying: drivers/rtc/interface.c: fix checkpatch errors
Applying: drivers/rtc/rtc-at32ap700x.c: fix checkpatch error
Applying: drivers/rtc/rtc-at91rm9200.c: include <linux/uaccess.h>
Applying: drivers/rtc/rtc-cmos.c: fix whitespace related errors
Applying: drivers/rtc/rtc-davinci.c: fix whitespace warning
Applying: drivers/rtc/rtc-ds1305.c: add missing braces around sizeof
Applying: drivers/rtc/rtc-ds1374.c: fix spacing related issues
Applying: drivers/rtc/rtc-ds1511.c: fix issues related to spaces and braces
Applying: drivers/rtc/rtc-ds3234.c: fix whitespace issue
Applying: drivers/rtc/rtc-fm3130.c: fix whitespace related issue
Applying: drivers/rtc/rtc-m41t80.c: fix spacing related issue
Applying: drivers/rtc/rtc-max6902.c: remove unwanted spaces
Applying: drivers/rtc/rtc-max77686.c: remove space before semicolon
Applying: drivers/rtc/rtc-max8997.c: remove space before semicolon
Applying: drivers/rtc/rtc-mpc5121.c: remove space before tab
Applying: drivers/rtc/rtc-msm6242.c: use pr_warn
Applying: drivers/rtc/rtc-mxc.c: fix checkpatch error
Applying: drivers/rtc/rtc-omap.c: include <linux/io.h> instead of <asm/io.h>
Applying: drivers/rtc/rtc-pcf2123.c: remove space before tabs
Applying: drivers/rtc/rtc-pcf8583.c: move assignment outside if condition
Applying: drivers/rtc/rtc-rs5c313.c: include <linux/io.h> instead of <asm/io.h>
Applying: drivers/rtc/rtc-rs5c313.c: fix spacing related issues
Applying: drivers/rtc/rtc-v3020.c: fix spacing issues
Applying: drivers/rtc/rtc-vr41xx.c: fix spacing issues
Applying: drivers/rtc/rtc-x1205.c: fix checkpatch issues
Applying: rtc: rtc-88pm860x: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-ab3100: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-ab8500: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-at32ap700x: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-at91rm9200: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-at91sam9: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-au1xxx: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-bfin: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-bq4802: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-coh901331: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-da9052: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-da9055: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-davinci: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-dm355evm: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-ds1302: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-ep93xx: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-jz4740: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-lp8788: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-lpc32xx: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-ls1x: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-m48t59: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-max8925: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-max8998: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-mc13xxx: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-msm6242: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-mxc: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-nuc900: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-pcap: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-pm8xxx: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-s3c: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-sa1100: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-sh: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-spear: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-stmp3xxx: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-twl: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-vr41xx: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-vt8500: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-m48t86: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-puv3: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-rp5c01: remove unnecessary platform_set_drvdata()
Applying: rtc: rtc-tile: remove unnecessary platform_set_drvdata()
Applying: drivers/rtc/rtc-rv3029c2.c: fix disabling AIE irq
Applying: drivers/rtc/rtc-m48t86.c: remove empty function
Applying: drivers/rtc/rtc-tile.c: remove empty function
Applying: drivers/rtc/rtc-nuc900.c: remove empty function
Applying: drivers/rtc/rtc-msm6242.c: remove empty function
Applying: drivers/rtc/rtc-max8998.c: remove empty function
Applying: drivers/rtc/rtc-max8925.c: remove empty function
Applying: drivers/rtc/rtc-ls1x.c: remove empty function
Applying: drivers/rtc/rtc-lp8788.c: remove empty function
Applying: drivers/rtc/rtc-ds1302.c: remove empty function
Applying: drivers/rtc/rtc-dm355evm.c: remove empty function
Applying: drivers/rtc/rtc-da9055.c: remove empty function
Applying: drivers/rtc/rtc-da9052.c: remove empty function
Applying: drivers/rtc/rtc-bq4802.c: remove empty function
Applying: drivers/rtc/rtc-au1xxx.c: remove empty function
Applying: drivers/rtc/rtc-ab3100.c: remove empty function
Applying: rtc: rtc-hid-sensor-time: allow full years (16bit) in HID reports
Applying: rtc: rtc-hid-sensor-time: allow 16 and 32 bit values for all attributes.
Applying: rtc: add ability to push out an existing wakealarm using sysfs
Applying: drivers/rtc/rtc-vr41xx.c: fix error return code in rtc_probe()
Applying: rtc: rtc-ds1307: use devm_*() functions
Applying: rtc: rtc-jz4740: use devm_*() functions
Applying: rtc: rtc-mpc5121: use devm_*() functions
Applying: rtc: rtc-m48t59: use devm_*() functions
Applying: rtc: rtc-pm8xxx: use devm_*() functions
Applying: rtc: rtc-pxa: use devm_*() functions
Applying: rtc: rtc-rx8025: use devm_*() functions
Applying: rtc: rtc-sh: use devm_*() functions
Applying: rtc: rtc-coh901331: use platform_{get,set}_drvdata()
Applying: rtc: rtc-rc5t583: use platform_{get,set}_drvdata()
Applying: drivers/rtc/rtc-bq32k.c: remove empty function
Applying: drivers/rtc/rtc-ds1216.c: remove empty function
Applying: drivers/rtc/rtc-ds1286.c: remove empty function
Applying: drivers/rtc/rtc-ds1672.c: remove empty function
Applying: drivers/rtc/rtc-ds3234.c: remove empty function
Applying: drivers/rtc/rtc-ds1390.c: remove empty function
Applying: drivers/rtc/rtc-efi.c: remove empty function
Applying: drivers/rtc/rtc-em3027.c: remove empty function
Applying: drivers/rtc/rtc-fm3130.c: remove empty function
Applying: drivers/rtc/rtc-isl12022.c: remove empty function
Applying: drivers/rtc/rtc-m41t93.c: remove empty function
Applying: drivers/rtc/rtc-m48t35.c: remove empty function
Applying: drivers/rtc/rtc-generic.c: remove empty function
Applying: drivers/rtc/rtc-m41t94.c: remove empty function
Applying: drivers/rtc/rtc-max6902.c: remove empty function
Applying: drivers/rtc/rtc-max6900.c: remove empty function
Applying: drivers/rtc/rtc-max8907.c: remove empty function
Applying: drivers/rtc/rtc-max77686.c: remove empty function
Applying: drivers/rtc/rtc-max8997.c: remove empty function
Applying: drivers/rtc/rtc-pcf8523.c: remove empty function
Applying: drivers/rtc/rtc-pcf8563.c: remove empty function
Applying: drivers/rtc/rtc-pcf8583.c: remove empty function
Applying: drivers/rtc/rtc-ps3.c: remove empty function
Applying: drivers/rtc/rtc-rs5c313.c: remove empty function
Applying: drivers/rtc/rtc-rv3029c2.c: remove empty function
Applying: drivers/rtc/rtc-rx4581.c: remove empty function
Applying: drivers/rtc/rtc-rs5c348.c: remove empty function
Applying: drivers/rtc/rtc-rx8581.c: remove empty function
Applying: drivers/rtc/rtc-snvs.c: remove empty function
Applying: drivers/rtc/rtc-starfire.c: remove empty function
Applying: drivers/rtc/rtc-sun4v.c: remove empty function
Applying: drivers/rtc/rtc-tps80031.c: remove empty function
Applying: drivers/rtc/rtc-wm831x.c: remove empty function
Applying: drivers/rtc/rtc-ab8500.c: add second resolution to rtc driver
Applying: drivers/rtc/rtc-ds1302.c: handle write protection
Applying: drivers/rtc/rtc-mpc5121.c: use platform_{get,set}_drvdata()
Applying: drivers/rtc/rtc-da9052.c: use PTR_RET()
Applying: drivers/rtc/rtc-isl12022.c: use PTR_RET()
Applying: drivers/rtc/rtc-m48t35.c: use PTR_RET()
Applying: drivers/rtc/rtc-pcf8563.c: use PTR_RET()
Applying: drivers/rtc/rtc-pcf8583.c: use PTR_RET()
Applying: drivers/rtc/rtc-twl.c: ensure IRQ is wakeup enabled
Applying: drivers/rtc/rtc-cmos.c: work around bios clearing rtc control
Applying: drivers/rtc/rtc-twl.c: fix rtc_reg_map initialization
Applying: drivers/rtc/rtc-twl.c: cleanup with module_platform_driver() conversion
Applying: drivers/rtc/interface.c: return -EBUSY, not -EACCES when device is busy
Applying: drivers/rtc/rtc-pcf2123.c: replace strict_strtoul() with kstrtoul()
Applying: drivers/rtc/class: convert from Legacy pm ops to dev_pm_ops
Applying: minix: bug widening a binary "not" operation
Applying: nilfs2: implement calculation of free inodes count
Applying: ] nilfs2: use atomic64_t type for inodes_count and blocks_count fields in nilfs_root struct
Applying: fs/fat: use fat_msg() to replace printk() in __fat_fs_error()
Applying: fat: additions to support fat_fallocate
Applying: fat-additions-to-support-fat_fallocate-fix
Applying: Documentation/CodingStyle: allow multiple return statements per function
Applying: docbook: add futexes to kernel-locking docbook
Applying: ptrace/x86: revert "hw_breakpoints: Fix racy access to ptrace breakpoints"
Applying: ptrace/powerpc: revert "hw_breakpoints: Fix racy access to ptrace breakpoints"
Applying: ptrace/arm: revert "hw_breakpoints: Fix racy access to ptrace breakpoints"
Applying: ptrace/sh: revert "hw_breakpoints: Fix racy access to ptrace breakpoints"
Applying: ptrace: revert "Prepare to fix racy accesses on task breakpoints"
Applying: ptrace/x86: simplify the "disable" logic in ptrace_write_dr7()
Applying: ptrace/x86: dont delay "disable" till second pass in ptrace_write_dr7()
Applying: ptrace/x86: introduce ptrace_register_breakpoint()
Applying: ptrace/x86: ptrace_write_dr7() should create bp if !disabled
Applying: ptrace/x86: cleanup ptrace_set_debugreg()
Applying: ptrace: PTRACE_DETACH should do flush_ptrace_hw_breakpoint(child)
Applying: ptrace/x86: flush_ptrace_hw_breakpoint() shoule clear the virtual debug registers
Applying: x86: kill TIF_DEBUG
Applying: ptrace: add ability to get/set signal-blocked mask
Applying: ptrace-add-ability-to-get-set-signal-blocked-mask-fix
Applying: usermodehelper: kill the sub_info->path[0] check
Applying: coredump: format_corename() can leak cn->corename
Applying: coredump: introduce cn_vprintf()
Applying: coredump: cn_vprintf() has no reason to call vsnprintf() twice
Applying: coredump: kill cn_escape(), introduce cn_esc_printf()
Applying: coredump: kill call_count, add core_name_size
Applying: coredump: '% at the end' shouldn't bypass core_uses_pid logic
Applying: coredump: avoid the uninitialized cn->corename if core_pattern is empty
Applying: fs/exec.c:de_thread(): use change_pid() rather than detach_pid/attach_pid
Applying: move-exit_task_namespaces-outside-of-exit_notify-fix
Applying: exit.c: unexport __set_special_pids()
Applying: fs/proc/uptime.c:uptime_proc_show(): use get_monotonic_boottime()
Applying: fork: reorder permissions when violating number of processes limits
Applying: kernel/fork.c:copy_process(): unify CLONE_THREAD-or-thread_group_leader code
Applying: kernel/fork.c:copy_process(): don't add the uninitialized child to thread/task/pid lists
Applying: kernel/fork.c:copy_process(): consolidate the lockless CLONE_THREAD checks
Applying: fs/exec.c: do_execve_common(): use current_user()
Applying: fs/exec.c:de_thread: mt-exec should update ->real_start_time
Applying: /dev/oldmem: Remove the interface
Applying: dev-oldmem-remove-the-interface-fix
Applying: Documentation/kdump/kdump.txt: remove /dev/oldmem description
Applying: mips: remove savemaxmem parameter setup
Applying: powerpc: Remove savemaxmem parameter setup
Applying: ia64: remove setting for saved_max_pfn
Applying: s390: remove setting for saved_max_pfn
Applying: idr: print a stack dump after ida_remove warning
Applying: idr-print-a-stack-dump-after-ida_remove-warning-fix
Applying: ipc/shmc.c: eliminate ugly 80-col tricks
Applying: ipc: move rcu lock out of ipc_addid
Applying: ipc: restore rcu locking in ipc_addid
Applying: ipc: introduce ipc object locking helpers
Applying: ipc: close open coded spin lock calls
Applying: ipc: move locking out of ipcctl_pre_down_nolock
Applying: ipc,msg: shorten critical region in msgctl_down
Applying: ipc,msg: introduce msgctl_nolock
Applying: ipc,msg: introduce lockless functions to obtain the ipc object
Applying: ipc,msg: make msgctl_nolock lockless
Applying: ipc,msg: shorten critical region in msgsnd
Applying: ipc,msg: shorten critical region in msgrcv
Applying: ipc: remove unused functions
Applying: ipc/util.c, ipc_rcu_alloc: cacheline align allocation
Applying: ipc-utilc-ipc_rcu_alloc-cacheline-align-allocation-checkpatch-fixes
Applying: ipc/sem.c: cacheline align the semaphore structures
Applying: ipc/sem: separate wait-for-zero and alter tasks into seperate queues
Applying: ipc/sem.c: scan complex wait-for-zero after undefined updates
Applying: ipc/sem.c: always use only one queue for alter operations
Applying: ipc/sem.c: replace shared sem_otime with per-semaphore value
Applying: ipc/sem.c: rename try_atomic_semop() to perform_atomic_semop(), docu update
Applying: mwave: fix info leak in mwave_ioctl()
Applying: partitions/msdos.c: end-of-line whitespace and semicolon cleanup
Applying: partitions: add aix lvm partition support files
Applying: partitions-add-aix-lvm-partition-support-files-v2
Applying: partitions-add-aix-lvm-partition-support-files-checkpatch-fixes
Applying: partitions-add-aix-lvm-partition-support-files: compile aix.c if configured
Applying: partitions-add-aix-lvm-partition-support-files: add the AIX_PARTITION entry
Applying: partitions/msdos: enumerate also AIX LVM partitions
Applying: rapidio/switches: remove tsi500 driver
Applying: drivers/rapidio/rio-scan.c: make functions static
Applying: kernel/pid.c: move statement
Applying: nbd: remove bogus BUG_ON in NBD_CLEAR_QUE
Applying: Documentation/accounting/getdelays.c: avoid strncpy in accounting tool
Applying: documentation-accounting-getdelaysc-avoid-strncpy-in-accounting-tool-fix
Applying: drivers/parport/share.c: use kzalloc
Applying: drivers/pps/clients/pps-gpio.c: convert to devm_* helpers
Applying: drivers/pps/clients/pps-gpio.c: convert to module_platform_driver
Applying: pps-gpio: add device-tree binding and support
Applying: drivers/memstick/host/jmb38x_ms: convert to module_pci_driver
Applying: drivers/memstick/host/r592.c: convert to module_pci_driver
Applying: drivers/w1/slaves/w1_ds2408.c: add magic sequence to disable P0 test mode
Applying: drivers-w1-slaves-w1_ds2408c-add-magic-sequence-to-disable-p0-test-mode-fix
Applying: relay: fix timer madness
Applying: kernel/resource.c: remove the unneeded assignment in function __find_resource
Applying: reboot: remove -stable friendly PF_THREAD_BOUND define
Applying: reboot: move shutdown/reboot related functions to kernel/reboot.c
Applying: reboot: checkpatch.pl the new kernel/reboot.c file
Applying: reboot: x86: prepare reboot_mode for moving to generic kernel code
Applying: reboot: unicore32: prepare reboot_mode for moving to generic kernel code
Applying: reboot: arm: remove unused restart_mode fields from some arm subarchs
Applying: reboot: arm: prepare reboot_mode for moving to generic kernel code
Applying: reboot: arm: change reboot_mode to use enum reboot_mode
CONFLICT (content): Merge conflict in arch/arm/mach-exynos/common.h
Applying: reboot-arm-change-reboot_mode-to-use-enum-reboot_mode-fix
Applying: reboot: move arch/x86 reboot= handling to generic kernel
CONFLICT (content): Merge conflict in arch/arm/kernel/process.c
Applying: lib: add weak clz/ctz functions
Applying: decompressor: add LZ4 decompressor module
Applying: lib: add support for LZ4-compressed kernel
Applying: kbuild: fix for updated LZ4 tool with the new streaming format
Applying: arm: add support for LZ4-compressed kernel
CONFLICT (content): Merge conflict in arch/arm/boot/compressed/Makefile
Applying: arm: Remove enforced Os flag for LZ4 decompressor
Applying: x86: add support for LZ4-compressed kernel
Applying: x86, doc: Add LZ4 magic number for the new compression
Applying: lib: add lz4 compressor module
Applying: lib-add-lz4-compressor-module-fix
Applying: crypto: add lz4 Cryptographic API
Applying: crypto-add-lz4-cryptographic-api-fix
Applying: scripts/sortextable.c: fix building on non-Linux systems
Applying: staging/lustre/ldlm: convert to shrinkers to count/scan API
Applying: staging/lustre/obdclass: convert lu_object shrinker to count/scan API
Applying: staging/lustre/ptlrpc: convert to new shrinker API
Applying: staging/lustre/libcfs: cleanup linux-mem.h
Applying: staging/lustre: replace num_physpages with totalram_pages
Merging akpm/master (02d2edd staging/lustre: replace num_physpages with totalram_pages)
[master 6cc97e2] Revert "Revert "Revert "staging/lustre: drop CONFIG_BROKEN dependency"""
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* linux-next: Tree for Jun 19
@ 2012-06-19 5:05 Stephen Rothwell
0 siblings, 0 replies; 9+ messages in thread
From: Stephen Rothwell @ 2012-06-19 5:05 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 24879 bytes --]
Hi all,
Changes since 20120618:
My fixes tree is empty again.
The pci tree gained a conflict against Linus' tree.
The v4l-dvb tree gained a conflict against Linus' tree.
The battery tree gained a build failure for which I applied a patch.
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one. You should use "git fetch" as mentioned in the FAQ on the wiki
(see below).
You can see which trees have been included by looking in the Next/Trees
file in the source. There are also quilt-import.log and merge.log files
in the Next directory. Between each merge, the tree was built with
a ppc64_defconfig for powerpc and an allmodconfig for x86_64. After the
final fixups (if any), it is also built with powerpc allnoconfig (32 and
64 bit), ppc44x_defconfig and allyesconfig (minus
CONFIG_PROFILE_ALL_BRANCHES - this fails its final link) and i386, sparc
and sparc64 defconfig. These builds also have
CONFIG_ENABLE_WARN_DEPRECATED, CONFIG_ENABLE_MUST_CHECK and
CONFIG_DEBUG_INFO disabled when necessary.
Below is a summary of the state of the merge.
We are up to 189 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.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
$ git checkout master
$ git reset --hard stable
Merging origin/master (9023a40 Merge tag 'mmc-fixes-for-3.5-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc)
Merging fixes/master (9023a40 Merge tag 'mmc-fixes-for-3.5-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc)
Merging kbuild-current/rc-fixes (464076b Makefile: Do not call cc-option before including the arch's Makefile)
Merging arm-current/fixes (10aa5a3 SPI: fix over-eager devm_xxx() conversion)
Merging m68k-current/for-linus (d8ce726 m68k: Use generic strncpy_from_user(), strlen_user(), and strnlen_user())
Merging powerpc-merge/merge (7c0482e powerpc/irq: Fix another case of lazy IRQ state getting out of sync)
Merging sparc/master (39a50b4 Merge branch 'hfsplus')
Merging net/master (8cfe523 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem)
Merging sound-current/for-linus (0b1d8e0 ALSA: 6fire: use NULL instead of 0 for pointer assignment)
Merging pci-current/for-linus (314489b Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc)
Merging wireless/master (bcb7ad7 ath9k: Fix softlockup in AR9485)
Merging driver-core.current/driver-core-linus (96c9f05 extcon: max8997: Add missing kfree for info->edev in max8997_muic_remove())
Merging tty.current/tty-linus (78d80c5 serial/amba-pl011: move custom pin control to driver)
Merging usb.current/usb-linus (485802a Linux 3.5-rc3)
Merging staging.current/staging-linus (3026b0e staging: r8712u: Add new USB IDs)
Merging char-misc.current/char-misc-linus (49fbd3f misc: mei: set WDIOF_ALARMONLY on mei watchdog)
Merging input-current/for-linus (2177905 Input: fix input.h kernel-doc warning)
Merging md-current/for-linus (aba336b md: raid1/raid10: fix problem with merge_bvec_fn)
Merging audit-current/for-linus (c158a35 audit: no leading space in audit_log_d_path prefix)
Merging crypto-current/master (c475c06 hwrng: atmel-rng - fix data valid check)
Merging ide/master (39a50b4 Merge branch 'hfsplus')
Merging dwmw2/master (244dc4e Merge git://git.infradead.org/users/dwmw2/random-2.6)
Merging sh-current/sh-fixes-for-linus (380622e Merge branches 'sh/urgent', 'sh/core', 'sh/clockevents', 'sh/asm-generic' and 'sh/trivial' into sh-fixes-for-linus)
Merging irqdomain-current/irqdomain/merge (15e06bf irqdomain: Fix debugfs formatting)
Merging devicetree-current/devicetree/merge (4e8383b of: release node fix for of_parse_phandle_with_args)
Merging spi-current/spi/merge (d1c185b of/spi: Fix SPI module loading by using proper "spi:" modalias prefixes.)
Merging gpio-current/gpio/merge (96b7064 gpio/tca6424: merge I2C transactions, remove cast)
Merging arm/for-next (4d0d790 Merge branches 'fixes' and 'misc' into for-next)
Merging arm-perf/for-next/perf (dee8c1b ARM: perf: remove arm_perf_pmu_ids global enumeration)
Merging davinci/davinci-next (fe0d422 Linux 3.0-rc6)
Merging samsung/next-samsung (9edb240 ARM: H1940/RX1950: Change default LED triggers)
Merging xilinx/arm-next (b85a3ef ARM: Xilinx: Adding Xilinx board support)
Merging blackfin/for-linus (672552a blackfin: fix build after add bf60x mach/pm.h)
Merging c6x/for-linux-next (8ff98b9 C6X: remove unused config items)
Merging cris/for-next (7b91747 cris: Remove old legacy "-traditional" flag from arch-v10/lib/Makefile)
Merging hexagon/linux-next (5042ab9 various Kconfig cleanup and old platform build code removal)
Merging ia64/next (f28fa72 [IA64] Port OOM changes to ia64_do_page_fault)
Merging m68k/for-next (4fa0cff m68knommu: Allow ColdFire CPUs to use unaligned accesses)
Merging m68knommu/for-next (faf6f71 m68knommu: Add clk definitions for m532x.)
Merging microblaze/next (a01ee16 Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd)
Merging mips/mips-for-linux-next (bdab8b5 Merge branches 'next/cavium', 'next/jz4740', 'next/lantiq' and 'next/netlogic' into mips-for-linux-next)
Merging openrisc/for-upstream (207e715 openrisc: use scratch regs in atomic syscall)
Merging parisc/for-next (4c01acc [PARISC] fix code to find libgcc)
Merging powerpc/next (2074b1d powerpc: Fix irq distribution)
Merging 4xx/next (2074b1d powerpc: Fix irq distribution)
Merging mpc5xxx/next (f8d5842 powerpc: Option FB_FSL_DIU is not really optional for mpc512x)
Merging galak/next (fa1b42b powerpc/qe: Update the SNUM table for MPC8569 Rev2.0)
Merging s390/features (fbe7656 s390/smp: make absolute lowcore / cpu restart parameter accesses more robust)
Merging sh/sh-latest (af68d8f Merge branch 'sh/genirq' into sh-latest)
Merging sparc-next/master (31a6710 Fix blocking allocations called very early during bootup)
Merging tile/master (7a9349b bounce: allow use of bounce pool via config option)
Merging unicore32/unicore32 (e4baa56 UniCore32-bugfix: Remove definitions in asm/bug.h to solve difference between native and cross compiler)
Merging ceph/master (9a64e8e Merge tag 'v3.5-rc1')
Merging cifs/for-next (5f7f1ae cifs: fix parsing of password mount option)
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 (d0ecfce eCryptfs: Initialize empty lower files when opening them)
Merging ext3/for_next (0324876 ext2: trivial fix to comment for ext2_free_blocks)
Merging ext4/dev (b22b1f1 ext4: don't set i_flags in EXT4_IOC_SETFLAGS)
Merging fuse/for-next (203627b fuse: fix blksize calculation)
Merging gfs2/master (666d1d8 GFS2: Combine functions get_local_rgrp and gfs2_inplace_reserve)
Merging logfs/master (cd8bfa9 logfs: initialize the number of iovecs in bio)
Merging nfs/linux-next (f617a21 Define ENONAMESERVICE and ENAMEUNKNOWN to indicate name service errors)
Merging nfsd/nfsd-next (bc2df47 nfsd4: BUG_ON(!is_spin_locked()) no good on UP kernels)
Merging ocfs2/linux-next (9392557 ocfs2: avoid unaligned access to dqc_bitmap)
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 (1cfb727 UBIFS: fix assertion)
Merging xfs/for-next (51c8422 xfs: fix typo in comment of xfs_dinode_t.)
Merging vfs/for-next (2753683 debugfs: get rid of useless arguments to debugfs_{mkdir,symlink})
Merging pci/next (140217a Merge branch 'topic/jan-intx-masking' into next)
CONFLICT (content): Merge conflict in drivers/pci/quirks.c
Merging hid/for-next (f79185b Merge branch 'uhid' into for-next)
Merging quilt/i2c (c364c9b i2c/writing-clients: Mention module_i2c_driver())
Merging bjdooks-i2c/next-i2c (fc84fe1 Merge branch 'for_3.3/i2c/misc' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into for-33/i2c/omap)
CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-omap.c
Merging i2c-embedded/i2c-embedded/for-next (0f009a9 i2c: tegra: make all resource allocation through devm_*)
Merging quilt/jdelvare-hwmon (df13c46 hwmon: (coretemp) Document TjMax for 3rd generation i5/i7 processors)
Merging hwmon-staging/hwmon-next (703d42b hwmon: (ina2xx) Add support for INA220 and INA230)
Merging v4l-dvb/master (9d5c332 Merge /home/v4l/v4l/patchwork)
CONFLICT (content): Merge conflict in drivers/hid/hid-ids.h
Merging kbuild/for-next (c6ff25b Merge branch 'kbuild/rc-fixes' into kbuild/for-next)
Merging kconfig/for-next (eae1c36 Merge branch 'kconfig/for-linus-2' into kconfig/for-next)
Merging libata/NEXT (2fff275 PATA host controller driver for ep93xx)
Merging infiniband/for-next (a3698a9 RDMA/ocrdma: Fixed RQ error CQE polling)
Merging acpi/next (4e86d6d Merge branch 'turbostat-v2' into next)
Merging cpupowerutils/master (f166033 cpupower tools: add install target to the debug tools' makefiles)
Merging ieee1394/for-next (e18907c firewire: ohci: initialize multiChanMode bits after reset)
Merging ubi/linux-next (f8f5701 Linux 3.5-rc1)
Merging dlm/next (6b70194 dlm: fix conversion deadlock from recovery)
Merging scsi/for-next (24b1b79 Merge branch 'fixes' into for-next)
Merging target-updates/for-next (f02b0ba target/iscsi: Remove dead code in lio_get_tpg_from_tpg_item())
Merging target-merge/for-next-merge (cfaf025 Linux 3.5-rc2)
Merging ibft/linux-next (935a9fe ibft: Fix finding IBFT ACPI table on UEFI)
Merging isci/all (6df8ea3 merge: devel rnc-devel fixes)
Merging slave-dma/next (0a07603 Merge branch 'fixes' into next)
Merging dmaengine/next (a2bd114 netdma: adding alignment check for NETDMA ops)
Merging net-next/master (6fac262 ipv4: Cap ADVMSS metric in the FIB rather than the routing cache.)
CONFLICT (content): Merge conflict in drivers/net/wireless/ath/ath9k/main.c
Merging wireless-next/master (daf67ce iwlwifi: unlock on error path)
CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/pcie/trans.c
CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/dvm/testmode.c
Merging bluetooth/master (3701f94 Bluetooth: Remove magic value in disconnect mgmt handler)
Merging mtd/master (ea3b2ea mtd: nand: initialize bitflip_threshold prior to BBT scanning)
Merging l2-mtd/master (bfc3af6 mtd: nand: Use the mirror BBT descriptor when reading its version)
Merging crypto/master (3387e7d crypto: serpent-sse2/avx - allow both to be built into kernel)
Merging drm/drm-next (8c91402 Merge branch 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-core-next)
Merging sound/for-next (2f7e6bc Merge branch 'topic/misc' into for-next)
Merging sound-asoc/for-next (01f7d81 Merge branch 'for-3.6' into asoc-next)
Merging quilt/rr (ba528af init: Drop initcall level output)
Merging input/next (e7ec014 Input: twl6040-vibra - update for device tree support)
Merging input-mt/for-next (27c347d Input: MT - fix null pointer warning)
Merging cgroup/for-next (f9b6023f Merge branch 'for-3.5-fixes' into for-next)
Merging block/for-next (f45d342 Merge branch 'for-linus' into for-next)
Merging quilt/device-mapper (fd3f53e Remove the restriction that limits a target's specified maximum incoming I/O size to be a power of 2.)
Merging embedded/master (4744b43 embedded: fix vc_translate operator precedence)
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 (3e68086 mmc: block: replace __blk_end_request() with blk_end_request())
Merging kgdb/kgdb-next (3751d3e x86,kgdb: Fix DEBUG_RODATA limitation using text_poke())
Merging slab/for-next (23910c5 Merge branch 'slub/cleanups' into slab/next)
Merging uclinux/for-next (5e442a4 Revert "proc: fix races against execve() of /proc/PID/fd**")
Merging md/for-next (aba336b md: raid1/raid10: fix problem with merge_bvec_fn)
Merging mfd/for-next (29f772d mfd: Fix build break of max77693 by adding REGMAP_I2C option)
Merging battery/master (3be330b power_supply: Register battery as a thermal zone)
Merging fbdev/fbdev-next (b679895 video: s3c-fb: fix possible division by zero in s3c_fb_calc_pixclk)
Merging viafb/viafb-next (838ac78 viafb: avoid refresh and mode lookup in set_par)
Merging omap_dss2/for-next (05dd0f5 OMAPDSS: DISPC: Update Accumulator configuration for chroma plane)
Merging regulator/for-next (89672ee Merge branches 'regulator-core' and 'regulator-drivers' into regulator-next)
Merging security/next (3072928 tpm: check the chip reference before using it)
Merging selinux/master (c737f82 SELinux: remove unused common_audit_data in flush_unauthorized_files)
Merging lblnet/master (7e27d6e Linux 2.6.35-rc3)
Merging watchdog/master (39a50b4 Merge branch 'hfsplus')
Merging dwmw2-iommu/master (c3b92c8 Linux 3.1)
Merging iommu/next (eee5353 iommu/amd: Fix deadlock in ppr-handling error path)
Merging osd/linux-next (8b56a30 exofs: Add SYSFS info for autologin/pNFS export)
Merging jc_docs/docs-next (5c050fb docs: update the development process document)
Merging trivial/for-next (c224071 parisc: cleanup quoted include)
Merging audit/for-next (dcd6c92 Linux 3.3-rc1)
Merging pm/linux-next (96020fa PM / Sleep: add knob for printing device resume times)
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 (2d9531a Merge branch 'devel' into next)
Merging edac-amd/for-next (305f1c3 Merge branch '3.3-pci_device_id' into edac-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 for retrieving a node's full name)
Merging spi/spi/next (d8e328b spi: Add "spi:" prefix to modalias attribute of spi devices)
Merging tip/auto-latest (51b59d6 Merge branch 'perf/urgent')
Merging rcu/rcu/next (5b5dcc9 Merge branches 'barrier.2012.06.06a', 'doctorture.2012.06.06a', 'fixes.2012.06.06a' and 'fnh.2012.06.06a' into HEAD)
Merging cputime/cputime (c3e0ef9 [S390] fix cputime overflow in uptime_proc_show)
Merging uprobes/for-next (0326f5a uprobes/core: Handle breakpoint and singlestep exceptions)
Merging kmemleak/kmemleak (4878677 kmemleak: do not leak object after tree insertion error)
Merging kvm/linux-next (dcce048 KVM: trace events: update list of exit reasons)
Merging kvm-ppc/kvm-ppc-next (555b092 KVM: PPC: Not optimizing MSR_CE and MSR_ME with paravirt.)
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 (33e5c9e Merge branch 'devel/mce.v3' 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.org/pub/scm/linux/kernel/git/teigland/linux-dlm)
Merging workqueues/for-next (61011677 Merge tag 'dlm-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm)
Merging drivers-x86/linux-next (d0e0a477 dell-laptop: Add touchpad led support for Dell V3450)
Merging hwpoison/hwpoison (46e387b Merge branch 'hwpoison-hugepages' into hwpoison)
Merging sysctl/master (4e474a0 sysctl: protect poll() in entries that may go away)
Merging regmap/for-next (71692ef Merge branch 'regmap-page' into regmap-next)
Merging hsi/for-next (43139a6 HSI: hsi_char: Update ioctl-number.txt)
Merging leds/for-next (6d927cd leds: fix sparse warnings due to missing static)
Merging driver-core/driver-core-next (6790126 w1: Fix a typo in 'hardware' word)
CONFLICT (content): Merge conflict in drivers/extcon/extcon_gpio.c
Merging tty/tty-next (cfe275c serial: pxa: add spin lock for console write)
Merging usb/usb-next (fec1868 USB: properly pad out usb_device_id.driver_info)
Merging staging/staging-next (dc34814 staging: comedi: fix Kconfig for COMEDI_PCMCIA_DRIVERS)
Merging char-misc/char-misc-next (002176d misc: at25: Parse dt settings)
Merging tmem/linux-next (cfaf025 Linux 3.5-rc2)
Merging writeback/writeback-for-next (331cbde writeback: Fix some comment errors)
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 (b79d7d7 pinctrl: add pinctrl_add_gpio_ranges function)
Merging moduleh/for-sfr (f9e1b2b tile: fix compile failure on start_kernel in setup.c)
Merging vhost/linux-next (e0953c8 tun: experimental zero copy tx support)
Merging kmap_atomic/kmap_atomic (317b6e1 feature-removal-schedule.txt: schedule the deprecated form of kmap_atomic() for removal)
Merging memblock/memblock-kill-early_node_map (7bd0b0f memblock: Reimplement memblock allocation using reverse free area iterator)
Merging remoteproc/for-next (d48b97b Linux 3.4-rc6)
Merging irqdomain/irqdomain/next (aed9804 irqdomain: Make ops->map hook optional)
Merging gpio/gpio/next (3e11f7b gpio/generic: initialize basic_mmio_gpio shadow variables properly)
Merging arm-soc/for-next (13bf52c Merge branch 'fixes' into for-next)
Merging ep93xx/ep93xx-for-next (9b6a359 Merge branch 'ep93xx-fixes' into ep93xx-for-next)
Merging renesas/next (76ab1e9 Merge branch 'renesas-emev2' into renesas-next)
CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/Makefile
CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/Kconfig
Merging s5p/for-next (cfaf025 Linux 3.5-rc2)
Merging tegra/for-next (26dc430 Merge branch 'for-3.6/defconfig' into for-next)
Merging kvmtool/master (55b5e71 kvm tools: Process virito blk requests in separate thread)
Merging dma-mapping/dma-mapping-next (016887e scatterlist: add sg_alloc_table_from_pages function)
Merging dma-buf/for-next (b48b2c3 openrisc: use generic strnlen_user() function)
Merging userns/for-next (491fa9e userns: Allow the usernamespace support to build after the removal of usbfs)
Merging ktest/for-next (648a182 ktest: Allow a test to override REBOOT_ON_SUCCESS)
Merging signal/for-next (57760eb Uninclude linux/freezer.h)
Merging scsi-post-merge/merge-base:master ()
$ git checkout akpm
Applying: selinux: fix something
Applying: CMA: mo no enable it by default
Applying: tmpfs: implement NUMA node interleaving
Applying: tmpfs-implement-numa-node-interleaving-fix
Applying: cciss: fix incorrect scsi status reporting
Applying: arch/x86/platform/iris/iris.c: register a platform device and a platform driver
Applying: arch/x86/include/asm/spinlock.h: fix comment
Applying: timeconst.pl: remove deprecated defined(@array)
Applying: time: don't inline EXPORT_SYMBOL functions
Applying: ocfs2: use find_last_bit()
Applying: ocfs2: use bitmap_weight()
Applying: drivers/scsi/ufs: use module_pci_driver
Applying: drivers/scsi/ufs: reverse the ufshcd_is_device_present logic
Applying: drivers/scsi/ufs: fix incorrect return value about SUCCESS and FAILED
Applying: drivers/scsi/atp870u.c: fix bad use of udelay
Applying: vfs: increment iversion when a file is truncated
Applying: fs: symlink restrictions on sticky directories
Applying: fs: hardlink creation restrictions
Applying: mm/slab: remove duplicate check
Applying: slab: move FULL state transition to an initcall
Applying: vmalloc: walk vmap_areas by sorted list instead of rb_next()
Applying: mm: make vb_alloc() more foolproof
Applying: mm-make-vb_alloc-more-foolproof-fix
Applying: memcg: rename MEM_CGROUP_STAT_SWAPOUT as MEM_CGROUP_STAT_SWAP
Applying: memcg: rename MEM_CGROUP_CHARGE_TYPE_MAPPED as MEM_CGROUP_CHARGE_TYPE_ANON
Applying: memcg: remove MEM_CGROUP_CHARGE_TYPE_FORCE
Applying: swap: allow swap readahead to be merged
Applying: documentation: update how page-cluster affects swap I/O
Applying: hugetlb: rename max_hstate to hugetlb_max_hstate
Applying: hugetlbfs: don't use ERR_PTR with VM_FAULT* values
Applying: hugetlbfs: add an inline helper for finding hstate index
Applying: hugetlbfs-add-an-inline-helper-for-finding-hstate-index-fix
Applying: hugetlb: use mmu_gather instead of a temporary linked list for accumulating pages
Applying: hugetlb-use-mmu_gather-instead-of-a-temporary-linked-list-for-accumulating-pages-fix
Applying: hugetlb-use-mmu_gather-instead-of-a-temporary-linked-list-for-accumulating-pages-fix-fix
Applying: hugetlb-use-mmu_gather-instead-of-a-temporary-linked-list-for-accumulating-pages-fix-2
Applying: hugetlb: avoid taking i_mmap_mutex in unmap_single_vma() for hugetlb
Applying: hugetlb: simplify migrate_huge_page()
Applying: hugetlb-simplify-migrate_huge_page-fix
Applying: memcg: add HugeTLB extension
Applying: memcg-add-hugetlb-extension-fix
Applying: memcg-add-hugetlb-extension-fix-fix
Applying: hugetlb: add charge/uncharge calls for HugeTLB alloc/free
Applying: memcg: track resource index in cftype private
Applying: hugetlbfs: add memcg control files for hugetlbfs
Applying: memcg: use scnprintf instead of sprintf
Applying: hugetlbfs-add-memcg-control-files-for-hugetlbfs-use-scnprintf-instead-of-sprintf-fix
Applying: memcg/hugetlb: Add failcnt support for hugetlb extension
Applying: hugetlbfs: add a list for tracking in-use HugeTLB pages
Applying: memcg: move HugeTLB resource count to parent cgroup on memcg removal
Applying: memcg-move-hugetlb-resource-count-to-parent-cgroup-on-memcg-removal-fix
Applying: memcg-move-hugetlb-resource-count-to-parent-cgroup-on-memcg-removal-fix-fix
Applying: hugetlb: migrate memcg info from oldpage to new page during migration
Applying: hugetlb-migrate-memcg-info-from-oldpage-to-new-page-during-migration-fix
Applying: hugetlb-use-mmu_gather-instead-of-a-temporary-linked-list-for-accumulating-pages-fix-2
Applying: memcg: add memory controller documentation for hugetlb management
Applying: memcg: fix error code in hugetlb_force_memcg_empty()
Applying: memcg-fix-error-code-in-hugetlb_force_memcg_empty-v2
Applying: memcg-fix-error-code-in-hugetlb_force_memcg_empty-v2-checkpatch-fixes
Applying: memcg: use res_counter_uncharge_until() in mem_cgroup_move_hugetlb_parent()
Applying: memcg: move charges to root cgroup if use_hierarchy=0 in mem_cgroup_move_hugetlb_parent()
Applying: clk: add non CONFIG_HAVE_CLK routines
Applying: clk: remove redundant depends on from drivers/Kconfig
Applying: i2c/i2c-pxa: remove conditional compilation of clk code
Applying: usb/marvell: remove conditional compilation of clk code
Applying: usb/musb: remove conditional compilation of clk code
Applying: ata/pata_arasan: remove conditional compilation of clk code
Applying: net/c_can: remove conditional compilation of clk code
Applying: net/stmmac: remove conditional compilation of clk code
Applying: gadget/m66592: remove conditional compilation of clk code
Applying: gadget/r8a66597: remove conditional compilation of clk code
Applying: usb/host/r8a66597: remove conditional compilation of clk code
Applying: NMI watchdog: fix for lockup detector breakage on resume
Applying: nmi-watchdog-fix-for-lockup-detector-breakage-on-resume-fix
Applying: nmi-watchdog-fix-for-lockup-detector-breakage-on-resume-fix-fix-fix
Applying: nmi-watchdog-fix-for-lockup-detector-breakage-on-resume-fix-fix
Applying: watchdog: fix for lockup detector breakage on resume
Applying: nmi-watchdog-fix-for-lockup-detector-breakage-on-resume-v2-fix
Applying: kmsg: /dev/kmsg - properly return possible copy_from_user() failure
Applying: ipc/sem.c: alternatives to preempt_disable()
Applying: c/r: fcntl: add F_GETOWNER_UIDS option
Applying: notify_change(): check that i_mutex is held
Merging quilt/akpm (2c89072 notify_change(): check that i_mutex is held)
Applying: ACPI-Thermal: fix for an API change
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2023-06-19 5:41 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-06-19 7:15 linux-next: Tree for Jun 19 Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2023-06-19 5:40 Stephen Rothwell
2019-06-19 10:51 Stephen Rothwell
2017-06-19 8:18 Stephen Rothwell
2015-06-19 5:16 Michael Ellerman
2014-06-19 6:16 Stephen Rothwell
2013-06-19 8:21 Stephen Rothwell
2013-06-19 8:21 ` Stephen Rothwell
2012-06-19 5:05 Stephen Rothwell
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.