linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* linux-next: Tree for Aug 1
@ 2019-08-01  6:14 Stephen Rothwell
  0 siblings, 0 replies; 39+ messages in thread
From: Stephen Rothwell @ 2019-08-01  6:14 UTC (permalink / raw)
  To: Linux Next Mailing List; +Cc: Linux Kernel Mailing List

[-- Attachment #1: Type: text/plain, Size: 33928 bytes --]

Hi all,

Changes since 20190731:

New trees: pidfd-fixes, renesas-geert

My fixes tree contains:

  15b9fc624ba4 ("drivers/macintosh/smu.c: Mark expected switch fall-through")

The pm tree lost its build failure.

The drm-misc tree gained a build failure so I used the version from
next-20190731.

The sound-asoc tree gained a conflict against the sound tree.

The tip tree gained a build failure for which I applied a patch.

Non-merge commits (relative to Linus' tree): 3508
 4105 files changed, 218561 insertions(+), 98912 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 304 trees (counting Linus' and 74 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 (5c6207539aea Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
Merging fixes/master (15b9fc624ba4 drivers/macintosh/smu.c: Mark expected switch fall-through)
Merging kbuild-current/fixes (e8de12fb7cde kbuild: Check for unknown options with cc-option usage in Kconfig and clang)
Merging arc-current/for-curr (24a20b0a443f ARC: [plat-hsdk]: Enable AXI DW DMAC in defconfig)
Merging arm-current/fixes (c5d0e49e8d8f ARM: 8867/1: vdso: pass --be8 to linker if necessary)
Merging arm-soc-fixes/arm/fixes (7bd9d465140a Merge tag 'imx-fixes-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/fixes)
Merging arm64-fixes/for-next/fixes (97d5db366224 arm64: Lower priority mask for GIC_PRIO_IRQON)
Merging m68k-current/for-linus (f28a1f16135c m68k: Don't select ARCH_HAS_DMA_PREP_COHERENT for nommu or coldfire)
Merging powerpc-fixes/fixes (da1115fdbd6e powerpc/nvdimm: Pick nearby online node if the device node is not online)
Merging s390-fixes/fixes (8480657280ee vfio-ccw: make vfio_ccw_async_region_ops static)
Merging sparc/master (038029c03e21 sparc: remove unneeded uapi/asm/statfs.h)
Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2)
Merging net/master (d8a1de3d5bb8 isdn: hfcsusb: Fix mISDN driver crash caused by transfer buffer on the stack)
Merging bpf/master (5d01ab7bac46 libbpf: fix erroneous multi-closing of BTF FD)
Merging ipsec/master (22d6552f827e xfrm interface: fix management of phydev)
Merging netfilter/master (7cdc44122847 Merge branch 'master' of git://blackhole.kfki.hu/nf)
Merging ipvs/master (58e8b37069ff Merge branch 'net-phy-dp83867-add-some-fixes')
Merging wireless-drivers/master (66f5772ee29d Merge tag 'iwlwifi-fixes-for-kvalo-2019-07-30' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes)
Merging mac80211/master (d8a1de3d5bb8 isdn: hfcsusb: Fix mISDN driver crash caused by transfer buffer on the stack)
Merging rdma-fixes/for-rc (708637e65abd Do not dereference 'siw_crypto_shash' before checking)
Merging sound-current/for-linus (5d78e1c2b7f4 ALSA: usb-audio: Fix gpf in snd_usb_pipe_sanity_check)
Merging sound-asoc-fixes/for-linus (f9eeb39b6ad2 Merge branch 'asoc-5.3' into asoc-linus)
Merging regmap-fixes/for-linus (5f9e832c1370 Linus 5.3-rc1)
Merging regulator-fixes/for-linus (3630a287d13c Merge branch 'regulator-5.3' into regulator-linus)
Merging spi-fixes/for-linus (d24f33303ad1 Merge branch 'spi-5.3' into spi-linus)
Merging pci-current/for-linus (5f9e832c1370 Linus 5.3-rc1)
Merging driver-core.current/driver-core-linus (ac43432cb1f5 driver core: Fix use-after-free and double free on glue directory)
Merging tty.current/tty-linus (81eaadcae81b kgdboc: disable the console lock when in kgdb)
Merging usb.current/usb-linus (12ca7297b885 usb: typec: tcpm: remove tcpm dir if no children)
Merging usb-gadget-fixes/fixes (42de8afc40c9 usb: dwc2: Use generic PHY width in params setup)
Merging usb-serial-fixes/usb-linus (f8377eff5481 USB: serial: ftdi_sio: add ID for isodebug v1)
Merging usb-chipidea-fixes/ci-for-usb-stable (16009db47c51 usb: chipidea: udc: workaround for endpoint conflict issue)
Merging phy/fixes (609488bc979f Linux 5.3-rc2)
Merging staging.current/staging-linus (09f6109ff4f8 Merge tag 'iio-fixes-for-5.3a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus)
Merging char-misc.current/char-misc-linus (1dd38ae96973 MAINTAINERS: Move linux-fpga tree to new location)
Merging soundwire-fixes/fixes (5f9e832c1370 Linus 5.3-rc1)
Merging thunderbolt-fixes/fixes (6fbc7275c7a9 Linux 5.2-rc7)
Merging input-current/for-linus (e77ff779a0c6 Input: applespi - add dependency on LEDS_CLASS)
Merging crypto-current/master (cf144f81a99d padata: use smp_mb in padata_reorder to avoid orphaned padata jobs)
Merging ide/master (baf6722aa0cb ide: Use dev_get_drvdata where possible)
Merging vfio-fixes/for-linus (5715c4dd66a3 vfio/mdev: Synchronize device create/remove with parent removal)
Merging kselftest-fixes/fixes (fbb01c52471c selftests/livepatch: push and pop dynamic debug config)
Merging modules-fixes/modules-linus (be71eda5383f module: Fix display of wrong module .text address)
Merging slave-dma-fixes/fixes (d105ef8120dd dmaengine: tegra210-adma: Fix unused function warnings)
Merging backlight-fixes/for-backlight-fixes (e93c9c99a629 Linux 5.1)
Merging mtd-fixes/mtd/fixes (5f9e832c1370 Linus 5.3-rc1)
Merging mfd-fixes/for-mfd-fixes (63b2de12b7ee mfd: stmfx: Fix an endian bug in stmfx_irq_handler())
Merging v4l-dvb-fixes/fixes (92f5b0313e37 media: vivid: fix missing cec adapter name)
Merging reset-fixes/reset/fixes (a71dcd3757e2 reset: remove redundant null check on pointer dev)
Merging mips-fixes/mips-fixes (2d291e6cc183 MIPS: OProfile: Mark expected switch fall-throughs)
Merging at91-fixes/at91-fixes (5f9e832c1370 Linus 5.3-rc1)
Merging omap-fixes/fixes (fb59ee37cfe2 ARM: dts: am57xx: Disable voltage switching for SD card)
Merging kvm-fixes/master (30cd8604323d KVM: x86: Add fixed counters to PMU filter)
Merging kvms390-fixes/master (a86cb413f4bf KVM: s390: Do not report unusabled IDs via KVM_CAP_MAX_VCPU_ID)
Merging hwmon-fixes/hwmon (4c3c79f79e5c hwmon: (nct7802) Fix wrong detection of in4 presence)
Merging nvdimm-fixes/libnvdimm-fixes (61c30c98ef17 dax: Fix missed wakeup in put_unlocked_entry())
Merging btrfs-fixes/next-fixes (042693442aa6 Merge branch 'misc-5.3' into next-fixes)
Merging vfs-fixes/fixes (c2c44ec20a84 Unbreak mount_capable())
Merging dma-mapping-fixes/for-linus (f46cc0152501 dma-contiguous: page-align the size in dma_free_contiguous())
Merging i3c-fixes/master (6fbc7275c7a9 Linux 5.2-rc7)
Merging drivers-x86-fixes/fixes (f14312a93b34 platform/x86: pcengines-apuv2: use KEY_RESTART for front button)
Merging samsung-krzk-fixes/fixes (5f9e832c1370 Linus 5.3-rc1)
Merging pinctrl-samsung-fixes/pinctrl-fixes (5f9e832c1370 Linus 5.3-rc1)
Merging devicetree-fixes/dt/linus (740ce365a4dc dt-bindings: Fix generated example files getting added to schemas)
Merging scsi-fixes/fixes (e82f04ec6ba9 scsi: qla2xxx: Fix possible fcport null-pointer dereferences)
Merging drm-fixes/drm-fixes (4d5308e78527 Merge tag 'drm-fixes-5.3-2019-07-24' of git://people.freedesktop.org/~agd5f/linux into drm-fixes)
Merging amdgpu-fixes/drm-fixes (ee6fa8584656 drm/amd/amdgpu/vcn_v2_0: Move VCN 2.0 specific dec ring test to vcn_v2_0)
Merging drm-intel-fixes/for-linux-next-fixes (cf4a459031f2 Merge tag 'gvt-fixes-2019-07-30' of https://github.com/intel/gvt-linux into drm-intel-fixes)
Merging mmc-fixes/fixes (3a6ffb3c8c32 mmc: mmc_spi: Enable stable writes)
Merging rtc-fixes/rtc-fixes (5f9e832c1370 Linus 5.3-rc1)
Merging gnss-fixes/gnss-linus (f2c7c76c5d0a Linux 5.2-rc3)
Merging hyperv-fixes/hyperv-fixes (5d14de4c6ce5 hv: Use the correct style for SPDX License Identifier)
Merging soc-fsl-fixes/fix (5674a92ca4b7 soc/fsl/qe: Fix an error code in qe_pin_request())
Merging risc-v-fixes/fixes (30d9a7b74aa0 riscv: kbuild: add virtual memory system selection)
Merging pidfd-fixes/fixes (97112e283da5 exit: make setting exit_state consistent)
Merging fpga-fixes/fixes (7721f61d2e76 fpga: altera-ps-spi: Fix getting of optional confd gpio)
Merging drm-misc-fixes/for-linux-next-fixes (7e9e5ead55be drm/vgem: fix cache synchronization on arm/arm64)
Merging kspp-gustavo/for-next/kspp (50235e41ab35 watchdog: riowd: Mark expected switch fall-through)
Merging kbuild/for-next (cc6ff7162ef4 Kbuild: Handle PREEMPT_RT for version string and magic)
Merging compiler-attributes/compiler-attributes (a188339ca5a3 Linux 5.2-rc1)
Merging leaks/leaks-next (9e98c678c2d6 Linux 5.1-rc1)
Merging dma-mapping/for-next (ad3c7b18c5b3 arm: use swiotlb for bounce buffering on LPAE configs)
Merging asm-generic/master (7f3a8dff1219 asm-generic: remove ptrace.h)
Merging arc/for-next (6fbc7275c7a9 Linux 5.2-rc7)
Merging arm/for-next (b7a735f3a606 Merge branch 'for-arm-soc' into for-next)
Merging arm64/for-next/core (0c61efd322b7 Merge branch 'for-next/perf' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux)
Merging arm-perf/for-next/perf (ca786b8db751 arm64: perf: Remove unused macro)
Merging arm-soc/for-next (1439dbf17e9e Merge branch 'arm/fixes' into for-next)
Merging actions/for-next (fb9c1c1deb5e Merge branch 'v4.20/drivers+s900-sps' into next)
Merging amlogic/for-next (7671b33bcaa8 Merge branch 'v5.3/fixes' into tmp/aml-rebuild)
Merging aspeed/for-next (ed2a2abc6334 Merge branch 'dt-for-v5.4' into for-next)
Merging at91/at91-next (90fbe456b5f0 Merge branch 'at91-dt' into at91-next)
Merging bcm2835/for-next (f83e5000db15 Merge branch 'bcm2835-dt-next' into for-next)
Merging imx-mxs/for-next (1596861583cb Merge branch 'imx/defconfig' into for-next)
Merging keystone/next (78145dbeaea1 Merge branch 'for_5.3/driver-soc' into next)
Merging mediatek/for-next (73ade6a62931 Merge branch 'v5.1-next/soc' into for-next)
Merging mvebu/for-next (e1b0b32a5ad6 Merge branch 'mvebu/dt64' into mvebu/for-next)
Merging omap/for-next (7376d6a65730 Merge branch 'fixes' into for-next)
Merging qcom/for-next (9f407b8ad181 Merge branches 'arm64-for-5.4' and 'drivers-for-5.3' into for-next)
Merging renesas/next (a16ecb14d0b0 Merge branches 'arm-dt-for-v5.3', 'arm-soc-for-v5.3', 'arm-defconfig-for-v5.3', 'arm64-defconfig-for-v5.3', 'arm64-dt-for-v5.3' and 'dt-bindings-for-v5.3' into next)
Merging renesas-geert/next (229a4cd46ddf Merge branch 'renesas-arm64-dt-for-v5.4' into renesas-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 (55d674eec75b Merge branch 'v5.4-armsoc/dts32' into for-next)
Merging samsung-krzk/for-next (5f9e832c1370 Linus 5.3-rc1)
Merging scmi/for-linux-next (609488bc979f Linux 5.3-rc2)
Merging sunxi/sunxi/for-next (b184e1e79e6d Merge branches 'sunxi/config64-for-5.4' and 'sunxi/dt-for-5.4' into sunxi/for-next)
Merging tegra/for-next (033de83170dd Merge branch for-5.3/arm64/defconfig into for-next)
Merging clk/clk-next (03d7036efa4a Merge branch 'clk-fixes' into clk-next)
Merging clk-samsung/for-next (a188339ca5a3 Linux 5.2-rc1)
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 (ada384a7fd2d csky: Optimize arch_sync_dma_for_cpu/device with dma_inv_range)
Merging h8300/h8300-next (a5de8865cb3e h8300: move definition of __kernel_size_t etc. to posix_types.h)
Merging ia64/next (c51836246f97 ia64: generate uapi header and system call table files)
Merging m68k/for-next (f28a1f16135c m68k: Don't select ARCH_HAS_DMA_PREP_COHERENT for nommu or coldfire)
Merging m68knommu/for-next (609488bc979f Linux 5.3-rc2)
Merging microblaze/next (226a893bbb1f microblaze: no need to check return value of debugfs_create functions)
Merging mips/mips-next (dc7077f89ad9 mips: remove nargs from __SYSCALL)
Merging nds32/next (932296120543 nds32: add new emulations for floating point instruction)
Merging nios2/for-next (f017da5c7077 nios2: configs: Remove useless UEVENT_HELPER_PATH)
Merging openrisc/for-next (57ce8ba0fd3a openrisc: Fix broken paths to arch/or32)
Merging parisc-hd/for-next (740f05f30a8c parisc: fix race condition in patching code)
Merging powerpc/next (5f9e832c1370 Linus 5.3-rc1)
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 (f51edcec5288 MAINTAINERS: Add an entry for generic architecture topology)
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 (019a09a26310 Documentation/s390: remove outdated debugging390 documentation)
Merging sh/sh-next (cd10afbc932d sh: remove unneeded uapi asm-generic wrappers)
CONFLICT (modify/delete): arch/sh/include/uapi/asm/types.h deleted in sh/sh-next and modified in HEAD. Version HEAD of arch/sh/include/uapi/asm/types.h left in tree.
CONFLICT (modify/delete): arch/sh/include/uapi/asm/setup.h deleted in sh/sh-next and modified in HEAD. Version HEAD of arch/sh/include/uapi/asm/setup.h left in tree.
$ git rm -f arch/sh/include/uapi/asm/setup.h arch/sh/include/uapi/asm/types.h
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 (b482e48d29f1 um: fix build without CONFIG_UML_TIME_TRAVEL_SUPPORT)
Merging xtensa/xtensa-for-next (1386dcaa9226 Merge branch 'xtensa-5.3' into xtensa-for-next)
Merging fscrypt/master (0564336329f0 fscrypt: document testing with xfstests)
Merging afs/afs-next (852c1d04f6d0 afs: Support RCU pathwalk)
Merging btrfs/next (29dcea88779c Linux 4.17)
Merging btrfs-kdave/for-next (80dfdbfd37d2 Merge branch 'for-next-current-v5.2-20190705' into for-next-20190705)
Merging ceph/master (d31d07b97a5e ceph: fix end offset in truncate_inode_pages_range call)
Merging cifs/for-next (ee7340d63f98 smb3: add missing flag definitions)
Merging configfs/for-next (f6122ed2a4f9 configfs: Fix use-after-free when accessing sd->s_dentry)
Merging ecryptfs/next (7451c54abc91 ecryptfs: Change return type of ecryptfs_process_flags)
Merging ext3/for_next (56db1991690f udf: prevent allocation beyond UDF partition)
Merging ext4/dev (96fcaf86c3cb ext4: fix coverity warning on error path of filename setup)
Merging f2fs/dev (01ff2b3740a6 f2fs: Support case-insensitive file name lookups)
Merging fsverity/fsverity (60d7bf0f790f f2fs: add fs-verity support)
CONFLICT (content): Merge conflict in fs/f2fs/inode.c
CONFLICT (content): Merge conflict in fs/f2fs/file.c
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 (d5b9216fd511 pnfs/flexfiles: Add tracepoints for detecting pnfs fallback to MDS)
Merging nfs-anna/linux-next (68f461593f76 NFS/flexfiles: Use the correct TCP timeout for flexfiles I/O)
Merging nfsd/nfsd-next (64a38e840ce5 SUNRPC: Track writers of the 'channel' file to improve cache_listeners_exist)
Merging orangefs/for-next (e65682b55956 orangefs: eliminate needless variable assignments)
Merging overlayfs/overlayfs-next (0be0bfd2de9d ovl: fix regression caused by overlapping layers detection)
Merging ubifs/linux-next (8009ce956c3d 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 (afa1d96d1430 xfs: Fix possible null-pointer dereferences in xchk_da_btree_block_check_sibling())
Merging iomap/iomap-for-next (5d907307adc1 iomap: move internal declarations into fs/iomap/)
Merging djw-vfs/vfs-for-next (7e328e5930ad mm/fs: don't allow writes to immutable files)
Merging file-locks/locks-next (43e4cb942e88 locks: Fix procfs output for file leases)
Merging vfs/for-next (dad5ea4bac62 ceph_real_mount(): missing initialization)
CONFLICT (content): Merge conflict in fs/ubifs/super.c
CONFLICT (content): Merge conflict in fs/gfs2/super.c
CONFLICT (content): Merge conflict in fs/ceph/super.c
CONFLICT (modify/delete): Documentation/filesystems/vfs.txt deleted in HEAD and modified in vfs/for-next. Version vfs/for-next of Documentation/filesystems/vfs.txt left in tree.
$ git rm -f Documentation/filesystems/vfs.txt
Applying: docs: filesystems: vfs: update for "vfs: Kill mount_single()"
Merging printk/for-next (ba174ef6d224 Merge branch 'for-5.3-fixes' into for-next)
Merging pci/next (5f9e832c1370 Linus 5.3-rc1)
Merging pstore/for-next/pstore (609488bc979f Linux 5.3-rc2)
Merging hid/for-next (bf4945efabdf Merge branch 'for-5.3/wacom' into for-next)
Merging i2c/i2c/for-next (9a74c745c689 Merge branch 'i2c/for-5.3' into i2c/for-next)
Merging i3c/i3c/next (934d24a5e150 i3c: move i3c_device_match_id to device.c and export it)
Merging dmi/master (57361846b52b Linux 4.19-rc2)
Merging hwmon-staging/hwmon-next (637b16e0744a hwmon: (npcm750-pwm-fan) Remove dev_err() usage after platform_get_irq())
Merging jc_docs/docs-next (e9bb62756153 docs: w1: convert to ReST and add to the kAPI group of docs)
Merging v4l-dvb/master (4590c07462fb media: via-camera: convert to the vb2 framework)
Merging v4l-dvb-next/master (5f9e832c1370 Linus 5.3-rc1)
Merging fbdev/fbdev-for-next (732146a3f1dc video: fbdev: imxfb: fix a typo in imxfb_probe())
Merging pm/linux-next (9c77b777925f Merge branch 'pm-cpuidle' into linux-next)
Merging cpufreq-arm/cpufreq/arm/linux-next (cfef2846f785 Merge branch 'cpufreq/qcom-updates' into cpufreq/arm/linux-next)
Merging cpupower/cpupower (04507c0a9385 cpupower : frequency-set -r option misses the last cpu in related cpu list)
Merging opp/opp/linux-next (0203c0343a1f Merge branch 'opp/qcom-updates' into opp/linux-next)
Merging thermal/next (d093f91ff7d0 Merge branch 'for-rc' into next)
CONFLICT (rename/add): Rename Documentation/thermal/index.rst->Documentation/driver-api/thermal/index.rst in HEAD. Documentation/driver-api/thermal/index.rst added in thermal/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 (a48f9721e6db dlm: no need to check return value of debugfs_create functions)
Merging swiotlb/linux-next (4cdfb27ba80d xen/swiotlb: remember having called xen_create_contiguous_region())
Merging rdma/for-next (16e9111e9ee3 RDMA/efa: Expose device statistics)
Merging net-next/master (6a7ce95d752e staging/octeon: Fix build error without CONFIG_NETDEVICES)
CONFLICT (content): Merge conflict in drivers/net/can/flexcan.c
CONFLICT (content): Merge conflict in Documentation/PCI/pci-error-recovery.rst
Merging bpf-next/master (a98bf57391a2 tools: bpftool: add support for reporting the effective cgroup progs)
Merging ipsec-next/master (c7b37c769d2a xfrm: remove get_mtu indirection from xfrm_type)
Merging mlx5-next/mlx5-next (0470e5e38c9d net/mlx5: fix -Wtype-limits compilation warnings)
Merging netfilter-next/master (5133f36cef46 Merge branch 'net-dsa-ksz-Add-Microchip-KSZ87xx-support')
Merging nfc-next/master (1f008cfec5d5 NFC: fdp: Fix unused variable warnings)
CONFLICT (content): Merge conflict in drivers/nfc/st21nfca/se.c
Merging ipvs-next/master (1b0b807dd746 Merge branch 'r8169-fw')
Merging wireless-drivers-next/master (15e830e90fde mwifiex: use eth_broadcast_addr() to assign broadcast address)
Merging bluetooth/master (fa9ccaf84f5d Bluetooth: hidp: Let hidp_send_message return number of queued bytes)
Merging mac80211-next/master (6a7ce95d752e staging/octeon: Fix build error without CONFIG_NETDEVICES)
Merging gfs2/for-next (5d69e57fa9cc gfs2: Minor gfs2_alloc_inode cleanup)
Merging mtd/mtd/next (5f9e832c1370 Linus 5.3-rc1)
Merging nand/nand/next (1670e678a8a7 mtd: rawnand: ingenic: Add of_node_put() before return)
Merging spi-nor/spi-nor/next (5f9e832c1370 Linus 5.3-rc1)
Merging crypto/master (82cb54856874 asm-generic: make simd.h a mandatory include/asm header)
Merging drm/drm-next (609488bc979f Linux 5.3-rc2)
Merging amdgpu/drm-next (d40d959129f6 drm/amdkfd/kfd_mqd_manager_v10: Avoid fall-through warning)
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/powerplay/navi10_ppt.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/powerplay/amdgpu_smu.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/core/dc_stream.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h
Merging drm-intel/for-linux-next (c2052d6e242c drm/i915/ehl: Ungate DDIC and DDID)
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_trace.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gpu_error.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem_gtt.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/selftest_workarounds.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_workarounds.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_ringbuffer.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_engine_cs.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_context.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_dp.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_display_power.c
Merging drm-tegra/drm/tegra/for-next (2a6fc3cb5cb6 drm/tegra: Fix gpiod_get_from_of_node() regression)
Merging drm-misc/for-linux-next (bed7a2182de6 drm/radeon: Provide ddc symlink in connector sysfs directory)
$ git reset --hard HEAD^
Merging next-20190731 version of drm-misc
Merging drm-msm/msm-next (4cf643a39221 Merge tag 'drm-next-5.3-2019-06-27' of git://people.freedesktop.org/~agd5f/linux into drm-next)
Merging hdlcd/for-upstream/hdlcd (d664b851eb2b drm/arm/hdlcd: Reject atomic commits that disable only the plane)
Merging mali-dp/for-upstream/mali-dp (4cf643a39221 Merge tag 'drm-next-5.3-2019-06-27' of git://people.freedesktop.org/~agd5f/linux into drm-next)
Merging imx-drm/imx-drm/next (fee77829083a gpu: ipu-v3: image-convert: Enable double write reduction)
Merging etnaviv/etnaviv/next (57bdd4057516 drm/etnaviv: Use devm_platform_ioremap_resource())
Merging regmap/for-next (5f9e832c1370 Linus 5.3-rc1)
Merging sound/for-next (c1c0c032c785 Merge branch 'topic/hda-dmic' into for-next)
Merging sound-asoc/for-next (6382f3d3a859 Merge branch 'asoc-5.4' into asoc-next)
CONFLICT (content): Merge conflict in sound/soc/intel/skylake/skl.h
CONFLICT (content): Merge conflict in sound/soc/intel/skylake/skl-nhlt.c
Merging modules/modules-next (38f054d549a8 modules: always page-align module section allocations)
Merging input/next (c394159310d0 Input: soc_button_array - add support for newer surface devices)
Merging block/for-next (5b9ddbdf2f36 Merge branch 'for-linus' into for-next)
Merging device-mapper/for-next (9c50a98f55f4 dm table: fix various whitespace issues with recent DAX code)
Merging pcmcia/pcmcia-next (95691e3eddc4 pcmcia: Implement CLKRUN protocol disabling for Ricoh bridges)
Merging mmc/next (979f97f2771b mmc: host: sdhci: Fix the incorrect soft reset operation when runtime resuming)
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 (b5e29aa880be mfd: davinci_voicecodec: Remove pointless #include)
Merging backlight/for-backlight-next (73fbfc499448 backlight: pwm_bl: Fix heuristic to determine number of brightness levels)
Merging battery/for-next (5f9e832c1370 Linus 5.3-rc1)
Merging regulator/for-next (6b7c449ffaa0 Merge branch 'regulator-5.4' into regulator-next)
Merging security/next-testing (286e47a07799 Merge branch 'next-lsm' into next-testing)
Merging apparmor/apparmor-next (136db994852a apparmor: increase left match history buffer size)
Merging integrity/next-integrity (650b29dbdf2c integrity: Introduce struct evm_xattr)
Merging keys/keys-next (8cf8684e0d24 Merge branch 'keys-acl' into keys-next)
CONFLICT (content): Merge conflict in include/linux/key.h
CONFLICT (content): Merge conflict in fs/afs/security.c
Applying: fsverity: merge fix for keyring_alloc API change
Merging selinux/next (5f9e832c1370 Linus 5.3-rc1)
Merging tpmdd/next (166a2809d65b tpm: Don't duplicate events from the final event log in the TCG2 log)
Merging watchdog/master (a18670f4617d watchdog: ath79_wdt: fix a typo in the name of a function)
Merging iommu/next (66929812955b iommu/amd: Add support for X2APIC IOMMU interrupts)
Merging vfio/next (1e4d09d2212d mdev: Send uevents around parent device registration)
Merging audit/next (5f9e832c1370 Linus 5.3-rc1)
Merging devicetree/for-next (bf1c0ac6a8bc docs: writing-schema.md: convert from markdown to ReST)
Merging mailbox/mailbox-for-next (25777e5784a7 mailbox: handle failed named mailbox channel request)
Merging spi/for-next (1bda625684d2 Merge branch 'spi-5.4' into spi-next)
Merging tip/auto-latest (243961b422fc Merge branch 'locking/core')
Applying: hrtimer: fix typo in hrtimer_init_sleeper_on_stack() conversion
Merging clockevents/clockevents/next (b0c74b96d177 clocksource/drivers/davinci: Add support for clocksource)
Merging edac/edac-for-next (3123c5c4ca15 edac: altera: Move Stratix10 SDRAM ECC to peripheral)
Merging irqchip/irq/irqchip-next (3dae67ce600c irqchip/gic-pm: Remove PM_CLK dependency)
Merging ftrace/for-next (6d54ceb539aa tracing: Fix user stack trace "??" output)
Merging rcu/rcu/next (b989ff070574 Merge LKMM and RCU commits)
Merging kvm/linux-next (30cd8604323d KVM: x86: Add fixed counters to PMU filter)
Merging kvm-arm/next (1e0cf16cdad1 KVM: arm/arm64: Initialise host's MPIDRs by reading the actual register)
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 (a78d14a31666 xen: avoid link error on ARM)
Merging percpu/for-next (03ed70fb0e5e Merge branch 'for-5.3' into for-next)
Merging workqueues/for-next (be69d00d9769 workqueue: Remove GPF argument from alloc_workqueue_attrs())
Merging drivers-x86/for-next (6fe9363b1576 platform/x86: acer-wmi: Switch to acpi_dev_get_first_match_dev())
Merging chrome-platform/for-next (5f9e832c1370 Linus 5.3-rc1)
Merging hsi/for-next (c1030cd45619 HSI: Remove dev_err() usage after platform_get_irq())
Merging leds/for-next (be7fc2cc8617 Merge tag 'generic_lookup_helpers' into for-next)
Merging ipmi/for-next (fec88ab0af97 Merge tag 'for-linus-hmm' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma)
Merging driver-core/driver-core-next (98051ba2b28b coccinelle: Add script to check for platform_get_irq() excessive prints)
Merging usb/usb-next (b33f37064b74 usb: Remove dev_err() usage after platform_get_irq())
Merging usb-gadget/next (b2357839c56a usb: renesas_usbhs: add a workaround for a race condition of workqueue)
Merging usb-serial/usb-next (9e0babf2c06c Linux 5.2-rc5)
Merging usb-chipidea-next/ci-for-usb-next (034252e37b31 usb: chipidea: msm: Use devm_platform_ioremap_resource())
Merging phy-next/next (609488bc979f Linux 5.3-rc2)
Merging tty/tty-next (9d4742136a26 xilinx_uartps.c: suppress "may be used uninitialised" warning)
Merging char-misc/char-misc-next (509ce4c85bd0 ppdev: add header include guard)
Merging extcon/extcon-next (a3fc57233977 extcon: adc-jack: Remove dev_err() usage after platform_get_irq())
Merging soundwire/next (5f9e832c1370 Linus 5.3-rc1)
Merging thunderbolt/next (6fbc7275c7a9 Linux 5.2-rc7)
Merging staging/staging-next (9a675a13c3bb Revert "staging: kpc2000: Convert put_page() to put_user_page*()")
Merging mux/for-next (05fb8284a417 Merge branch 'i2c-mux/for-next' into for-next)
Merging icc/icc-next (83fdb2dfb0c2 interconnect: convert to DEFINE_SHOW_ATTRIBUTE)
Merging slave-dma/next (57dbd0e4b97d dmaengine: stm32-mdma: Switch to use device_property_count_u32())
Merging cgroup/for-next (a581563f1bef cgroup: minor tweak for logic to get cgroup css)
Merging scsi/for-next (03ed974738a0 Merge branch 'misc' into for-next)
Merging scsi-mkp/for-next (99b7132e18fd scsi: qla2xxx: Update driver version to 10.01.00.18-k)
Merging vhost/linux-next (73f628ec9e6b vhost: disable metadata prefetch optimization)
Merging rpmsg/for-next (7f1345e9efcc Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
Merging gpio/for-next (c058275cfa13 Merge branch 'devel' into for-next)
Merging gpio-brgl/gpio/for-next (61059b7048ee gpio: ixp4xx: remove redundant dev_err message)
Merging pinctrl/for-next (87cdf194fbfb Merge branch 'devel' into for-next)
Merging pinctrl-samsung/for-next (5f9e832c1370 Linus 5.3-rc1)
Merging pwm/for-next (3d25025ce9c2 pwm: fsl-ftm: Make sure to unlock mutex on failure)
Merging userns/for-next (318759b4737c signal/x86: Move tsk inside of CONFIG_MEMORY_FAILURE in do_sigbus)
Merging ktest/for-next (aecea57f84b0 ktest: Fix some typos in config-bisect.pl)
Merging random/dev (58be0106c530 random: fix soft lockup when trying to read from an uninitialized blocking pool)
Merging kselftest/next (5f9e832c1370 Linus 5.3-rc1)
Merging y2038/y2038 (a2318b6a16a8 riscv: Use latest system call ABI)
CONFLICT (content): Merge conflict in arch/riscv/include/uapi/asm/unistd.h
Merging livepatching/for-next (28f28ea4343a Merge branch 'for-5.3-core' into for-next)
Merging coresight/next (d1aa58c4baa7 coresight: etm4x: improve clarity of etm4_os_unlock comment)
Merging rtc/rtc-next (06c8e550a84e rtc: s5m: convert to i2c_new_dummy_device)
Merging nvdimm/libnvdimm-for-next (cb3110f7452d Merge branch 'for-5.3/dax' into libnvdimm-for-next)
Merging at24/at24/for-next (10742fee98eb eeprom: at24: remove unneeded include)
Merging ntb/ntb-next (5f9e832c1370 Linus 5.3-rc1)
Merging kspp/for-next/kspp (60f2c82ed20b randstruct: Check member structs in is_pure_ops_struct())
Merging cisco/for-next (9e98c678c2d6 Linux 5.1-rc1)
Merging gnss/gnss-next (f2c7c76c5d0a Linux 5.2-rc3)
Merging fsi/next (371975b0b075 fsi/core: Fix error paths on CFAM init)
Merging siox/siox/next (1e4b044d2251 Linux 4.18-rc4)
Merging slimbus/for-next (a188339ca5a3 Linux 5.2-rc1)
Merging nvmem/for-next (341f8ae0f820 dt-bindings: nvmem: SID: Fix the examples node names)
CONFLICT (content): Merge conflict in drivers/nvmem/meson-mx-efuse.c
CONFLICT (content): Merge conflict in drivers/nvmem/meson-efuse.c
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/arm/freescale/fsl,scu.txt
Merging xarray/xarray (91abab83839a XArray: Fix xas_next() with a single entry at 0)
Merging hyperv/hyperv-next (221f6df008ab hv_balloon: Reorganize the probe function)
Merging auxdisplay/auxdisplay (f4bb1f895aa0 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 (5c4b37bb4972 pidfd: add pidfd_wait tests)
Merging devfreq/for-next (27c17be8e488 PM / devfreq: tegra20: add COMMON_CLK dependency)
Merging hmm/hmm (cc374377a19d mm/hmm: remove hmm_range vma)
Merging fpga/for-next (7d62460b4060 MAINTAINERS: Move linux-fpga tree to new location)
Merging akpm-current/current (160350afba05 ipc/msg.c: consolidate all xxxctl_down() functions)
$ git checkout -b akpm remotes/origin/akpm/master
Applying: pinctrl: fix pxa2xx.c build warnings
Applying: mm: treewide: clarify pgtable_page_{ctor,dtor}() naming
Applying: drivers/tty/serial/sh-sci.c: suppress warning
Applying: drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow
Merging akpm/master (89ff87954200 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] 39+ messages in thread

* Re: linux-next: Tree for Aug 1
  2018-08-02 16:50                     ` Ming Lei
@ 2018-08-02 16:57                       ` Bart Van Assche
  0 siblings, 0 replies; 39+ messages in thread
From: Bart Van Assche @ 2018-08-02 16:57 UTC (permalink / raw)
  To: tom.leiming
  Cc: linux-kernel, linux-ide, linux, hch, axboe, ming.lei, linux-scsi,
	sfr, linux-next, James.Bottomley, josef, tj

On Fri, 2018-08-03 at 00:50 +0800, Ming Lei wrote:
> On Fri, Aug 3, 2018 at 12:40 AM, Bart Van Assche <Bart.VanAssche@wdc.com> wrote:
> > On Fri, 2018-08-03 at 00:27 +0800, Ming Lei wrote:
> > > This issue can be fixed by reverting d250bf4e776ff09d5 ("blk-mq: only iterate over
> > > inflight requests in blk_mq_tagset_busy_iter").
> > > 
> > > This patch looks wrong, because 'blk_mq_rq_state(rq) == MQ_RQ_IN_FLIGHT'
> > > isn't completely same with 'blk_mq_request_started(req)'.
> > 
> > Please test the following change instead of reverting the commit mentioned
> > above:
> > 
> > diff --git a/block/blk-mq-tag.c b/block/blk-mq-tag.c
> > index 09b2ee6694fb..25a0583d8b4c 100644
> > --- a/block/blk-mq-tag.c
> > +++ b/block/blk-mq-tag.c
> > @@ -271,7 +271,7 @@ static bool bt_tags_iter(struct sbitmap *bitmap, unsigned int bitnr, void *data)
> >          * test and set the bit before assining ->rqs[].
> >          */
> >         rq = tags->rqs[bitnr];
> > -       if (rq && blk_mq_rq_state(rq) == MQ_RQ_IN_FLIGHT)
> > +       if (rq && blk_mq_rq_state(rq) != MQ_RQ_IDLE)
> >                 iter_data->fn(rq, iter_data->data, reserved);
> > 
> >         return true;
> > 
> 
> I just sent out a similar patch on list, but use blk_mq_request_started()
> instead.
> 
> https://marc.info/?l=linux-scsi&m=153322823307754&w=2

Hello Ming,

Since both patches are functionally equivalent, I'm fine with either version.

Bart.


^ permalink raw reply	[flat|nested] 39+ messages in thread

* Re: linux-next: Tree for Aug 1
  2018-08-02 16:40                   ` Bart Van Assche
@ 2018-08-02 16:50                     ` Ming Lei
  2018-08-02 16:57                       ` Bart Van Assche
  0 siblings, 1 reply; 39+ messages in thread
From: Ming Lei @ 2018-08-02 16:50 UTC (permalink / raw)
  To: Bart Van Assche
  Cc: linux, ming.lei, linux-ide, linux-kernel, hch, axboe, linux-scsi,
	sfr, linux-next, James.Bottomley, josef, tj

On Fri, Aug 3, 2018 at 12:40 AM, Bart Van Assche <Bart.VanAssche@wdc.com> wrote:
> On Fri, 2018-08-03 at 00:27 +0800, Ming Lei wrote:
>> This issue can be fixed by reverting d250bf4e776ff09d5 ("blk-mq: only iterate over
>> inflight requests in blk_mq_tagset_busy_iter").
>>
>> This patch looks wrong, because 'blk_mq_rq_state(rq) == MQ_RQ_IN_FLIGHT'
>> isn't completely same with 'blk_mq_request_started(req)'.
>
> Please test the following change instead of reverting the commit mentioned
> above:
>
> diff --git a/block/blk-mq-tag.c b/block/blk-mq-tag.c
> index 09b2ee6694fb..25a0583d8b4c 100644
> --- a/block/blk-mq-tag.c
> +++ b/block/blk-mq-tag.c
> @@ -271,7 +271,7 @@ static bool bt_tags_iter(struct sbitmap *bitmap, unsigned int bitnr, void *data)
>          * test and set the bit before assining ->rqs[].
>          */
>         rq = tags->rqs[bitnr];
> -       if (rq && blk_mq_rq_state(rq) == MQ_RQ_IN_FLIGHT)
> +       if (rq && blk_mq_rq_state(rq) != MQ_RQ_IDLE)
>                 iter_data->fn(rq, iter_data->data, reserved);
>
>         return true;
>

I just sent out a similar patch on list, but use blk_mq_request_started()
instead.

https://marc.info/?l=linux-scsi&m=153322823307754&w=2

Thanks,
Ming Lei

^ permalink raw reply	[flat|nested] 39+ messages in thread

* Re: linux-next: Tree for Aug 1
  2018-08-02 16:27                 ` Ming Lei
@ 2018-08-02 16:40                   ` Bart Van Assche
  2018-08-02 16:50                     ` Ming Lei
  0 siblings, 1 reply; 39+ messages in thread
From: Bart Van Assche @ 2018-08-02 16:40 UTC (permalink / raw)
  To: linux, ming.lei
  Cc: linux-ide, linux-kernel, tom.leiming, hch, axboe, linux-scsi,
	sfr, linux-next, James.Bottomley, josef, tj

On Fri, 2018-08-03 at 00:27 +0800, Ming Lei wrote:
> This issue can be fixed by reverting d250bf4e776ff09d5 ("blk-mq: only iterate over
> inflight requests in blk_mq_tagset_busy_iter").
> 
> This patch looks wrong, because 'blk_mq_rq_state(rq) == MQ_RQ_IN_FLIGHT'
> isn't completely same with 'blk_mq_request_started(req)'.

Please test the following change instead of reverting the commit mentioned
above:

diff --git a/block/blk-mq-tag.c b/block/blk-mq-tag.c
index 09b2ee6694fb..25a0583d8b4c 100644
--- a/block/blk-mq-tag.c
+++ b/block/blk-mq-tag.c
@@ -271,7 +271,7 @@ static bool bt_tags_iter(struct sbitmap *bitmap, unsigned int bitnr, void *data)
 	 * test and set the bit before assining ->rqs[].
 	 */
 	rq = tags->rqs[bitnr];
-	if (rq && blk_mq_rq_state(rq) == MQ_RQ_IN_FLIGHT)
+	if (rq && blk_mq_rq_state(rq) != MQ_RQ_IDLE)
 		iter_data->fn(rq, iter_data->data, reserved);
 
 	return true;

Thanks,

Bart.


^ permalink raw reply	[flat|nested] 39+ messages in thread

* Re: linux-next: Tree for Aug 1
  2018-08-02 13:05               ` Guenter Roeck
@ 2018-08-02 16:27                 ` Ming Lei
  2018-08-02 16:40                   ` Bart Van Assche
  0 siblings, 1 reply; 39+ messages in thread
From: Ming Lei @ 2018-08-02 16:27 UTC (permalink / raw)
  To: Guenter Roeck
  Cc: Ming Lei, linux-ide, Tejun Heo, James Bottomley,
	Stephen Rothwell, Linux-Next Mailing List,
	Linux Kernel Mailing List, linux-scsi, Christoph Hellwig,
	Josef Bacik, Jens Axboe

On Thu, Aug 02, 2018 at 06:05:16AM -0700, Guenter Roeck wrote:
> On 08/02/2018 04:35 AM, Ming Lei wrote:
> > On Thu, Aug 2, 2018 at 12:58 PM, Guenter Roeck <linux@roeck-us.net> wrote:
> > > On 08/01/2018 05:03 PM, James Bottomley wrote:
> > > > 
> > > > On Thu, 2018-08-02 at 07:57 +0800, Ming Lei wrote:
> > > > > 
> > > > > On Thu, Aug 2, 2018 at 7:47 AM, Guenter Roeck <linux@roeck-us.net>
> > > > > wrote:
> > > > > > 
> > > > > > On Wed, Aug 01, 2018 at 03:52:45PM -0700, James Bottomley wrote:
> > > > > > > 
> > > > > > > On Wed, 2018-08-01 at 15:48 -0700, Guenter Roeck wrote:
> > > > > > > > 
> > > > > > > > On Wed, Aug 01, 2018 at 05:58:52PM +1000, Stephen Rothwell
> > > > > > > > wrote:
> > > > > > > > > 
> > > > > > > > > Hi all,
> > > > > > > > > 
> > > > > > > > > Changes since 20180731:
> > > > > > > > > 
> > > > > > > > > The pci tree gained a conflict against the pci-current tree.
> > > > > > > > > 
> > > > > > > > > The net-next tree gained a conflict against the bpf tree.
> > > > > > > > > 
> > > > > > > > > The block tree lost its build failure.
> > > > > > > > > 
> > > > > > > > > The staging tree still had its build failure due to an
> > > > > > > > > interaction
> > > > > > > > > with
> > > > > > > > > the vfs tree for which I disabled CONFIG_EROFS_FS.
> > > > > > > > > 
> > > > > > > > > The kspp tree lost its build failure.
> > > > > > > > > 
> > > > > > > > > Non-merge commits (relative to Linus' tree): 10070
> > > > > > > > >    9137 files changed, 417605 insertions(+), 179996 deletions(-
> > > > > > > > > )
> > > > > > > > > 
> > > > > > > > > -----------------------------------------------------------
> > > > > > > > > ------
> > > > > > > > > -----------
> > > > > > > > > 
> > > > > > > > 
> > > > > > > > The widespread kernel hang issues are still seen. I managed
> > > > > > > > to bisect it after working around the transient build failures.
> > > > > > > > Bisect log is attached below. Unfortunately, it doesn't help
> > > > > > > > much.
> > > > > > > > The culprit is reported as:
> > > > > > > > 
> > > > > > > > 2d542828c5e9 Merge remote-tracking branch 'scsi/for-next'
> > > > > > > > 
> > > > > > > > The preceding merge,
> > > > > > > > 
> > > > > > > > 453f1d821165 Merge remote-tracking branch 'cgroup/for-next'
> > > > > > > > 
> > > > > > > > checks out fine, as does the tip of scsi-next (commit
> > > > > > > > 103c7b7e0184,
> > > > > > > > "Merge branch 'misc' into for-next"). No idea how to proceed.
> > > > > > > 
> > > > > > > 
> > > > > > > This sounds like you may have a problem with this patch:
> > > > > > > 
> > > > > > >       commit d5038a13eca72fb216c07eb717169092e92284f1
> > > > > > >        Author: Johannes Thumshirn <jthumshirn@suse.de>
> > > > > > >        Date:   Wed Jul 4 10:53:56 2018 +0200
> > > > > > > 
> > > > > > >            scsi: core: switch to scsi-mq by default
> > > > > > > 
> > > > > > > To verify, boot with the additional kernel parameter
> > > > > > > 
> > > > > > > scsi_mod.use_blk_mq=0
> > > > > > > 
> > > > > > > Which will reverse the effect of the above patch.
> > > > > > > 
> > > > > > 
> > > > > > Yes, that fixes the problem.
> > > > > 
> > > > > 
> > > > > That may not the root cause, given this issue is only started to
> > > > > see from next-20180731, but d5038a13eca7 (scsi: core: switch to
> > > > > scsi-mq by default)
> > > > > has been in -next for quite a while.
> > > > > 
> > > > > Seems something new causes this issue.
> > > > 
> > > > 
> > > > Read my other email about how to find this.
> > > > 
> > > > https://marc.info/?l=linux-scsi&m=153316446223676
> > > > 
> > > > Now that we've confirmed the issue, Gunter, could you attempt to bisect
> > > > it as that email describes?
> > > > 
> > > 
> > > So, I am more and more baffled.
> > > 
> > > I ran another round of bisect, this time each test executing twice,
> > > once with "scsi_mod.use_blk_mq=1" and once with "scsi_mod.use_blk_mq=0",
> > > requiring both to pass. Bisect still points to the merge as culprit.
> > > 
> > > Ok, one step further: Actually _revert_ commit d5038a13eca72 before running
> > > each test, meaning the default is use_blk_mq=0. Still run both tests.
> > > Bisect _still_ points to the merge of scsi-next as culprit.
> > > 
> > > So, to me it looks like the problem is triggered by _something_ in
> > > scsi-next, combined with _something_ in -next prior to the merge,
> > > not specifically associated with use_blk_mq=[0|1] or d5038a13eca72,
> > > but to a combination of some patch in scsi-next and some other patch.
> > 
> > Today I am a bit busy, and not trace it much.
> > 
> > So far, I found the code hangs in scsi_test_unit_ready()
> > <-get_capabilities()<-sr_probe(), and scsi_queue_rq()/ata_scsi_queuecmd()
> > has queued the command successfully, but never completed.
> > 
> > Also tried to revert commits merged to ata tree on 30th, 31th,
> > but no difference.
> > 
> 
> Looking at my commit logs, the problem started to happen after various DMA
> changes were introduced. The boot tests fail on ppc (few), mips (all 32 bit,
> most 64 bit), i386 (all), x86_64 (most). All other platform pass, even with
> the same type of boot tests. Here is an example from alpha:
> 
> Building alpha:defconfig:initrd ... running .... passed
> Building alpha:defconfig:sata:rootfs ... running ..... passed
> Building alpha:defconfig:usb:rootfs ... running ..... passed
> Building alpha:defconfig:usb-uas:rootfs ... running ...... passed
> Building alpha:defconfig:scsi[AM53C974]:rootfs ... running ....... passed
> Building alpha:defconfig:scsi[DC395]:rootfs ... running ....... passed
> Building alpha:defconfig:scsi[MEGASAS]:rootfs ... running ...... passed
> Building alpha:defconfig:scsi[MEGASAS2]:rootfs ... running ...... passed
> Building alpha:defconfig:scsi[FUSION]:rootfs ... running ...... passed
> Building alpha:defconfig:nvme:rootfs ... running ..... passed
> 
> arm64:
> 
> Building arm64:virt:defconfig:smp:initrd ... running ..... passed
> Building arm64:virt:defconfig:smp:usb:rootfs ... running ..... passed
> Building arm64:virt:defconfig:smp:usb-uas:rootfs ... running ..... passed
> Building arm64:virt:defconfig:smp:virtio:rootfs ... running ..... passed
> Building arm64:virt:defconfig:smp:nvme:rootfs ... running ..... passed
> Building arm64:virt:defconfig:smp:mmc:rootfs ... running ..... passed
> Building arm64:virt:defconfig:smp:scsi[DC395]:rootfs ... running ..... passed
> Building arm64:virt:defconfig:smp:scsi[AM53C974]:rootfs ... running ..... passed
> Building arm64:virt:defconfig:smp:scsi[MEGASAS]:rootfs ... running ..... passed
> Building arm64:virt:defconfig:smp:scsi[MEGASAS2]:rootfs ... running ..... passed
> Building arm64:virt:defconfig:smp:scsi[53C810]:rootfs ... running ...... passed
> Building arm64:virt:defconfig:smp:scsi[53C895A]:rootfs ... running ...... passed
> Building arm64:virt:defconfig:smp:scsi[FUSION]:rootfs ... running ...... passed
> Skipping arm64:xlnx-zcu102:defconfig:smp:initrd:xilinx/zynqmp-ep108 ...
> Skipping arm64:xlnx-zcu102:defconfig:smp:sd:rootfs:xilinx/zynqmp-ep108 ...
> Skipping arm64:xlnx-zcu102:defconfig:smp:sata:rootfs:xilinx/zynqmp-ep108 ...
> Building arm64:xlnx-zcu102:defconfig:smp:initrd:xilinx/zynqmp-zcu102-rev1.0 ... running ....... passed
> Building arm64:xlnx-zcu102:defconfig:smp:sd1:rootfs:xilinx/zynqmp-zcu102-rev1.0 ... running ......... passed
> Building arm64:xlnx-zcu102:defconfig:smp:sata:rootfs:xilinx/zynqmp-zcu102-rev1.0 ... running ...... passed
> Building arm64:raspi3:defconfig:smp:initrd:broadcom/bcm2837-rpi-3-b ... running ..... passed
> Building arm64:raspi3:defconfig:smp:sd:rootfs:broadcom/bcm2837-rpi-3-b ... running ........ passed
> Building arm64:virt:defconfig:nosmp:initrd ... running ..... passed
> Skipping arm64:xlnx-zcu102:defconfig:nosmp:initrd:xilinx/zynqmp-ep108 ...
> Skipping arm64:xlnx-zcu102:defconfig:nosmp:sd:rootfs:xilinx/zynqmp-ep108 ...
> Building arm64:xlnx-zcu102:defconfig:nosmp:initrd:xilinx/zynqmp-zcu102-rev1.0 ... running ......... passed
> Building arm64:xlnx-zcu102:defconfig:nosmp:sd1:rootfs:xilinx/zynqmp-zcu102-rev1.0 ... running ......... passed
> 
> ppc:
> 
> Building powerpc:mac99:qemu_ppc_book3s_defconfig:nosmp:rootfs ... running ....... passed
> Building powerpc:g3beige:qemu_ppc_book3s_defconfig:nosmp:rootfs ... running ...... passed
> Building powerpc:mac99:qemu_ppc_book3s_defconfig:smp:rootfs ... running ....... passed
> Building powerpc:virtex-ml507:44x/virtex5_defconfig:devtmpfs:initrd ... running .... passed
> Building powerpc:mpc8544ds:mpc85xx_defconfig:initrd ... running .... passed
> Building powerpc:mpc8544ds:mpc85xx_defconfig:scsi:rootfs ... running ..... passed
> Building powerpc:mpc8544ds:mpc85xx_defconfig:sata:rootfs ... running .... passed
> Building powerpc:mpc8544ds:mpc85xx_smp_defconfig:initrd ... running .... passed
> Building powerpc:mpc8544ds:mpc85xx_smp_defconfig:scsi:rootfs ... running ..... passed
> Building powerpc:mpc8544ds:mpc85xx_smp_defconfig:sata:rootfs ... running .... passed
> Building powerpc:bamboo:44x/bamboo_defconfig:devtmpfs:initrd ... running .... passed
> Building powerpc:bamboo:44x/bamboo_defconfig:devtmpfs:scsi[AM53C974]:rootfs ... running ..... passed
> Building powerpc:bamboo:44x/bamboo_defconfig:devtmpfs:smp:initrd ... running .... passed
> Building powerpc:bamboo:44x/bamboo_defconfig:devtmpfs:smp:scsi[AM53C974]:rootfs ... running ..... passed
> Building powerpc:sam460ex:44x/canyonlands_defconfig:devtmpfs:initrd ... running ..... passed
> Building powerpc:sam460ex:44x/canyonlands_defconfig:devtmpfs:usbdisk:rootfs ... running ...... passed
> Building powerpc:mac99:pmac32_defconfig:devtmpfs:zilog:initrd ... running .................................. failed (timeout)
> Building powerpc:mac99:pmac32_defconfig:devtmpfs:zilog:rootfs ... running .................................. failed (timeout)
> 
> Maybe that is a coincidence, but it is at least suspicious.

This issue can be fixed by reverting d250bf4e776ff09d5 ("blk-mq: only iterate over
inflight requests in blk_mq_tagset_busy_iter").

This patch looks wrong, because 'blk_mq_rq_state(rq) == MQ_RQ_IN_FLIGHT'
isn't completely same with 'blk_mq_request_started(req)'.

Thanks,
Ming

^ permalink raw reply	[flat|nested] 39+ messages in thread

* Re: linux-next: Tree for Aug 1
  2018-08-02 13:00                   ` Guenter Roeck
@ 2018-08-02 13:06                     ` Johannes Thumshirn
  0 siblings, 0 replies; 39+ messages in thread
From: Johannes Thumshirn @ 2018-08-02 13:06 UTC (permalink / raw)
  To: Guenter Roeck
  Cc: Bart Van Assche, James.Bottomley, tom.leiming, sfr, linux-kernel,
	linux-scsi, linux-next

On Thu, Aug 02, 2018 at 06:00:19AM -0700, Guenter Roeck wrote:
> Per my logs, next-20180730 is the first bad, next-20180727 is the last good.

OK, so my bisecting is correct (a bit too much but still).

-- 
Johannes Thumshirn                                          Storage
jthumshirn@suse.de                                +49 911 74053 689
SUSE LINUX GmbH, Maxfeldstr. 5, 90409 Nürnberg
GF: Felix Imendörffer, Jane Smithard, Graham Norton
HRB 21284 (AG Nürnberg)
Key fingerprint = EC38 9CAB C2C4 F25D 8600 D0D0 0393 969D 2D76 0850

^ permalink raw reply	[flat|nested] 39+ messages in thread

* Re: linux-next: Tree for Aug 1
  2018-08-02 11:35             ` Ming Lei
@ 2018-08-02 13:05               ` Guenter Roeck
  2018-08-02 16:27                 ` Ming Lei
  0 siblings, 1 reply; 39+ messages in thread
From: Guenter Roeck @ 2018-08-02 13:05 UTC (permalink / raw)
  To: Ming Lei, linux-ide, Tejun Heo
  Cc: James Bottomley, Stephen Rothwell, Linux-Next Mailing List,
	Linux Kernel Mailing List, linux-scsi, Ming Lei

On 08/02/2018 04:35 AM, Ming Lei wrote:
> On Thu, Aug 2, 2018 at 12:58 PM, Guenter Roeck <linux@roeck-us.net> wrote:
>> On 08/01/2018 05:03 PM, James Bottomley wrote:
>>>
>>> On Thu, 2018-08-02 at 07:57 +0800, Ming Lei wrote:
>>>>
>>>> On Thu, Aug 2, 2018 at 7:47 AM, Guenter Roeck <linux@roeck-us.net>
>>>> wrote:
>>>>>
>>>>> On Wed, Aug 01, 2018 at 03:52:45PM -0700, James Bottomley wrote:
>>>>>>
>>>>>> On Wed, 2018-08-01 at 15:48 -0700, Guenter Roeck wrote:
>>>>>>>
>>>>>>> On Wed, Aug 01, 2018 at 05:58:52PM +1000, Stephen Rothwell
>>>>>>> wrote:
>>>>>>>>
>>>>>>>> Hi all,
>>>>>>>>
>>>>>>>> Changes since 20180731:
>>>>>>>>
>>>>>>>> The pci tree gained a conflict against the pci-current tree.
>>>>>>>>
>>>>>>>> The net-next tree gained a conflict against the bpf tree.
>>>>>>>>
>>>>>>>> The block tree lost its build failure.
>>>>>>>>
>>>>>>>> The staging tree still had its build failure due to an
>>>>>>>> interaction
>>>>>>>> with
>>>>>>>> the vfs tree for which I disabled CONFIG_EROFS_FS.
>>>>>>>>
>>>>>>>> The kspp tree lost its build failure.
>>>>>>>>
>>>>>>>> Non-merge commits (relative to Linus' tree): 10070
>>>>>>>>    9137 files changed, 417605 insertions(+), 179996 deletions(-
>>>>>>>> )
>>>>>>>>
>>>>>>>> -----------------------------------------------------------
>>>>>>>> ------
>>>>>>>> -----------
>>>>>>>>
>>>>>>>
>>>>>>> The widespread kernel hang issues are still seen. I managed
>>>>>>> to bisect it after working around the transient build failures.
>>>>>>> Bisect log is attached below. Unfortunately, it doesn't help
>>>>>>> much.
>>>>>>> The culprit is reported as:
>>>>>>>
>>>>>>> 2d542828c5e9 Merge remote-tracking branch 'scsi/for-next'
>>>>>>>
>>>>>>> The preceding merge,
>>>>>>>
>>>>>>> 453f1d821165 Merge remote-tracking branch 'cgroup/for-next'
>>>>>>>
>>>>>>> checks out fine, as does the tip of scsi-next (commit
>>>>>>> 103c7b7e0184,
>>>>>>> "Merge branch 'misc' into for-next"). No idea how to proceed.
>>>>>>
>>>>>>
>>>>>> This sounds like you may have a problem with this patch:
>>>>>>
>>>>>>       commit d5038a13eca72fb216c07eb717169092e92284f1
>>>>>>        Author: Johannes Thumshirn <jthumshirn@suse.de>
>>>>>>        Date:   Wed Jul 4 10:53:56 2018 +0200
>>>>>>
>>>>>>            scsi: core: switch to scsi-mq by default
>>>>>>
>>>>>> To verify, boot with the additional kernel parameter
>>>>>>
>>>>>> scsi_mod.use_blk_mq=0
>>>>>>
>>>>>> Which will reverse the effect of the above patch.
>>>>>>
>>>>>
>>>>> Yes, that fixes the problem.
>>>>
>>>>
>>>> That may not the root cause, given this issue is only started to
>>>> see from next-20180731, but d5038a13eca7 (scsi: core: switch to
>>>> scsi-mq by default)
>>>> has been in -next for quite a while.
>>>>
>>>> Seems something new causes this issue.
>>>
>>>
>>> Read my other email about how to find this.
>>>
>>> https://marc.info/?l=linux-scsi&m=153316446223676
>>>
>>> Now that we've confirmed the issue, Gunter, could you attempt to bisect
>>> it as that email describes?
>>>
>>
>> So, I am more and more baffled.
>>
>> I ran another round of bisect, this time each test executing twice,
>> once with "scsi_mod.use_blk_mq=1" and once with "scsi_mod.use_blk_mq=0",
>> requiring both to pass. Bisect still points to the merge as culprit.
>>
>> Ok, one step further: Actually _revert_ commit d5038a13eca72 before running
>> each test, meaning the default is use_blk_mq=0. Still run both tests.
>> Bisect _still_ points to the merge of scsi-next as culprit.
>>
>> So, to me it looks like the problem is triggered by _something_ in
>> scsi-next, combined with _something_ in -next prior to the merge,
>> not specifically associated with use_blk_mq=[0|1] or d5038a13eca72,
>> but to a combination of some patch in scsi-next and some other patch.
> 
> Today I am a bit busy, and not trace it much.
> 
> So far, I found the code hangs in scsi_test_unit_ready()
> <-get_capabilities()<-sr_probe(), and scsi_queue_rq()/ata_scsi_queuecmd()
> has queued the command successfully, but never completed.
> 
> Also tried to revert commits merged to ata tree on 30th, 31th,
> but no difference.
> 

Looking at my commit logs, the problem started to happen after various DMA
changes were introduced. The boot tests fail on ppc (few), mips (all 32 bit,
most 64 bit), i386 (all), x86_64 (most). All other platform pass, even with
the same type of boot tests. Here is an example from alpha:

Building alpha:defconfig:initrd ... running .... passed
Building alpha:defconfig:sata:rootfs ... running ..... passed
Building alpha:defconfig:usb:rootfs ... running ..... passed
Building alpha:defconfig:usb-uas:rootfs ... running ...... passed
Building alpha:defconfig:scsi[AM53C974]:rootfs ... running ....... passed
Building alpha:defconfig:scsi[DC395]:rootfs ... running ....... passed
Building alpha:defconfig:scsi[MEGASAS]:rootfs ... running ...... passed
Building alpha:defconfig:scsi[MEGASAS2]:rootfs ... running ...... passed
Building alpha:defconfig:scsi[FUSION]:rootfs ... running ...... passed
Building alpha:defconfig:nvme:rootfs ... running ..... passed

arm64:

Building arm64:virt:defconfig:smp:initrd ... running ..... passed
Building arm64:virt:defconfig:smp:usb:rootfs ... running ..... passed
Building arm64:virt:defconfig:smp:usb-uas:rootfs ... running ..... passed
Building arm64:virt:defconfig:smp:virtio:rootfs ... running ..... passed
Building arm64:virt:defconfig:smp:nvme:rootfs ... running ..... passed
Building arm64:virt:defconfig:smp:mmc:rootfs ... running ..... passed
Building arm64:virt:defconfig:smp:scsi[DC395]:rootfs ... running ..... passed
Building arm64:virt:defconfig:smp:scsi[AM53C974]:rootfs ... running ..... passed
Building arm64:virt:defconfig:smp:scsi[MEGASAS]:rootfs ... running ..... passed
Building arm64:virt:defconfig:smp:scsi[MEGASAS2]:rootfs ... running ..... passed
Building arm64:virt:defconfig:smp:scsi[53C810]:rootfs ... running ...... passed
Building arm64:virt:defconfig:smp:scsi[53C895A]:rootfs ... running ...... passed
Building arm64:virt:defconfig:smp:scsi[FUSION]:rootfs ... running ...... passed
Skipping arm64:xlnx-zcu102:defconfig:smp:initrd:xilinx/zynqmp-ep108 ...
Skipping arm64:xlnx-zcu102:defconfig:smp:sd:rootfs:xilinx/zynqmp-ep108 ...
Skipping arm64:xlnx-zcu102:defconfig:smp:sata:rootfs:xilinx/zynqmp-ep108 ...
Building arm64:xlnx-zcu102:defconfig:smp:initrd:xilinx/zynqmp-zcu102-rev1.0 ... running ....... passed
Building arm64:xlnx-zcu102:defconfig:smp:sd1:rootfs:xilinx/zynqmp-zcu102-rev1.0 ... running ......... passed
Building arm64:xlnx-zcu102:defconfig:smp:sata:rootfs:xilinx/zynqmp-zcu102-rev1.0 ... running ...... passed
Building arm64:raspi3:defconfig:smp:initrd:broadcom/bcm2837-rpi-3-b ... running ..... passed
Building arm64:raspi3:defconfig:smp:sd:rootfs:broadcom/bcm2837-rpi-3-b ... running ........ passed
Building arm64:virt:defconfig:nosmp:initrd ... running ..... passed
Skipping arm64:xlnx-zcu102:defconfig:nosmp:initrd:xilinx/zynqmp-ep108 ...
Skipping arm64:xlnx-zcu102:defconfig:nosmp:sd:rootfs:xilinx/zynqmp-ep108 ...
Building arm64:xlnx-zcu102:defconfig:nosmp:initrd:xilinx/zynqmp-zcu102-rev1.0 ... running ......... passed
Building arm64:xlnx-zcu102:defconfig:nosmp:sd1:rootfs:xilinx/zynqmp-zcu102-rev1.0 ... running ......... passed

ppc:

Building powerpc:mac99:qemu_ppc_book3s_defconfig:nosmp:rootfs ... running ....... passed
Building powerpc:g3beige:qemu_ppc_book3s_defconfig:nosmp:rootfs ... running ...... passed
Building powerpc:mac99:qemu_ppc_book3s_defconfig:smp:rootfs ... running ....... passed
Building powerpc:virtex-ml507:44x/virtex5_defconfig:devtmpfs:initrd ... running .... passed
Building powerpc:mpc8544ds:mpc85xx_defconfig:initrd ... running .... passed
Building powerpc:mpc8544ds:mpc85xx_defconfig:scsi:rootfs ... running ..... passed
Building powerpc:mpc8544ds:mpc85xx_defconfig:sata:rootfs ... running .... passed
Building powerpc:mpc8544ds:mpc85xx_smp_defconfig:initrd ... running .... passed
Building powerpc:mpc8544ds:mpc85xx_smp_defconfig:scsi:rootfs ... running ..... passed
Building powerpc:mpc8544ds:mpc85xx_smp_defconfig:sata:rootfs ... running .... passed
Building powerpc:bamboo:44x/bamboo_defconfig:devtmpfs:initrd ... running .... passed
Building powerpc:bamboo:44x/bamboo_defconfig:devtmpfs:scsi[AM53C974]:rootfs ... running ..... passed
Building powerpc:bamboo:44x/bamboo_defconfig:devtmpfs:smp:initrd ... running .... passed
Building powerpc:bamboo:44x/bamboo_defconfig:devtmpfs:smp:scsi[AM53C974]:rootfs ... running ..... passed
Building powerpc:sam460ex:44x/canyonlands_defconfig:devtmpfs:initrd ... running ..... passed
Building powerpc:sam460ex:44x/canyonlands_defconfig:devtmpfs:usbdisk:rootfs ... running ...... passed
Building powerpc:mac99:pmac32_defconfig:devtmpfs:zilog:initrd ... running .................................. failed (timeout)
Building powerpc:mac99:pmac32_defconfig:devtmpfs:zilog:rootfs ... running .................................. failed (timeout)

Maybe that is a coincidence, but it is at least suspicious.

Guenter

^ permalink raw reply	[flat|nested] 39+ messages in thread

* Re: linux-next: Tree for Aug 1
  2018-08-02 12:51                 ` Johannes Thumshirn
@ 2018-08-02 13:00                   ` Guenter Roeck
  2018-08-02 13:06                     ` Johannes Thumshirn
  0 siblings, 1 reply; 39+ messages in thread
From: Guenter Roeck @ 2018-08-02 13:00 UTC (permalink / raw)
  To: Johannes Thumshirn
  Cc: Bart Van Assche, James.Bottomley, tom.leiming, sfr, linux-kernel,
	linux-scsi, linux-next

On 08/02/2018 05:51 AM, Johannes Thumshirn wrote:
> On Thu, Aug 02, 2018 at 05:46:19AM -0700, Guenter Roeck wrote:
>> This is consistent across multiple test runs. In summary,
>>
>> - Boot from initrd fails
>> - Boot from SATA drive fails (this is with CONFIG_ATA)
>> - Boot from NVME fails
>> - Boot from USB drive fails
>> - Boot from MMC (SD) fails
>> - Boot from USB UAS drive passes
>> - Boot from various real SCSI drives passes
>>
>> Platform (pc,q35), CPU type, or SMP/NOSMP does not seem to make a difference.
> 
> OK. I try to bisect between next-20180727 (known good) and
> next-20180731 (known bad) with forced scsi_mod.use_blk_mq=1, but so
> far the only bad I've seen is next-20180731.
> 

Per my logs, next-20180730 is the first bad, next-20180727 is the last good.

Guenter

^ permalink raw reply	[flat|nested] 39+ messages in thread

* Re: linux-next: Tree for Aug 1
  2018-08-02 12:46               ` Guenter Roeck
@ 2018-08-02 12:51                 ` Johannes Thumshirn
  2018-08-02 13:00                   ` Guenter Roeck
  0 siblings, 1 reply; 39+ messages in thread
From: Johannes Thumshirn @ 2018-08-02 12:51 UTC (permalink / raw)
  To: Guenter Roeck
  Cc: Bart Van Assche, James.Bottomley, tom.leiming, sfr, linux-kernel,
	linux-scsi, linux-next

On Thu, Aug 02, 2018 at 05:46:19AM -0700, Guenter Roeck wrote:
> This is consistent across multiple test runs. In summary,
> 
> - Boot from initrd fails
> - Boot from SATA drive fails (this is with CONFIG_ATA)
> - Boot from NVME fails
> - Boot from USB drive fails
> - Boot from MMC (SD) fails
> - Boot from USB UAS drive passes
> - Boot from various real SCSI drives passes
> 
> Platform (pc,q35), CPU type, or SMP/NOSMP does not seem to make a difference.

OK. I try to bisect between next-20180727 (known good) and
next-20180731 (known bad) with forced scsi_mod.use_blk_mq=1, but so
far the only bad I've seen is next-20180731.

Byte,
	Johannes
-- 
Johannes Thumshirn                                          Storage
jthumshirn@suse.de                                +49 911 74053 689
SUSE LINUX GmbH, Maxfeldstr. 5, 90409 Nürnberg
GF: Felix Imendörffer, Jane Smithard, Graham Norton
HRB 21284 (AG Nürnberg)
Key fingerprint = EC38 9CAB C2C4 F25D 8600 D0D0 0393 969D 2D76 0850

^ permalink raw reply	[flat|nested] 39+ messages in thread

* Re: linux-next: Tree for Aug 1
  2018-08-02  5:04             ` Bart Van Assche
@ 2018-08-02 12:46               ` Guenter Roeck
  2018-08-02 12:51                 ` Johannes Thumshirn
  0 siblings, 1 reply; 39+ messages in thread
From: Guenter Roeck @ 2018-08-02 12:46 UTC (permalink / raw)
  To: Bart Van Assche, James.Bottomley, tom.leiming
  Cc: sfr, linux-kernel, linux-scsi, linux-next

On 08/01/2018 10:04 PM, Bart Van Assche wrote:
> On Wed, 2018-08-01 at 21:58 -0700, Guenter Roeck wrote:
>> I am running out of ideas. Any thoughts on how to track this down further ?
> 
> Is a shell available when the hang occurs? If so, it would be helpful if you
> could provide a dump of the information in /sys/kernel/debug/block. There is
> namely detailed information in that directory about pending commands.
> 

No, it hangs hard early in the boot process. See various logs at
http://kerneltests.org/builders/, in the 'next' column.

Here is some interesting information from the x86_64 boot tests.

Building x86_64:q35:Broadwell-noTSX:defconfig:smp:sata:rootfs ... running .................................. failed (timeout)
Building x86_64:q35:IvyBridge:defconfig:smp:nvme:rootfs ... running .................................. failed (timeout)
Building x86_64:q35:SandyBridge:defconfig:smp:usb:rootfs ... running .................................. failed (timeout)
Building x86_64:q35:Haswell:defconfig:smp:usb-uas:rootfs ... running ...... passed
Building x86_64:q35:Skylake-Client:defconfig:smp:mmc:rootfs ... running .................................. failed (timeout)
Building x86_64:q35:Conroe:defconfig:smp:scsi[DC395]:rootfs ... running ........ passed
Building x86_64:q35:Nehalem:defconfig:smp:scsi[AM53C974]:rootfs ... running ...... passed
Building x86_64:q35:Westmere-IBRS:defconfig:smp:scsi[53C810]:rootfs ... running ....... passed
Building x86_64:q35:Skylake-Server:defconfig:smp:scsi[53C895A]:rootfs ... running ....... passed
Building x86_64:pc:EPYC:defconfig:smp:scsi[MEGASAS]:rootfs ... running ...... passed
Building x86_64:q35:EPYC-IBPB:defconfig:smp:scsi[MEGASAS2]:rootfs ... running ....... passed
Building x86_64:q35:Opteron_G5:defconfig:smp:scsi[FUSION]:rootfs ... running ....... passed
Building x86_64:pc:phenom:defconfig:smp:initrd ... running .................................. failed (timeout)
Building x86_64:q35:Opteron_G1:defconfig:smp:initrd ... running .................................. failed (timeout)
Building x86_64:pc:Opteron_G2:defconfig:smp:sata:rootfs ... running .................................. failed (timeout)
Building x86_64:q35:core2duo:defconfig:smp:usb:rootfs ... running .................................. failed (timeout)
Building x86_64:pc:Opteron_G3:defconfig:nosmp:usb:rootfs ... running .................................. failed (timeout)
Building x86_64:q35:Opteron_G4:defconfig:nosmp:sata:rootfs ... running .................................. failed (timeout)

This is consistent across multiple test runs. In summary,

- Boot from initrd fails
- Boot from SATA drive fails (this is with CONFIG_ATA)
- Boot from NVME fails
- Boot from USB drive fails
- Boot from MMC (SD) fails
- Boot from USB UAS drive passes
- Boot from various real SCSI drives passes

Platform (pc,q35), CPU type, or SMP/NOSMP does not seem to make a difference.

Guenter

^ permalink raw reply	[flat|nested] 39+ messages in thread

* Re: linux-next: Tree for Aug 1
  2018-08-02  4:58           ` Guenter Roeck
  2018-08-02  5:04             ` Bart Van Assche
@ 2018-08-02 11:35             ` Ming Lei
  2018-08-02 13:05               ` Guenter Roeck
  1 sibling, 1 reply; 39+ messages in thread
From: Ming Lei @ 2018-08-02 11:35 UTC (permalink / raw)
  To: Guenter Roeck, linux-ide, Tejun Heo
  Cc: James Bottomley, Stephen Rothwell, Linux-Next Mailing List,
	Linux Kernel Mailing List, linux-scsi, Ming Lei

On Thu, Aug 2, 2018 at 12:58 PM, Guenter Roeck <linux@roeck-us.net> wrote:
> On 08/01/2018 05:03 PM, James Bottomley wrote:
>>
>> On Thu, 2018-08-02 at 07:57 +0800, Ming Lei wrote:
>>>
>>> On Thu, Aug 2, 2018 at 7:47 AM, Guenter Roeck <linux@roeck-us.net>
>>> wrote:
>>>>
>>>> On Wed, Aug 01, 2018 at 03:52:45PM -0700, James Bottomley wrote:
>>>>>
>>>>> On Wed, 2018-08-01 at 15:48 -0700, Guenter Roeck wrote:
>>>>>>
>>>>>> On Wed, Aug 01, 2018 at 05:58:52PM +1000, Stephen Rothwell
>>>>>> wrote:
>>>>>>>
>>>>>>> Hi all,
>>>>>>>
>>>>>>> Changes since 20180731:
>>>>>>>
>>>>>>> The pci tree gained a conflict against the pci-current tree.
>>>>>>>
>>>>>>> The net-next tree gained a conflict against the bpf tree.
>>>>>>>
>>>>>>> The block tree lost its build failure.
>>>>>>>
>>>>>>> The staging tree still had its build failure due to an
>>>>>>> interaction
>>>>>>> with
>>>>>>> the vfs tree for which I disabled CONFIG_EROFS_FS.
>>>>>>>
>>>>>>> The kspp tree lost its build failure.
>>>>>>>
>>>>>>> Non-merge commits (relative to Linus' tree): 10070
>>>>>>>   9137 files changed, 417605 insertions(+), 179996 deletions(-
>>>>>>> )
>>>>>>>
>>>>>>> -----------------------------------------------------------
>>>>>>> ------
>>>>>>> -----------
>>>>>>>
>>>>>>
>>>>>> The widespread kernel hang issues are still seen. I managed
>>>>>> to bisect it after working around the transient build failures.
>>>>>> Bisect log is attached below. Unfortunately, it doesn't help
>>>>>> much.
>>>>>> The culprit is reported as:
>>>>>>
>>>>>> 2d542828c5e9 Merge remote-tracking branch 'scsi/for-next'
>>>>>>
>>>>>> The preceding merge,
>>>>>>
>>>>>> 453f1d821165 Merge remote-tracking branch 'cgroup/for-next'
>>>>>>
>>>>>> checks out fine, as does the tip of scsi-next (commit
>>>>>> 103c7b7e0184,
>>>>>> "Merge branch 'misc' into for-next"). No idea how to proceed.
>>>>>
>>>>>
>>>>> This sounds like you may have a problem with this patch:
>>>>>
>>>>>      commit d5038a13eca72fb216c07eb717169092e92284f1
>>>>>       Author: Johannes Thumshirn <jthumshirn@suse.de>
>>>>>       Date:   Wed Jul 4 10:53:56 2018 +0200
>>>>>
>>>>>           scsi: core: switch to scsi-mq by default
>>>>>
>>>>> To verify, boot with the additional kernel parameter
>>>>>
>>>>> scsi_mod.use_blk_mq=0
>>>>>
>>>>> Which will reverse the effect of the above patch.
>>>>>
>>>>
>>>> Yes, that fixes the problem.
>>>
>>>
>>> That may not the root cause, given this issue is only started to
>>> see from next-20180731, but d5038a13eca7 (scsi: core: switch to
>>> scsi-mq by default)
>>> has been in -next for quite a while.
>>>
>>> Seems something new causes this issue.
>>
>>
>> Read my other email about how to find this.
>>
>> https://marc.info/?l=linux-scsi&m=153316446223676
>>
>> Now that we've confirmed the issue, Gunter, could you attempt to bisect
>> it as that email describes?
>>
>
> So, I am more and more baffled.
>
> I ran another round of bisect, this time each test executing twice,
> once with "scsi_mod.use_blk_mq=1" and once with "scsi_mod.use_blk_mq=0",
> requiring both to pass. Bisect still points to the merge as culprit.
>
> Ok, one step further: Actually _revert_ commit d5038a13eca72 before running
> each test, meaning the default is use_blk_mq=0. Still run both tests.
> Bisect _still_ points to the merge of scsi-next as culprit.
>
> So, to me it looks like the problem is triggered by _something_ in
> scsi-next, combined with _something_ in -next prior to the merge,
> not specifically associated with use_blk_mq=[0|1] or d5038a13eca72,
> but to a combination of some patch in scsi-next and some other patch.

Today I am a bit busy, and not trace it much.

So far, I found the code hangs in scsi_test_unit_ready()
<-get_capabilities()<-sr_probe(), and scsi_queue_rq()/ata_scsi_queuecmd()
has queued the command successfully, but never completed.

Also tried to revert commits merged to ata tree on 30th, 31th,
but no difference.


Thanks,
Ming Lei

^ permalink raw reply	[flat|nested] 39+ messages in thread

* Re: linux-next: Tree for Aug 1
  2018-08-02  4:58           ` Guenter Roeck
@ 2018-08-02  5:04             ` Bart Van Assche
  2018-08-02 12:46               ` Guenter Roeck
  2018-08-02 11:35             ` Ming Lei
  1 sibling, 1 reply; 39+ messages in thread
From: Bart Van Assche @ 2018-08-02  5:04 UTC (permalink / raw)
  To: linux, James.Bottomley, tom.leiming
  Cc: sfr, linux-kernel, linux-scsi, linux-next

On Wed, 2018-08-01 at 21:58 -0700, Guenter Roeck wrote:
> I am running out of ideas. Any thoughts on how to track this down further ?

Is a shell available when the hang occurs? If so, it would be helpful if you
could provide a dump of the information in /sys/kernel/debug/block. There is
namely detailed information in that directory about pending commands.

Bart.



^ permalink raw reply	[flat|nested] 39+ messages in thread

* Re: linux-next: Tree for Aug 1
  2018-08-02  0:03         ` James Bottomley
  2018-08-02  0:20           ` Guenter Roeck
@ 2018-08-02  4:58           ` Guenter Roeck
  2018-08-02  5:04             ` Bart Van Assche
  2018-08-02 11:35             ` Ming Lei
  1 sibling, 2 replies; 39+ messages in thread
From: Guenter Roeck @ 2018-08-02  4:58 UTC (permalink / raw)
  To: James Bottomley, Ming Lei
  Cc: Stephen Rothwell, Linux-Next Mailing List,
	Linux Kernel Mailing List, linux-scsi

On 08/01/2018 05:03 PM, James Bottomley wrote:
> On Thu, 2018-08-02 at 07:57 +0800, Ming Lei wrote:
>> On Thu, Aug 2, 2018 at 7:47 AM, Guenter Roeck <linux@roeck-us.net>
>> wrote:
>>> On Wed, Aug 01, 2018 at 03:52:45PM -0700, James Bottomley wrote:
>>>> On Wed, 2018-08-01 at 15:48 -0700, Guenter Roeck wrote:
>>>>> On Wed, Aug 01, 2018 at 05:58:52PM +1000, Stephen Rothwell
>>>>> wrote:
>>>>>> Hi all,
>>>>>>
>>>>>> Changes since 20180731:
>>>>>>
>>>>>> The pci tree gained a conflict against the pci-current tree.
>>>>>>
>>>>>> The net-next tree gained a conflict against the bpf tree.
>>>>>>
>>>>>> The block tree lost its build failure.
>>>>>>
>>>>>> The staging tree still had its build failure due to an
>>>>>> interaction
>>>>>> with
>>>>>> the vfs tree for which I disabled CONFIG_EROFS_FS.
>>>>>>
>>>>>> The kspp tree lost its build failure.
>>>>>>
>>>>>> Non-merge commits (relative to Linus' tree): 10070
>>>>>>   9137 files changed, 417605 insertions(+), 179996 deletions(-
>>>>>> )
>>>>>>
>>>>>> -----------------------------------------------------------
>>>>>> ------
>>>>>> -----------
>>>>>>
>>>>>
>>>>> The widespread kernel hang issues are still seen. I managed
>>>>> to bisect it after working around the transient build failures.
>>>>> Bisect log is attached below. Unfortunately, it doesn't help
>>>>> much.
>>>>> The culprit is reported as:
>>>>>
>>>>> 2d542828c5e9 Merge remote-tracking branch 'scsi/for-next'
>>>>>
>>>>> The preceding merge,
>>>>>
>>>>> 453f1d821165 Merge remote-tracking branch 'cgroup/for-next'
>>>>>
>>>>> checks out fine, as does the tip of scsi-next (commit
>>>>> 103c7b7e0184,
>>>>> "Merge branch 'misc' into for-next"). No idea how to proceed.
>>>>
>>>> This sounds like you may have a problem with this patch:
>>>>
>>>>      commit d5038a13eca72fb216c07eb717169092e92284f1
>>>>       Author: Johannes Thumshirn <jthumshirn@suse.de>
>>>>       Date:   Wed Jul 4 10:53:56 2018 +0200
>>>>
>>>>           scsi: core: switch to scsi-mq by default
>>>>
>>>> To verify, boot with the additional kernel parameter
>>>>
>>>> scsi_mod.use_blk_mq=0
>>>>
>>>> Which will reverse the effect of the above patch.
>>>>
>>>
>>> Yes, that fixes the problem.
>>
>> That may not the root cause, given this issue is only started to
>> see from next-20180731, but d5038a13eca7 (scsi: core: switch to
>> scsi-mq by default)
>> has been in -next for quite a while.
>>
>> Seems something new causes this issue.
> 
> Read my other email about how to find this.
> 
> https://marc.info/?l=linux-scsi&m=153316446223676
> 
> Now that we've confirmed the issue, Gunter, could you attempt to bisect
> it as that email describes?
> 

So, I am more and more baffled.

I ran another round of bisect, this time each test executing twice,
once with "scsi_mod.use_blk_mq=1" and once with "scsi_mod.use_blk_mq=0",
requiring both to pass. Bisect still points to the merge as culprit.

Ok, one step further: Actually _revert_ commit d5038a13eca72 before running
each test, meaning the default is use_blk_mq=0. Still run both tests.
Bisect _still_ points to the merge of scsi-next as culprit.

So, to me it looks like the problem is triggered by _something_ in
scsi-next, combined with _something_ in -next prior to the merge,
not specifically associated with use_blk_mq=[0|1] or d5038a13eca72,
but to a combination of some patch in scsi-next and some other patch.

I am running out of ideas. Any thoughts on how to track this down further ?

Guenter

^ permalink raw reply	[flat|nested] 39+ messages in thread

* Re: linux-next: Tree for Aug 1
  2018-08-02  0:05       ` Stephen Rothwell
@ 2018-08-02  1:19         ` Guenter Roeck
  0 siblings, 0 replies; 39+ messages in thread
From: Guenter Roeck @ 2018-08-02  1:19 UTC (permalink / raw)
  To: Stephen Rothwell, James Bottomley
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List, linux-scsi

On 08/01/2018 05:05 PM, Stephen Rothwell wrote:
> Hi all,
> 
> On Wed, 01 Aug 2018 16:00:54 -0700 James Bottomley <James.Bottomley@HansenPartnership.com> wrote:
>>
>> So what seems to be happening to cause this is that there's a patch
>> somewhere between the merge base of my scsi-next series and the next
>> tree and the patch just before scsi-next was actually merged that
>> actually causes a boot failure with blk-mq enabled.  Could you try to
>> find this patch?  I think the way to do it is to try to bisect this
>> range of linux-next using the command line
>>
>> scsi_mod.use_blk_mq=1
>>
>> Which forces block mq to be the default and seeing where the first boot
>> failure is (you don't need my scsi-next tree merged to do this because
>> all the offending patch does is flip the default state of the above
>> flag).
> 
> So this means using v4.8-rc1 as the first good commit and 453f1d821165
> ("Merge remote-tracking branch 'cgroup/for-next'") as the first bad
> (assuming that this latter fails to boot with "scsi_mod.use_blk_mq=1").
> 

Puzzled. Same results. 453f1d821165 works with both scsi_mod.use_blk_mq=0
and scsi_mod.use_blk_mq=1. next-20180801 works with scsi_mod.use_blk_mq=0
and fails with scsi_mod.use_blk_mq=1. Bisect still points to the same commit
(which just changes the default) as culprit. I know that doesn't make sense.
I'll need to think about it.

Guenter

^ permalink raw reply	[flat|nested] 39+ messages in thread

* Re: linux-next: Tree for Aug 1
  2018-08-02  0:03         ` James Bottomley
@ 2018-08-02  0:20           ` Guenter Roeck
  2018-08-02  4:58           ` Guenter Roeck
  1 sibling, 0 replies; 39+ messages in thread
From: Guenter Roeck @ 2018-08-02  0:20 UTC (permalink / raw)
  To: James Bottomley, Ming Lei
  Cc: Stephen Rothwell, Linux-Next Mailing List,
	Linux Kernel Mailing List, linux-scsi

On 08/01/2018 05:03 PM, James Bottomley wrote:
> On Thu, 2018-08-02 at 07:57 +0800, Ming Lei wrote:
>> On Thu, Aug 2, 2018 at 7:47 AM, Guenter Roeck <linux@roeck-us.net>
>> wrote:
>>> On Wed, Aug 01, 2018 at 03:52:45PM -0700, James Bottomley wrote:
>>>> On Wed, 2018-08-01 at 15:48 -0700, Guenter Roeck wrote:
>>>>> On Wed, Aug 01, 2018 at 05:58:52PM +1000, Stephen Rothwell
>>>>> wrote:
>>>>>> Hi all,
>>>>>>
>>>>>> Changes since 20180731:
>>>>>>
>>>>>> The pci tree gained a conflict against the pci-current tree.
>>>>>>
>>>>>> The net-next tree gained a conflict against the bpf tree.
>>>>>>
>>>>>> The block tree lost its build failure.
>>>>>>
>>>>>> The staging tree still had its build failure due to an
>>>>>> interaction
>>>>>> with
>>>>>> the vfs tree for which I disabled CONFIG_EROFS_FS.
>>>>>>
>>>>>> The kspp tree lost its build failure.
>>>>>>
>>>>>> Non-merge commits (relative to Linus' tree): 10070
>>>>>>   9137 files changed, 417605 insertions(+), 179996 deletions(-
>>>>>> )
>>>>>>
>>>>>> -----------------------------------------------------------
>>>>>> ------
>>>>>> -----------
>>>>>>
>>>>>
>>>>> The widespread kernel hang issues are still seen. I managed
>>>>> to bisect it after working around the transient build failures.
>>>>> Bisect log is attached below. Unfortunately, it doesn't help
>>>>> much.
>>>>> The culprit is reported as:
>>>>>
>>>>> 2d542828c5e9 Merge remote-tracking branch 'scsi/for-next'
>>>>>
>>>>> The preceding merge,
>>>>>
>>>>> 453f1d821165 Merge remote-tracking branch 'cgroup/for-next'
>>>>>
>>>>> checks out fine, as does the tip of scsi-next (commit
>>>>> 103c7b7e0184,
>>>>> "Merge branch 'misc' into for-next"). No idea how to proceed.
>>>>
>>>> This sounds like you may have a problem with this patch:
>>>>
>>>>      commit d5038a13eca72fb216c07eb717169092e92284f1
>>>>       Author: Johannes Thumshirn <jthumshirn@suse.de>
>>>>       Date:   Wed Jul 4 10:53:56 2018 +0200
>>>>
>>>>           scsi: core: switch to scsi-mq by default
>>>>
>>>> To verify, boot with the additional kernel parameter
>>>>
>>>> scsi_mod.use_blk_mq=0
>>>>
>>>> Which will reverse the effect of the above patch.
>>>>
>>>
>>> Yes, that fixes the problem.
>>
>> That may not the root cause, given this issue is only started to
>> see from next-20180731, but d5038a13eca7 (scsi: core: switch to
>> scsi-mq by default)
>> has been in -next for quite a while.
>>
>> Seems something new causes this issue.
> 
> Read my other email about how to find this.
> 
> https://marc.info/?l=linux-scsi&m=153316446223676
> 
> Now that we've confirmed the issue, Gunter, could you attempt to bisect
> it as that email describes?
> 

Already working on it.

Guenter

^ permalink raw reply	[flat|nested] 39+ messages in thread

* Re: linux-next: Tree for Aug 1
  2018-08-01 23:57       ` Ming Lei
  2018-08-02  0:03         ` James Bottomley
@ 2018-08-02  0:12         ` Guenter Roeck
  1 sibling, 0 replies; 39+ messages in thread
From: Guenter Roeck @ 2018-08-02  0:12 UTC (permalink / raw)
  To: Ming Lei
  Cc: James Bottomley, Stephen Rothwell, Linux-Next Mailing List,
	Linux Kernel Mailing List, linux-scsi

On 08/01/2018 04:57 PM, Ming Lei wrote:
> On Thu, Aug 2, 2018 at 7:47 AM, Guenter Roeck <linux@roeck-us.net> wrote:
>> On Wed, Aug 01, 2018 at 03:52:45PM -0700, James Bottomley wrote:
>>> On Wed, 2018-08-01 at 15:48 -0700, Guenter Roeck wrote:
>>>> On Wed, Aug 01, 2018 at 05:58:52PM +1000, Stephen Rothwell wrote:
>>>>> Hi all,
>>>>>
>>>>> Changes since 20180731:
>>>>>
>>>>> The pci tree gained a conflict against the pci-current tree.
>>>>>
>>>>> The net-next tree gained a conflict against the bpf tree.
>>>>>
>>>>> The block tree lost its build failure.
>>>>>
>>>>> The staging tree still had its build failure due to an interaction
>>>>> with
>>>>> the vfs tree for which I disabled CONFIG_EROFS_FS.
>>>>>
>>>>> The kspp tree lost its build failure.
>>>>>
>>>>> Non-merge commits (relative to Linus' tree): 10070
>>>>>   9137 files changed, 417605 insertions(+), 179996 deletions(-)
>>>>>
>>>>> -----------------------------------------------------------------
>>>>> -----------
>>>>>
>>>>
>>>> The widespread kernel hang issues are still seen. I managed
>>>> to bisect it after working around the transient build failures.
>>>> Bisect log is attached below. Unfortunately, it doesn't help much.
>>>> The culprit is reported as:
>>>>
>>>> 2d542828c5e9 Merge remote-tracking branch 'scsi/for-next'
>>>>
>>>> The preceding merge,
>>>>
>>>> 453f1d821165 Merge remote-tracking branch 'cgroup/for-next'
>>>>
>>>> checks out fine, as does the tip of scsi-next (commit 103c7b7e0184,
>>>> "Merge branch 'misc' into for-next"). No idea how to proceed.
>>>
>>> This sounds like you may have a problem with this patch:
>>>
>>>      commit d5038a13eca72fb216c07eb717169092e92284f1
>>>       Author: Johannes Thumshirn <jthumshirn@suse.de>
>>>       Date:   Wed Jul 4 10:53:56 2018 +0200
>>>
>>>           scsi: core: switch to scsi-mq by default
>>>
>>> To verify, boot with the additional kernel parameter
>>>
>>> scsi_mod.use_blk_mq=0
>>>
>>> Which will reverse the effect of the above patch.
>>>
>> Yes, that fixes the problem.
> 
> That may not the root cause, given this issue is only started to
> see from next-20180731, but d5038a13eca7 (scsi: core: switch to
> scsi-mq by default)
> has been in -next for quite a while.
> 
> Seems something new causes this issue.
> 

Agreed. I should have said "fixes the symptom". I'll try to bisect
with scsi_mod.use_blk_mq=1 as suggested by James.

Guenter


^ permalink raw reply	[flat|nested] 39+ messages in thread

* Re: linux-next: Tree for Aug 1
  2018-08-01 23:00     ` James Bottomley
@ 2018-08-02  0:05       ` Stephen Rothwell
  2018-08-02  1:19         ` Guenter Roeck
  0 siblings, 1 reply; 39+ messages in thread
From: Stephen Rothwell @ 2018-08-02  0:05 UTC (permalink / raw)
  To: James Bottomley
  Cc: Guenter Roeck, Linux-Next Mailing List,
	Linux Kernel Mailing List, linux-scsi

[-- Attachment #1: Type: text/plain, Size: 1028 bytes --]

Hi all,

On Wed, 01 Aug 2018 16:00:54 -0700 James Bottomley <James.Bottomley@HansenPartnership.com> wrote:
>
> So what seems to be happening to cause this is that there's a patch
> somewhere between the merge base of my scsi-next series and the next
> tree and the patch just before scsi-next was actually merged that
> actually causes a boot failure with blk-mq enabled.  Could you try to
> find this patch?  I think the way to do it is to try to bisect this
> range of linux-next using the command line
> 
> scsi_mod.use_blk_mq=1
> 
> Which forces block mq to be the default and seeing where the first boot
> failure is (you don't need my scsi-next tree merged to do this because
> all the offending patch does is flip the default state of the above
> flag).

So this means using v4.8-rc1 as the first good commit and 453f1d821165
("Merge remote-tracking branch 'cgroup/for-next'") as the first bad
(assuming that this latter fails to boot with "scsi_mod.use_blk_mq=1").

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 39+ messages in thread

* Re: linux-next: Tree for Aug 1
  2018-08-01 23:57       ` Ming Lei
@ 2018-08-02  0:03         ` James Bottomley
  2018-08-02  0:20           ` Guenter Roeck
  2018-08-02  4:58           ` Guenter Roeck
  2018-08-02  0:12         ` Guenter Roeck
  1 sibling, 2 replies; 39+ messages in thread
From: James Bottomley @ 2018-08-02  0:03 UTC (permalink / raw)
  To: Ming Lei, Guenter Roeck
  Cc: Stephen Rothwell, Linux-Next Mailing List,
	Linux Kernel Mailing List, linux-scsi

On Thu, 2018-08-02 at 07:57 +0800, Ming Lei wrote:
> On Thu, Aug 2, 2018 at 7:47 AM, Guenter Roeck <linux@roeck-us.net>
> wrote:
> > On Wed, Aug 01, 2018 at 03:52:45PM -0700, James Bottomley wrote:
> > > On Wed, 2018-08-01 at 15:48 -0700, Guenter Roeck wrote:
> > > > On Wed, Aug 01, 2018 at 05:58:52PM +1000, Stephen Rothwell
> > > > wrote:
> > > > > Hi all,
> > > > > 
> > > > > Changes since 20180731:
> > > > > 
> > > > > The pci tree gained a conflict against the pci-current tree.
> > > > > 
> > > > > The net-next tree gained a conflict against the bpf tree.
> > > > > 
> > > > > The block tree lost its build failure.
> > > > > 
> > > > > The staging tree still had its build failure due to an
> > > > > interaction
> > > > > with
> > > > > the vfs tree for which I disabled CONFIG_EROFS_FS.
> > > > > 
> > > > > The kspp tree lost its build failure.
> > > > > 
> > > > > Non-merge commits (relative to Linus' tree): 10070
> > > > >  9137 files changed, 417605 insertions(+), 179996 deletions(-
> > > > > )
> > > > > 
> > > > > -----------------------------------------------------------
> > > > > ------
> > > > > -----------
> > > > > 
> > > > 
> > > > The widespread kernel hang issues are still seen. I managed
> > > > to bisect it after working around the transient build failures.
> > > > Bisect log is attached below. Unfortunately, it doesn't help
> > > > much.
> > > > The culprit is reported as:
> > > > 
> > > > 2d542828c5e9 Merge remote-tracking branch 'scsi/for-next'
> > > > 
> > > > The preceding merge,
> > > > 
> > > > 453f1d821165 Merge remote-tracking branch 'cgroup/for-next'
> > > > 
> > > > checks out fine, as does the tip of scsi-next (commit
> > > > 103c7b7e0184,
> > > > "Merge branch 'misc' into for-next"). No idea how to proceed.
> > > 
> > > This sounds like you may have a problem with this patch:
> > > 
> > >     commit d5038a13eca72fb216c07eb717169092e92284f1
> > >      Author: Johannes Thumshirn <jthumshirn@suse.de>
> > >      Date:   Wed Jul 4 10:53:56 2018 +0200
> > > 
> > >          scsi: core: switch to scsi-mq by default
> > > 
> > > To verify, boot with the additional kernel parameter
> > > 
> > > scsi_mod.use_blk_mq=0
> > > 
> > > Which will reverse the effect of the above patch.
> > > 
> > 
> > Yes, that fixes the problem.
> 
> That may not the root cause, given this issue is only started to
> see from next-20180731, but d5038a13eca7 (scsi: core: switch to
> scsi-mq by default)
> has been in -next for quite a while.
> 
> Seems something new causes this issue.

Read my other email about how to find this.

https://marc.info/?l=linux-scsi&m=153316446223676

Now that we've confirmed the issue, Gunter, could you attempt to bisect
it as that email describes?

Thanks,

James


^ permalink raw reply	[flat|nested] 39+ messages in thread

* Re: linux-next: Tree for Aug 1
  2018-08-01 23:47     ` Guenter Roeck
@ 2018-08-01 23:57       ` Ming Lei
  2018-08-02  0:03         ` James Bottomley
  2018-08-02  0:12         ` Guenter Roeck
  0 siblings, 2 replies; 39+ messages in thread
From: Ming Lei @ 2018-08-01 23:57 UTC (permalink / raw)
  To: Guenter Roeck
  Cc: James Bottomley, Stephen Rothwell, Linux-Next Mailing List,
	Linux Kernel Mailing List, linux-scsi

On Thu, Aug 2, 2018 at 7:47 AM, Guenter Roeck <linux@roeck-us.net> wrote:
> On Wed, Aug 01, 2018 at 03:52:45PM -0700, James Bottomley wrote:
>> On Wed, 2018-08-01 at 15:48 -0700, Guenter Roeck wrote:
>> > On Wed, Aug 01, 2018 at 05:58:52PM +1000, Stephen Rothwell wrote:
>> > > Hi all,
>> > >
>> > > Changes since 20180731:
>> > >
>> > > The pci tree gained a conflict against the pci-current tree.
>> > >
>> > > The net-next tree gained a conflict against the bpf tree.
>> > >
>> > > The block tree lost its build failure.
>> > >
>> > > The staging tree still had its build failure due to an interaction
>> > > with
>> > > the vfs tree for which I disabled CONFIG_EROFS_FS.
>> > >
>> > > The kspp tree lost its build failure.
>> > >
>> > > Non-merge commits (relative to Linus' tree): 10070
>> > >  9137 files changed, 417605 insertions(+), 179996 deletions(-)
>> > >
>> > > -----------------------------------------------------------------
>> > > -----------
>> > >
>> >
>> > The widespread kernel hang issues are still seen. I managed
>> > to bisect it after working around the transient build failures.
>> > Bisect log is attached below. Unfortunately, it doesn't help much.
>> > The culprit is reported as:
>> >
>> > 2d542828c5e9 Merge remote-tracking branch 'scsi/for-next'
>> >
>> > The preceding merge,
>> >
>> > 453f1d821165 Merge remote-tracking branch 'cgroup/for-next'
>> >
>> > checks out fine, as does the tip of scsi-next (commit 103c7b7e0184,
>> > "Merge branch 'misc' into for-next"). No idea how to proceed.
>>
>> This sounds like you may have a problem with this patch:
>>
>>     commit d5038a13eca72fb216c07eb717169092e92284f1
>>      Author: Johannes Thumshirn <jthumshirn@suse.de>
>>      Date:   Wed Jul 4 10:53:56 2018 +0200
>>
>>          scsi: core: switch to scsi-mq by default
>>
>> To verify, boot with the additional kernel parameter
>>
>> scsi_mod.use_blk_mq=0
>>
>> Which will reverse the effect of the above patch.
>>
> Yes, that fixes the problem.

That may not the root cause, given this issue is only started to
see from next-20180731, but d5038a13eca7 (scsi: core: switch to
scsi-mq by default)
has been in -next for quite a while.

Seems something new causes this issue.

Thanks,
Ming Lei

^ permalink raw reply	[flat|nested] 39+ messages in thread

* Re: linux-next: Tree for Aug 1
  2018-08-01 22:52   ` James Bottomley
  2018-08-01 23:00     ` James Bottomley
@ 2018-08-01 23:47     ` Guenter Roeck
  2018-08-01 23:57       ` Ming Lei
  1 sibling, 1 reply; 39+ messages in thread
From: Guenter Roeck @ 2018-08-01 23:47 UTC (permalink / raw)
  To: James Bottomley
  Cc: Stephen Rothwell, Linux-Next Mailing List,
	Linux Kernel Mailing List, linux-scsi

On Wed, Aug 01, 2018 at 03:52:45PM -0700, James Bottomley wrote:
> On Wed, 2018-08-01 at 15:48 -0700, Guenter Roeck wrote:
> > On Wed, Aug 01, 2018 at 05:58:52PM +1000, Stephen Rothwell wrote:
> > > Hi all,
> > > 
> > > Changes since 20180731:
> > > 
> > > The pci tree gained a conflict against the pci-current tree.
> > > 
> > > The net-next tree gained a conflict against the bpf tree.
> > > 
> > > The block tree lost its build failure.
> > > 
> > > The staging tree still had its build failure due to an interaction
> > > with
> > > the vfs tree for which I disabled CONFIG_EROFS_FS.
> > > 
> > > The kspp tree lost its build failure.
> > > 
> > > Non-merge commits (relative to Linus' tree): 10070
> > >  9137 files changed, 417605 insertions(+), 179996 deletions(-)
> > > 
> > > -----------------------------------------------------------------
> > > -----------
> > > 
> > 
> > The widespread kernel hang issues are still seen. I managed
> > to bisect it after working around the transient build failures.
> > Bisect log is attached below. Unfortunately, it doesn't help much.
> > The culprit is reported as:
> > 
> > 2d542828c5e9 Merge remote-tracking branch 'scsi/for-next'
> > 
> > The preceding merge,
> > 
> > 453f1d821165 Merge remote-tracking branch 'cgroup/for-next'
> > 
> > checks out fine, as does the tip of scsi-next (commit 103c7b7e0184,
> > "Merge branch 'misc' into for-next"). No idea how to proceed.
> 
> This sounds like you may have a problem with this patch:
> 
>     commit d5038a13eca72fb216c07eb717169092e92284f1
>      Author: Johannes Thumshirn <jthumshirn@suse.de>
>      Date:   Wed Jul 4 10:53:56 2018 +0200
> 
>          scsi: core: switch to scsi-mq by default
> 
> To verify, boot with the additional kernel parameter
> 
> scsi_mod.use_blk_mq=0
> 
> Which will reverse the effect of the above patch.
> 
Yes, that fixes the problem.

Guenter

> We already have one report of this patch causing boot failures:
> 
> https://marc.info/?t=153305327000002
> 
> So I've added linux-scsi to see if they want any more information.
> 
> James
> 
> > 
> > Guenter
> > 
> > ---
> > bisect (mips:malta_defconfig and i386):
> > 
> > # bad: [d9bd94c0bcaa42d9cace337590718afd22c47bcc] Add linux-next
> > specific files for 20180801
> > # good: [acb1872577b346bd15ab3a3f8dff780d6cca4b70] Linux 4.18-rc7
> > git bisect start 'HEAD' 'v4.18-rc7'
> > # good: [f7952a1210bce43e88d69f371c6226aed481f307] Merge remote-
> > tracking branch 'spi-nor/spi-nor/next'
> > git bisect good f7952a1210bce43e88d69f371c6226aed481f307
> > # good: [fa3bb608cd0d41a02583a7ceb3d162c4dee7e0e4] Merge remote-
> > tracking branch 'spi/for-next'
> > git bisect good fa3bb608cd0d41a02583a7ceb3d162c4dee7e0e4
> > # good: [39c5cce976449c934b60e31cec9cea6986531b94] Merge remote-
> > tracking branch 'char-misc/char-misc-next'
> > git bisect good 39c5cce976449c934b60e31cec9cea6986531b94
> > # good: [453f1d8211658b75542f4581759f022420bdaea8] Merge remote-
> > tracking branch 'cgroup/for-next'
> > git bisect good 453f1d8211658b75542f4581759f022420bdaea8
> > # bad: [f11e9f9af170533e660c5deddccc4c494784c1fa] Merge remote-
> > tracking branch 'nvdimm/libnvdimm-for-next'
> > git bisect bad f11e9f9af170533e660c5deddccc4c494784c1fa
> > # bad: [d8a758324b2e012cdba05b82ecbda6b84905f6ec] Merge remote-
> > tracking branch 'rpmsg/for-next'
> > git bisect bad d8a758324b2e012cdba05b82ecbda6b84905f6ec
> > # good: [97fe222524f8fdbcc528b44d160d1df71d96af86] scsi: arcmsr: Fix
> > error of resuming from hibernation for adapter type E
> > git bisect good 97fe222524f8fdbcc528b44d160d1df71d96af86
> > # bad: [2d542828c5e94490480b2900f8a0cb7a8c46afb0] Merge remote-
> > tracking branch 'scsi/for-next'
> > git bisect bad 2d542828c5e94490480b2900f8a0cb7a8c46afb0
> > # good: [cc74e31d4147f26ead6ea06e4649d63a14edc0fe] scsi: lpfc: remove
> > null check on nvmebuf
> > git bisect good cc74e31d4147f26ead6ea06e4649d63a14edc0fe
> > # good: [dc335a995527fb1ee9ec5649162b22cd1ce728ee] scsi: tcmu: unmap
> > if dev is configured
> > git bisect good dc335a995527fb1ee9ec5649162b22cd1ce728ee
> > # good: [d92f5db64445ac4e2ce9a2cb7e6c929a5f4e712b] Merge branch
> > 'misc' into for-next
> > git bisect good d92f5db64445ac4e2ce9a2cb7e6c929a5f4e712b
> > # good: [0e0d75267107e6a557ea9314d55bcff05a6ede44] scsi: tcmu: use
> > u64 for dev_size
> > git bisect good 0e0d75267107e6a557ea9314d55bcff05a6ede44
> > # good: [c8a75afbf72ee4c16dad5339f55f62095879f207] Revert "scsi:
> > target/iscsi: Reduce number of __iscsit_free_cmd() callers"
> > git bisect good c8a75afbf72ee4c16dad5339f55f62095879f207
> > # good: [103c7b7e01849d3c5bc998168ccd4df2c443d24b] Merge branch
> > 'misc' into for-next
> > git bisect good 103c7b7e01849d3c5bc998168ccd4df2c443d24b
> > # first bad commit: [2d542828c5e94490480b2900f8a0cb7a8c46afb0] Merge
> > remote-tracking branch 'scsi/for-next'
> > 
> 

^ permalink raw reply	[flat|nested] 39+ messages in thread

* Re: linux-next: Tree for Aug 1
  2018-08-01 22:52   ` James Bottomley
@ 2018-08-01 23:00     ` James Bottomley
  2018-08-02  0:05       ` Stephen Rothwell
  2018-08-01 23:47     ` Guenter Roeck
  1 sibling, 1 reply; 39+ messages in thread
From: James Bottomley @ 2018-08-01 23:00 UTC (permalink / raw)
  To: Guenter Roeck, Stephen Rothwell
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List, linux-scsi

On Wed, 2018-08-01 at 15:52 -0700, James Bottomley wrote:
> On Wed, 2018-08-01 at 15:48 -0700, Guenter Roeck wrote:
> > On Wed, Aug 01, 2018 at 05:58:52PM +1000, Stephen Rothwell wrote:
> > > Hi all,
> > > 
> > > Changes since 20180731:
> > > 
> > > The pci tree gained a conflict against the pci-current tree.
> > > 
> > > The net-next tree gained a conflict against the bpf tree.
> > > 
> > > The block tree lost its build failure.
> > > 
> > > The staging tree still had its build failure due to an
> > > interaction
> > > with
> > > the vfs tree for which I disabled CONFIG_EROFS_FS.
> > > 
> > > The kspp tree lost its build failure.
> > > 
> > > Non-merge commits (relative to Linus' tree): 10070
> > >  9137 files changed, 417605 insertions(+), 179996 deletions(-)
> > > 
> > > -----------------------------------------------------------------
> > > -----------
> > > 
> > 
> > The widespread kernel hang issues are still seen. I managed
> > to bisect it after working around the transient build failures.
> > Bisect log is attached below. Unfortunately, it doesn't help much.
> > The culprit is reported as:
> > 
> > 2d542828c5e9 Merge remote-tracking branch 'scsi/for-next'
> > 
> > The preceding merge,
> > 
> > 453f1d821165 Merge remote-tracking branch 'cgroup/for-next'
> > 
> > checks out fine, as does the tip of scsi-next (commit 103c7b7e0184,
> > "Merge branch 'misc' into for-next"). No idea how to proceed.

So what seems to be happening to cause this is that there's a patch
somewhere between the merge base of my scsi-next series and the next
tree and the patch just before scsi-next was actually merged that
actually causes a boot failure with blk-mq enabled.  Could you try to
find this patch?  I think the way to do it is to try to bisect this
range of linux-next using the command line

scsi_mod.use_blk_mq=1

Which forces block mq to be the default and seeing where the first boot
failure is (you don't need my scsi-next tree merged to do this because
all the offending patch does is flip the default state of the above
flag).

James


^ permalink raw reply	[flat|nested] 39+ messages in thread

* Re: linux-next: Tree for Aug 1
  2018-08-01 22:48 ` Guenter Roeck
@ 2018-08-01 22:52   ` James Bottomley
  2018-08-01 23:00     ` James Bottomley
  2018-08-01 23:47     ` Guenter Roeck
  0 siblings, 2 replies; 39+ messages in thread
From: James Bottomley @ 2018-08-01 22:52 UTC (permalink / raw)
  To: Guenter Roeck, Stephen Rothwell
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List, linux-scsi

On Wed, 2018-08-01 at 15:48 -0700, Guenter Roeck wrote:
> On Wed, Aug 01, 2018 at 05:58:52PM +1000, Stephen Rothwell wrote:
> > Hi all,
> > 
> > Changes since 20180731:
> > 
> > The pci tree gained a conflict against the pci-current tree.
> > 
> > The net-next tree gained a conflict against the bpf tree.
> > 
> > The block tree lost its build failure.
> > 
> > The staging tree still had its build failure due to an interaction
> > with
> > the vfs tree for which I disabled CONFIG_EROFS_FS.
> > 
> > The kspp tree lost its build failure.
> > 
> > Non-merge commits (relative to Linus' tree): 10070
> >  9137 files changed, 417605 insertions(+), 179996 deletions(-)
> > 
> > -----------------------------------------------------------------
> > -----------
> > 
> 
> The widespread kernel hang issues are still seen. I managed
> to bisect it after working around the transient build failures.
> Bisect log is attached below. Unfortunately, it doesn't help much.
> The culprit is reported as:
> 
> 2d542828c5e9 Merge remote-tracking branch 'scsi/for-next'
> 
> The preceding merge,
> 
> 453f1d821165 Merge remote-tracking branch 'cgroup/for-next'
> 
> checks out fine, as does the tip of scsi-next (commit 103c7b7e0184,
> "Merge branch 'misc' into for-next"). No idea how to proceed.

This sounds like you may have a problem with this patch:

    commit d5038a13eca72fb216c07eb717169092e92284f1
     Author: Johannes Thumshirn <jthumshirn@suse.de>
     Date:   Wed Jul 4 10:53:56 2018 +0200

         scsi: core: switch to scsi-mq by default

To verify, boot with the additional kernel parameter

scsi_mod.use_blk_mq=0

Which will reverse the effect of the above patch.

We already have one report of this patch causing boot failures:

https://marc.info/?t=153305327000002

So I've added linux-scsi to see if they want any more information.

James

> 
> Guenter
> 
> ---
> bisect (mips:malta_defconfig and i386):
> 
> # bad: [d9bd94c0bcaa42d9cace337590718afd22c47bcc] Add linux-next
> specific files for 20180801
> # good: [acb1872577b346bd15ab3a3f8dff780d6cca4b70] Linux 4.18-rc7
> git bisect start 'HEAD' 'v4.18-rc7'
> # good: [f7952a1210bce43e88d69f371c6226aed481f307] Merge remote-
> tracking branch 'spi-nor/spi-nor/next'
> git bisect good f7952a1210bce43e88d69f371c6226aed481f307
> # good: [fa3bb608cd0d41a02583a7ceb3d162c4dee7e0e4] Merge remote-
> tracking branch 'spi/for-next'
> git bisect good fa3bb608cd0d41a02583a7ceb3d162c4dee7e0e4
> # good: [39c5cce976449c934b60e31cec9cea6986531b94] Merge remote-
> tracking branch 'char-misc/char-misc-next'
> git bisect good 39c5cce976449c934b60e31cec9cea6986531b94
> # good: [453f1d8211658b75542f4581759f022420bdaea8] Merge remote-
> tracking branch 'cgroup/for-next'
> git bisect good 453f1d8211658b75542f4581759f022420bdaea8
> # bad: [f11e9f9af170533e660c5deddccc4c494784c1fa] Merge remote-
> tracking branch 'nvdimm/libnvdimm-for-next'
> git bisect bad f11e9f9af170533e660c5deddccc4c494784c1fa
> # bad: [d8a758324b2e012cdba05b82ecbda6b84905f6ec] Merge remote-
> tracking branch 'rpmsg/for-next'
> git bisect bad d8a758324b2e012cdba05b82ecbda6b84905f6ec
> # good: [97fe222524f8fdbcc528b44d160d1df71d96af86] scsi: arcmsr: Fix
> error of resuming from hibernation for adapter type E
> git bisect good 97fe222524f8fdbcc528b44d160d1df71d96af86
> # bad: [2d542828c5e94490480b2900f8a0cb7a8c46afb0] Merge remote-
> tracking branch 'scsi/for-next'
> git bisect bad 2d542828c5e94490480b2900f8a0cb7a8c46afb0
> # good: [cc74e31d4147f26ead6ea06e4649d63a14edc0fe] scsi: lpfc: remove
> null check on nvmebuf
> git bisect good cc74e31d4147f26ead6ea06e4649d63a14edc0fe
> # good: [dc335a995527fb1ee9ec5649162b22cd1ce728ee] scsi: tcmu: unmap
> if dev is configured
> git bisect good dc335a995527fb1ee9ec5649162b22cd1ce728ee
> # good: [d92f5db64445ac4e2ce9a2cb7e6c929a5f4e712b] Merge branch
> 'misc' into for-next
> git bisect good d92f5db64445ac4e2ce9a2cb7e6c929a5f4e712b
> # good: [0e0d75267107e6a557ea9314d55bcff05a6ede44] scsi: tcmu: use
> u64 for dev_size
> git bisect good 0e0d75267107e6a557ea9314d55bcff05a6ede44
> # good: [c8a75afbf72ee4c16dad5339f55f62095879f207] Revert "scsi:
> target/iscsi: Reduce number of __iscsit_free_cmd() callers"
> git bisect good c8a75afbf72ee4c16dad5339f55f62095879f207
> # good: [103c7b7e01849d3c5bc998168ccd4df2c443d24b] Merge branch
> 'misc' into for-next
> git bisect good 103c7b7e01849d3c5bc998168ccd4df2c443d24b
> # first bad commit: [2d542828c5e94490480b2900f8a0cb7a8c46afb0] Merge
> remote-tracking branch 'scsi/for-next'
> 


^ permalink raw reply	[flat|nested] 39+ messages in thread

* Re: linux-next: Tree for Aug 1
  2018-08-01  7:58 Stephen Rothwell
@ 2018-08-01 22:48 ` Guenter Roeck
  2018-08-01 22:52   ` James Bottomley
  0 siblings, 1 reply; 39+ messages in thread
From: Guenter Roeck @ 2018-08-01 22:48 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List, James Bottomley

On Wed, Aug 01, 2018 at 05:58:52PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Changes since 20180731:
> 
> The pci tree gained a conflict against the pci-current tree.
> 
> The net-next tree gained a conflict against the bpf tree.
> 
> The block tree lost its build failure.
> 
> The staging tree still had its build failure due to an interaction with
> the vfs tree for which I disabled CONFIG_EROFS_FS.
> 
> The kspp tree lost its build failure.
> 
> Non-merge commits (relative to Linus' tree): 10070
>  9137 files changed, 417605 insertions(+), 179996 deletions(-)
> 
> ----------------------------------------------------------------------------
> 

The widespread kernel hang issues are still seen. I managed
to bisect it after working around the transient build failures.
Bisect log is attached below. Unfortunately, it doesn't help much.
The culprit is reported as:

2d542828c5e9 Merge remote-tracking branch 'scsi/for-next'

The preceding merge,

453f1d821165 Merge remote-tracking branch 'cgroup/for-next'

checks out fine, as does the tip of scsi-next (commit 103c7b7e0184,
"Merge branch 'misc' into for-next"). No idea how to proceed.

Guenter

---
bisect (mips:malta_defconfig and i386):

# bad: [d9bd94c0bcaa42d9cace337590718afd22c47bcc] Add linux-next specific files for 20180801
# good: [acb1872577b346bd15ab3a3f8dff780d6cca4b70] Linux 4.18-rc7
git bisect start 'HEAD' 'v4.18-rc7'
# good: [f7952a1210bce43e88d69f371c6226aed481f307] Merge remote-tracking branch 'spi-nor/spi-nor/next'
git bisect good f7952a1210bce43e88d69f371c6226aed481f307
# good: [fa3bb608cd0d41a02583a7ceb3d162c4dee7e0e4] Merge remote-tracking branch 'spi/for-next'
git bisect good fa3bb608cd0d41a02583a7ceb3d162c4dee7e0e4
# good: [39c5cce976449c934b60e31cec9cea6986531b94] Merge remote-tracking branch 'char-misc/char-misc-next'
git bisect good 39c5cce976449c934b60e31cec9cea6986531b94
# good: [453f1d8211658b75542f4581759f022420bdaea8] Merge remote-tracking branch 'cgroup/for-next'
git bisect good 453f1d8211658b75542f4581759f022420bdaea8
# bad: [f11e9f9af170533e660c5deddccc4c494784c1fa] Merge remote-tracking branch 'nvdimm/libnvdimm-for-next'
git bisect bad f11e9f9af170533e660c5deddccc4c494784c1fa
# bad: [d8a758324b2e012cdba05b82ecbda6b84905f6ec] Merge remote-tracking branch 'rpmsg/for-next'
git bisect bad d8a758324b2e012cdba05b82ecbda6b84905f6ec
# good: [97fe222524f8fdbcc528b44d160d1df71d96af86] scsi: arcmsr: Fix error of resuming from hibernation for adapter type E
git bisect good 97fe222524f8fdbcc528b44d160d1df71d96af86
# bad: [2d542828c5e94490480b2900f8a0cb7a8c46afb0] Merge remote-tracking branch 'scsi/for-next'
git bisect bad 2d542828c5e94490480b2900f8a0cb7a8c46afb0
# good: [cc74e31d4147f26ead6ea06e4649d63a14edc0fe] scsi: lpfc: remove null check on nvmebuf
git bisect good cc74e31d4147f26ead6ea06e4649d63a14edc0fe
# good: [dc335a995527fb1ee9ec5649162b22cd1ce728ee] scsi: tcmu: unmap if dev is configured
git bisect good dc335a995527fb1ee9ec5649162b22cd1ce728ee
# good: [d92f5db64445ac4e2ce9a2cb7e6c929a5f4e712b] Merge branch 'misc' into for-next
git bisect good d92f5db64445ac4e2ce9a2cb7e6c929a5f4e712b
# good: [0e0d75267107e6a557ea9314d55bcff05a6ede44] scsi: tcmu: use u64 for dev_size
git bisect good 0e0d75267107e6a557ea9314d55bcff05a6ede44
# good: [c8a75afbf72ee4c16dad5339f55f62095879f207] Revert "scsi: target/iscsi: Reduce number of __iscsit_free_cmd() callers"
git bisect good c8a75afbf72ee4c16dad5339f55f62095879f207
# good: [103c7b7e01849d3c5bc998168ccd4df2c443d24b] Merge branch 'misc' into for-next
git bisect good 103c7b7e01849d3c5bc998168ccd4df2c443d24b
# first bad commit: [2d542828c5e94490480b2900f8a0cb7a8c46afb0] Merge remote-tracking branch 'scsi/for-next'

^ permalink raw reply	[flat|nested] 39+ messages in thread

* linux-next: Tree for Aug 1
@ 2018-08-01  7:58 Stephen Rothwell
  2018-08-01 22:48 ` Guenter Roeck
  0 siblings, 1 reply; 39+ messages in thread
From: Stephen Rothwell @ 2018-08-01  7:58 UTC (permalink / raw)
  To: Linux-Next Mailing List; +Cc: Linux Kernel Mailing List

[-- Attachment #1: Type: text/plain, Size: 33451 bytes --]

Hi all,

Changes since 20180731:

The pci tree gained a conflict against the pci-current tree.

The net-next tree gained a conflict against the bpf tree.

The block tree lost its build failure.

The staging tree still had its build failure due to an interaction with
the vfs tree for which I disabled CONFIG_EROFS_FS.

The kspp tree lost its build failure.

Non-merge commits (relative to Linus' tree): 10070
 9137 files changed, 417605 insertions(+), 179996 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 286 trees (counting Linus' and 65 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 (c1d61e7fe376 Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi)
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 (9d3cce1e8b85 Linux 4.18-rc5)
Merging arc-current/for-curr (ec837d620c75 arc: fix type warnings in arc/mm/cache.c)
Merging arm-current/fixes (afc9f65e01cd ARM: 8781/1: Fix Thumb-2 syscall return for binutils 2.29+)
Merging arm64-fixes/for-next/fixes (c7513c2a2714 crypto/arm64: aes-ce-gcm - add missing kernel_neon_begin/end pair)
Merging m68k-current/for-linus (b12c8a70643f m68k: Set default dma mask for platform devices)
Merging powerpc-fixes/fixes (b03897cf318d powerpc/powernv: Fix save/restore of SPRG3 on entry/exit from stop (idle))
Merging sparc/master (c1d61e7fe376 Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi)
Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2)
Merging net/master (e39eb599998a Merge tag 'mlx5-fixes-2018-07-31' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux)
Merging bpf/master (2d55d614fcf5 net: xsk: don't return frames via the allocator on error)
Merging ipsec/master (25432eba9cd8 openvswitch: meter: Fix setting meter id for new entries)
Merging netfilter/master (101f0cd4f221 net: ena: Fix use of uninitialized DMA address bits field)
Merging ipvs/master (0026129c8629 rhashtable: add restart routine in rhashtable_free_and_destroy())
Merging wireless-drivers/master (299b6365a3b7 brcmfmac: fix regression in parsing NVRAM for multiple devices)
Merging mac80211/master (e31f6456c01c cfg80211: never ignore user regulatory hint)
Merging rdma-fixes/for-rc (addb8a6559f0 RDMA/uverbs: Expand primary and alt AV port checks)
Merging sound-current/for-linus (f59cf9a0551d ALSA: hda - Sleep for 10ms after entering D3 on Conexant codecs)
Merging sound-asoc-fixes/for-linus (3e4b165997cb Merge branch 'asoc-4.18' into asoc-linus)
Merging regmap-fixes/for-linus (d72e90f33aa4 Linux 4.18-rc6)
Merging regulator-fixes/for-linus (61b0049c348c Merge branch 'regulator-4.18' into regulator-linus)
Merging spi-fixes/for-linus (56e72c1eca32 Merge branch 'spi-4.18' into spi-linus)
Merging pci-current/for-linus (44bda4b7d26e PCI: Fix is_added/is_busmaster race condition)
Merging driver-core.current/driver-core-linus (acb1872577b3 Linux 4.18-rc7)
Merging tty.current/tty-linus (021c91791a5e Linux 4.18-rc3)
Merging usb.current/usb-linus (acb1872577b3 Linux 4.18-rc7)
Merging usb-gadget-fixes/fixes (acb1872577b3 Linux 4.18-rc7)
Merging usb-serial-fixes/usb-linus (9d3cce1e8b85 Linux 4.18-rc5)
Merging usb-chipidea-fixes/ci-for-usb-stable (a930d8bd94d8 usb: chipidea: Always build ULPI code)
Merging phy/fixes (ad5003300b07 phy: mapphone-mdm6600: Fix wrong enum used for status lines)
Merging staging.current/staging-linus (acb1872577b3 Linux 4.18-rc7)
Merging char-misc.current/char-misc-linus (9d3cce1e8b85 Linux 4.18-rc5)
Merging input-current/for-linus (384cf4285b34 Input: i8042 - add Lenovo LaVie Z to the i8042 reset list)
Merging crypto-current/master (46d8c4b28652 crypto: padlock-aes - Fix Nano workaround data corruption)
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 (0e714d27786c vfio/pci: Fix potential Spectre v1)
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 (1e4b044d2251 Linux 4.18-rc4)
Merging backlight-fixes/for-backlight-fixes (ce397d215ccd Linux 4.18-rc1)
Merging mtd-fixes/master (aa7eee8a143a mtd: spi-nor: cadence-quadspi: Fix direct mode write timeouts)
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 (ce397d215ccd Linux 4.18-rc1)
Merging v4l-dvb-fixes/fixes (8eb0e6421958 media: v4l: vsp1: Fix deadlock in VSPDL DRM pipelines)
Merging reset-fixes/reset/fixes (26fce0557fa6 reset: imx7: Fix always writing bits as 0)
Merging mips-fixes/mips-fixes (d5ea019f8a38 Revert "MIPS: BCM47XX: Enable 74K Core ExternalSync for PCIe erratum")
Merging omap-fixes/fixes (d3f6daede246 ARM: dts: omap4-droid4: fix dts w.r.t. pwm)
Merging kvm-fixes/master (63aff65573d7 kvm: x86: vmx: fix vpid leak)
Merging kvms390-fixes/master (f4a551b72358 KVM: s390: vsie: fix < 8k check for the itdba)
Merging hwmon-fixes/hwmon (1e4b044d2251 Linux 4.18-rc4)
Merging nvdimm-fixes/libnvdimm-fixes (ee6581ceba7f nfit: fix unchecked dereference in acpi_nfit_ctl)
Merging btrfs-fixes/next-fixes (0b7162742121 Merge branch 'for-next-current-v4.18-20180717' into next-fixes)
Merging vfs-fixes/fixes (9ba546c01976 aio: don't expose __aio_sigset in uapi)
Merging dma-mapping-fixes/for-linus (7ec916f82c48 Revert "iommu/intel-iommu: Enable CONFIG_DMA_DIRECT_OPS=y and clean up intel_{alloc,free}_coherent()")
Merging drivers-x86-fixes/fixes (2502e5a02593 platform/x86: dell-laptop: Fix backlight detection)
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 (b9952b5218ad of: overlay: update phandle cache on overlay apply and remove)
Merging scsi-fixes/fixes (15d258674b5c scsi: qedi: Fix a potential buffer overflow)
Merging drm-fixes/drm-fixes (acb1872577b3 Linux 4.18-rc7)
Merging drm-intel-fixes/for-linux-next-fixes (0ca9488193e6 drm/i915/glk: Add Quirk for GLK NUC HDMI port issues.)
Merging mmc-fixes/fixes (3b1074bf9817 mmc: mxcmmc: Fix missing parentheses and brace)
Merging rtc-fixes/rtc-fixes (fd6792bb022e rtc: fix alarm read and set offset)
Merging drm-misc-fixes/for-linux-next-fixes (a6a00918d4ad drm/vc4: Reset ->{x, y}_scaling[1] when dealing with uniplanar formats)
Merging kbuild/for-next (b56884dbdd97 Merge branch 'kconfig' into for-next)
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 (4d8bde883bfb OF: Don't set default coherent 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 (c705dcbf409c Merge branches 'clkdev', 'fixes', 'misc' and 'spectre' into for-next)
Merging arm-perf/for-next/perf (809092dc3e60 drivers/perf: arm-ccn: Use devm_ioremap_resource() to map memory)
Merging arm-soc/for-next (17f076bc11e5 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 (47a99ae970bb Merge branch 'v4.19/dt64' into tmp/aml-rebuild)
Merging aspeed/for-next (c224edaa4a46 Merge branches 'defconfig-for-v4.19' and 'dt-for-v4.19' into for-next)
Merging at91/at91-next (f45853da06e3 Merge tag 'at91-ab-4.19-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into at91-next)
Merging bcm2835/for-next (5997adb14985 Merge branch anholt/bcm2835-defconfig-64-next into for-next)
CONFLICT (content): Merge conflict in drivers/hwmon/Kconfig
CONFLICT (content): Merge conflict in drivers/firmware/raspberrypi.c
Merging imx-mxs/for-next (7586f152bcad Merge branch 'imx/defconfig' into for-next)
Merging keystone/next (ed3bf0f321b9 Merge branch 'for_4.19/drivers-soc' into next)
Merging mediatek/for-next (b75253e66bc5 Merge branch 'v4.18-next/soc' into for-next)
Merging mvebu/for-next (23b7c60b80f6 Merge branch 'mvebu/dt64' into mvebu/for-next)
Merging omap/for-next (d356801075c5 Merge branch 'omap-for-v4.19/dt' into for-next)
Merging reset/reset/next (d903779b58be reset: meson: add meson audio arb driver)
Merging qcom/for-next (76b9e7f947f1 Merge tag 'qcom-defconfig-for-4.19' into all-for-4.19)
Merging realtek/for-next (2b6286eb7ab8 Merge branch 'v4.15/dt64' into next)
Merging renesas/next (7e58fb78c672 Merge branches 'fixes-for-v4.18', '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 (ed8fcd5d1466 Merge branch 'v4.19-armsoc/dts64' into for-next)
Merging samsung/for-next (bebc6082da0a Linux 4.14)
Merging samsung-krzk/for-next (babb70ce9674 Merge branch 'next/soc' into for-next)
Merging sunxi/sunxi/for-next (51c756fe7803 Merge branch 'sunxi/dt64-for-4.19' into sunxi/for-next)
Merging tegra/for-next (f29cfb31cf00 Merge branch for-4.19/arm64/dt into for-next)
Merging arm64/for-next/core (dcab90d90935 arm64: kexec: Add comment to explain use of __flush_icache_range())
CONFLICT (content): Merge conflict in arch/arm64/Makefile
Merging clk/clk-next (bbfbe38ec527 Merge branch 'clk-mvebu-periph-parent' into clk-next)
Merging clk-samsung/for-next (e8cf870f253b clk: samsung: simplify getting .drvdata)
Merging c6x/for-linux-next (31b02fe54206 c6x: switch to NO_BOOTMEM)
Merging h8300/h8300-next (54692056a201 h8300: Correct signature of test_bit())
Merging m68k/for-next (71a896687b85 m68k/defconfig: Update defconfigs for v4.18-rc6)
Merging m68knommu/for-next (58064e1f46b1 m68knommu: Fix typos in Coldfire 5272 DMA debug code)
Merging microblaze/next (9fe37714c13c microblaze: delete wrong comment about machine_early_init)
Merging mips/mips-next (84a7f564fa14 mips: dts: mscc: enable spi and NOR flash support on ocelot PCB123)
CONFLICT (content): Merge conflict in arch/mips/kernel/process.c
Merging nds32/next (d2516b16bcbc nds32: fix logic for module)
Merging nios2/for-next (3d9644ef9a0f nios2: Use read_persistent_clock64() instead of read_persistent_clock())
Merging openrisc/for-next (5600779ea5f3 openrisc: use generic dma_noncoherent_ops)
Merging parisc-hd/for-next (0fbd47b92b06 parisc: Add HAVE_REGS_AND_STACK_ACCESS_API feature)
Merging powerpc/next (cca3d5290ede tty: hvc: remove unexplained "just in case" spin delay)
CONFLICT (content): Merge conflict in drivers/vfio/vfio_iommu_spapr_tce.c
Merging hvc/topic/hvc (9f65b81f36e3 tty: hvc: introduce the hv_ops.flush operation for hvc drivers)
Merging fsl/next (c095ff93f901 powerpc/sysdev: change CPM GPIO to platform_device)
Merging risc-v/for-next (d72e90f33aa4 Linux 4.18-rc6)
Merging s390/features (05bb9f57357c s390/numa: move initial setup of node_to_cpumask_map)
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 (cb6db64ef5a9 Merge branch 'xtensa-dma-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 (2e68fcb12d4e Merge branch 'for-next-next-v4.19-20180724' into for-next-20180724)
Merging ceph/master (8b8f53af1ed9 ceph: fix dentry leak in splice_dentry())
Merging cifs/for-next (91dbee7e66f0 smb3: display bytes_read and bytes_written in smb3 stats)
Merging configfs/for-next (cc57c07343bd configfs: fix registered group removal)
Merging ecryptfs/next (5dcea554d5ce eCryptfs: fix a couple type promotion bugs)
Merging ext3/for_next (6aee47d7f61e Pull in fsnotify cleanups from Amir and new inotify IN_MASK_CREATE flag support.)
Merging ext4/dev (f4a79b7b4ab5 ext4: fix warning message in ext4_enable_quotas())
Merging f2fs/dev (715a33545d83 f2fs: fix to restrict mount condition when without CONFIG_QUOTA)
Merging fuse/for-next (963545357202 fuse: reduce allocation size for splice_write)
Merging jfs/jfs-next (bd646104ac5a jfs: use time64_t for otime)
Merging nfs/linux-next (a61246c96195 Fix error code in nfs_lookup_verify_inode())
Merging nfs-anna/linux-next (8e22b011b242 NFSv4: Mark the inode change attribute up to date in update_changeattr())
Merging nfsd/nfsd-next (32620db998a5 NFSD stop ongoing async copies on client shutdown)
Merging orangefs/for-next (f35cf2ab06b6 orangefs: remove redundant pointer orangefs_inode)
Merging overlayfs/overlayfs-next (989974c80457 ovl: Enable metadata only feature)
Merging ubifs/linux-next (f5a926dd5298 mtd: ubi: Update ubi-media.h to dual license)
Merging v9fs/9p-next (76450279848d 9p: fix whitespace issues)
Merging xfs/for-next (e666aa37f433 xfs: avoid COW fork extent lookups in writeback if the fork didn't change)
Merging file-locks/locks-next (1cf8e5de4055 fs/lock: show locks taken by processes from another pidns)
Merging vfs/for-next (334990db5207 Merge branches 'work.dcache', 'work.mount', 'work.misc' and 'work.mkdir' into for-next)
CONFLICT (content): Merge conflict in include/linux/fs.h
Merging vfs-miklos/next (0eb8af4916a5 vfs: use helper for calling f_op->fsync())
Merging printk/for-next (7973c51853f8 Merge branch 'for-4.19-nmi' into for-next)
Merging pci/next (a8de4147048a Merge branch 'remotes/lorenzo/pci/vmd')
CONFLICT (content): Merge conflict in drivers/pci/pci.h
CONFLICT (content): Merge conflict in drivers/pci/controller/pci-aardvark.c
Merging pstore/for-next/pstore (e698aaf37f9f pstore: fix crypto dependencies without compression)
Merging hid/for-next (4e9544262a93 Merge branch 'for-4.19/cougar' into for-next)
Merging i2c/i2c/for-next (9bb27593878f Merge branch 'i2c/for-4.19' into i2c/for-next)
Merging dmi/master (7f73745fec52 firmware: dmi: Add access to the SKU ID string)
Merging hwmon-staging/hwmon-next (12005ec33f3a hwmon: (iio_hwmon) Use devm functions)
Merging jc_docs/docs-next (d1634e1aedbc Documentation: vm.txt: Adding 'nr_hugepages_mempolicy' parameter description.)
Merging v4l-dvb/master (1d06352e18ef media: tvp5150: add g_std callback)
Merging v4l-dvb-next/master (f10379aad39e media: include/video/omapfb_dss.h: use IS_ENABLED())
Merging fbdev/fbdev-for-next (044e7ca20496 fbdev: omap2: omapfb: fix ifnullfree.cocci warnings)
Merging pm/linux-next (f5549675fa90 Merge branch 'pm-cpufreq-fixes' into linux-next)
Merging cpupower/cpupower (ce397d215ccd Linux 4.18-rc1)
Merging idle/next (8a5776a5f498 Linux 4.14-rc4)
Merging opp/opp/linux-next (c5c2a97b3ac7 PM / OPP: Update voltage in case freq == old_freq)
Merging thermal/next (5043f06ecec6 MAINTAINERS: Add Daniel Lezcano as designated reviewer for thermal)
Merging thermal-soc/next (542cdf406804 thermal: rcar_thermal: avoid NULL dereference in absence of IRQ resources)
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 (854633165164 RDMA/core: Prefix _ib to IB/RoCE specific functions)
CONFLICT (content): Merge conflict in drivers/infiniband/core/uverbs_cmd.c
Merging net-next/master (e6476c21447c net: remove bogus RCU annotations on socket.wq)
CONFLICT (content): Merge conflict in tools/lib/bpf/btf.h
CONFLICT (content): Merge conflict in tools/lib/bpf/btf.c
CONFLICT (content): Merge conflict in tools/bpf/bpftool/map.c
CONFLICT (content): Merge conflict in net/smc/smc_ib.c
CONFLICT (content): Merge conflict in net/smc/smc_core.c
CONFLICT (content): Merge conflict in drivers/net/virtio_net.c
Merging bpf-next/master (fbeb1603bf4e bpf: verifier: MOV64 don't mark dst reg unbounded)
Merging ipsec-next/master (3f6bcc5162a1 act_bpf: Use kmemdup instead of duplicating it in tcf_bpf_init_from_ops)
Merging mlx5-next/mlx5-next (664000b6bb43 net/mlx5: Add support for flow table destination number)
Merging netfilter-next/master (4ed8eb6570a4 netfilter: nf_tables: Add native tproxy support)
Merging nfc-next/master (1f008cfec5d5 NFC: fdp: Fix unused variable warnings)
Merging ipvs-next/master (66c524acfb51 netfilter: conntrack: remove l3proto abstraction)
CONFLICT (content): Merge conflict in net/netfilter/Makefile
CONFLICT (content): Merge conflict in net/netfilter/Kconfig
CONFLICT (content): Merge conflict in net/ipv6/netfilter/Kconfig
Merging wireless-drivers-next/master (24ebfcbdd1ba rt2x00: remove redundant functions rt2x00mac_sta_{add/remove})
Merging bluetooth/master (b3cadaa485f0 Bluetooth: hidp: Fix handling of strncpy for hid->name information)
Merging mac80211-next/master (133bf90dbb8b mac80211: restrict delayed tailroom needed decrement)
Merging gfs2/for-next (3f30f929bb17 gfs2: cleanup: call gfs2_rgrp_ondisk2lvb from gfs2_rgrp_out)
Merging mtd/mtd/next (76a832254ab0 mtd: partitions: use DT info for parsing partitions with "compatible" prop)
Merging nand/nand/next (238e4f9e2f90 MAINTAINERS: drop Wenyou Yang from Atmel NAND driver support)
Merging spi-nor/spi-nor/next (69edac4ef4d1 mtd: spi-nor: cadence-quadspi: fix timeout handling)
Merging crypto/master (a47890899379 crypto: rmd320 - use swap macro in rmd320_transform)
CONFLICT (content): Merge conflict in drivers/net/ethernet/freescale/fs_enet/mac-fec.c
CONFLICT (content): Merge conflict in drivers/net/ethernet/freescale/fec_main.c
Merging drm/drm-next (15da09500a70 Merge branch 'drm-armada-devel' of git://git.armlinux.org.uk/~rmk/linux-arm into drm-next)
Applying: drm/i915/kvmgt: merge fixup for "Check the pfn got from vfio_pin_pages"
Merging drm-panel/drm/panel/for-next (e4bac408b084 drm/panel: simple: Add support for Winstar WF35LTIACD)
Merging drm-intel/for-linux-next (60548c554be2 drm/i915: Interactive RPS mode)
Merging drm-tegra/drm/tegra/for-next (6134534ca24f drm/tegra: Add kerneldoc for UAPI)
Merging drm-misc/for-linux-next (2ead1be54b22 drm/vkms: Fix connector leak at the module removal)
Merging drm-msm/msm-next (3e91a8b5c158 drm/msm/disp/dpu: fix two spelling mistakes)
Merging hdlcd/for-upstream/hdlcd (d664b851eb2b drm/arm/hdlcd: Reject atomic commits that disable only the plane)
Merging mali-dp/for-upstream/mali-dp (e368fc75c190 drm/arm/malidp: Added the late system pm functions)
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 (81f2b25addde drm/imx: Remove unused field imx_drm_device.pipes)
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 (0bf0f09cc45b Merge branch 'regmap-4.19' into regmap-next)
Merging sound/for-next (a0a4959eb4e9 ALSA: usb-audio: Operate UAC3 Power Domains in PCM callbacks)
Merging sound-asoc/for-next (3d59909f9cf5 Merge branch 'asoc-4.19' into asoc-next)
Merging modules/modules-next (4d58e7034d19 ARM: module: fix modsign build error)
Merging input/next (955c594ed1a7 Input: pm8941-pwrkey - add resin entry)
Merging block/for-next (d6b29ac22880 Merge branch 'for-4.19/block' into for-next)
CONFLICT (content): Merge conflict in drivers/nvme/target/rdma.c
Applying: nvme-dma: merge fix up for replacement of max_sge
Merging lightnvm/for-next (1c6286f26301 lightnvm: fix some error code in pblk-init.c)
Merging device-mapper/for-next (63c8ecb6261a dm thin: include metadata_low_watermark threshold in pool status)
Merging pcmcia/pcmcia-next (c3a5307873d4 pcmcia: Use module_pcmcia_driver for scsi drivers)
Merging mmc/next (fee1ab56663c mmc: tmio: remove unneeded variable in tmio_mmc_start_command())
Merging kgdb/kgdb-next (2cf2f0d5b91f kdb: use memmove instead of overlapping memcpy)
Merging md/for-next (08edaaa6d6fa drivers/md/raid5: Do not disable irq on release_inactive_stripe_list() call)
Merging mfd/for-mfd-next (fe8166c92a5f mfd: sec-core: Export OF module alias table)
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_display.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/Kconfig
Merging backlight/for-backlight-next (633786736ed5 backlight: pwm_bl: Fix uninitialized variable)
Merging battery/for-next (3d779180c692 power: supply: bq27xxx: Update comments)
Merging regulator/for-next (03a05cf9d2cb Merge branch 'regulator-4.19' into regulator-next)
Merging security/next-testing (d83c732fffc3 Merge branch 'smack-for-4.19-a' of https://github.com/cschaufler/next-smack into next-testing)
Merging apparmor/apparmor-next (24b87a16fee0 apparmor: Fix failure to audit context info in build_change_hat)
Merging integrity/next-integrity (3dd0f18c70d9 EVM: fix return value check in evm_write_xattrs())
Merging keys/keys-next (1e684d3820d8 pkcs7: Set the module licence to prevent tainting)
Merging selinux/next (631d2b490569 selinux: constify write_op[])
Merging tpmdd/next (ec403d8ed08c ima: Get rid of ima_used_chip and use ima_tpm_chip != NULL instead)
Merging watchdog/master (9d3cce1e8b85 Linux 4.18-rc5)
Merging iommu/next (a6d297302f78 Merge branches 'arm/shmobile', 'arm/renesas', 'arm/msm', 'arm/smmu', 'x86/amd', 'x86/vt-d' 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 (baa2a4fdd525 audit: fix use-after-free in audit_add_watch)
Merging devicetree/for-next (791d3ef2e111 dt-bindings: remove 'interrupt-parent' from bindings)
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/net/can/xilinx_can.txt
Merging mailbox/mailbox-for-next (f83d1cfc8bcd mailbox/drivers/hisi: Consolidate the Kconfig for the MAILBOX)
Merging spi/for-next (30bb019e4e6b Merge branch 'spi-4.19' into spi-next)
Merging tip/auto-latest (02eb2e750ae5 Merge branch 'x86/timers')
CONFLICT (content): Merge conflict in tools/include/uapi/linux/bpf.h
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 (190bd6e98afc EDAC, sb_edac: Add support for systems with segmented PCI buses)
Merging irqchip/irq/irqchip-next (30800b3a1fb1 irqchip/gic-v3-its: Reduce minimum LPI allocation to 1 for PCI devices)
Merging ftrace/for-next (a9235b544a0a ring-buffer: Fix typo in comment)
Merging rcu/rcu/next (d57fa29ddc3c Merge LKMM and RCU commits)
CONFLICT (content): Merge conflict in kernel/sched/core.c
Merging kvm/linux-next (6f0d349d922b Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging kvm-arm/next (245715cbe83c KVM: arm/arm64: Fix lost IRQs from emulated physcial timer when blocked)
CONFLICT (content): Merge conflict in include/uapi/linux/kvm.h
CONFLICT (content): Merge conflict in arch/arm64/include/asm/cpucaps.h
Merging kvm-mips/next (dc44abd6aad2 KVM: MIPS/Emulate: Properly implement TLBR for T&E)
Merging kvm-ppc/kvm-ppc-next (b5c6f7607b90 KVM: PPC: Book3S HV: Read kvm->arch.emul_smt_mode under kvm->lock)
Merging kvms390/next (237584619366 Merge tag 'hlp_stage1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into kvms390/next)
Merging xen-tip/linux-next (2789e83c933d xen/gntdev: don't dereference a null gntdev_dmabuf on allocation failure)
Applying: xen/gntdev: fix up for attach callback API change
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 (5788f7795911 platform/x86: dell-laptop: Fix backlight detection)
Merging chrome-platform/for-next (40291fb75123 Merge tag 'ib-platform-chrome-mfd-move-cros-ec-transport-for-4.19' into working-branch-for-4.19)
Merging hsi/for-next (ce397d215ccd Linux 4.18-rc1)
Merging leds/for-next (6f7b0bad8839 usb: simplify usbport trigger)
Merging ipmi/for-next (a4fb7ddc6356 ipmi: kcs_bmc: don't change device name)
Merging driver-core/driver-core-next (d2fc88a61b4e Merge 4.18-rc7 into driver-core-next)
CONFLICT (content): Merge conflict in fs/sysfs/group.c
CONFLICT (content): Merge conflict in drivers/iommu/ipmmu-vmsa.c
Merging usb/usb-next (479af3216315 usb: renesas_usbhs: Kconfig: convert to SPDX identifiers)
Merging usb-gadget/next (4ea438da76f4 usb: dwc3: gadget: Check MaxPacketSize from descriptor)
Merging usb-serial/usb-next (c8acfe0aadbe USB: serial: cp210x: implement GPIO support for CP2102N)
Merging usb-chipidea-next/ci-for-usb-next (ba0ab35a81de usb: chipidea: tegra: Use aligned DMA on Tegra114/124)
Merging phy-next/next (ec14b83a1ee4 phy: mvebu-cp110-comphy: switch to SPDX identifier)
Merging tty/tty-next (286d9b8c7d2e serial: 8250: Use cached port name directly in messages)
Merging char-misc/char-misc-next (7ceb1c37533e Drivers: hv: vmbus: add numa_node to sysfs)
Merging extcon/extcon-next (8a9dbb779fe8 extcon: Release locking when sending the notification of connector state)
Merging staging/staging-next (1c58e9cc5b56 staging:rtl8192u: Refactor enum DM_CCK_Rx_Path_Method - Style)
CONFLICT (modify/delete): drivers/staging/skein/skein_generic.c deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/skein/skein_generic.c left in tree.
CONFLICT (content): Merge conflict in MAINTAINERS
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/iio/pressure/bmp085.txt
$ git rm -f drivers/staging/skein/skein_generic.c
Applying: disable erofs for now
Merging mux/for-next (23f13d082c17 Merge branch 'i2c-mux/for-next' into for-next)
CONFLICT (content): Merge conflict in MAINTAINERS
Merging slave-dma/next (fe2309127e8c Merge branch 'topic/renesas' into next)
Merging cgroup/for-next (e4f8d81c738d cgroup/tracing: Move taking of spin lock out of trace event handlers)
Merging scsi/for-next (103c7b7e0184 Merge branch 'misc' into for-next)
CONFLICT (modify/delete): lib/percpu_ida.c deleted in scsi/for-next and modified in HEAD. Version HEAD of lib/percpu_ida.c left in tree.
CONFLICT (content): Merge conflict in MAINTAINERS
$ git rm -f lib/percpu_ida.c
Merging scsi-mkp/for-next (c8a75afbf72e Revert "scsi: target/iscsi: Reduce number of __iscsit_free_cmd() callers")
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 (ac41b3f0cec0 Merge branch 'for-4.19' into for-next)
Applying: Revert "ata: ahci_platform: allow disabling of hotplug to save power"
Merging vhost/linux-next (89da619bc18d virtio_balloon: fix another race between migration and ballooning)
Merging rpmsg/for-next (02c801b2fc28 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
Merging gpio/for-next (aa3dc721a35a Merge branch 'devel' into for-next)
Merging pinctrl/for-next (e10382e245d4 Merge branch 'devel' into for-next)
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/pinctrl/st,stm32-pinctrl.txt
Merging pinctrl-samsung/for-next (b3793159249b dt-bindings: pinctrl: samsung: Add SPDX license identifier)
Merging pwm/for-next (19ad2b75c643 pwm: mxs: Switch to SPDX identifier)
Merging userns/for-next (04035aa33a12 proc: Don't change mount options on remount failure.)
CONFLICT (content): Merge conflict in fs/proc/root.c
CONFLICT (content): Merge conflict in fs/proc/internal.h
CONFLICT (content): Merge conflict in fs/proc/inode.c
Merging ktest/for-next (6cd110a91f52 ktest: Take submenu into account for grub2 menus)
Merging random/dev (b34fbaa92893 random: remove preempt disabled region)
Merging aio/master (2a8a98673c13 fs: aio: fix the increment of aio-nr and counting against aio-max-nr)
Merging kselftest/next (d2d49495b5c0 selftests: vDSO - fix to return KSFT_SKIP when test couldn't be run)
Merging y2038/y2038 (e264abeaf9da pstore: Remove bogus format string definition)
Merging livepatching/for-next (c72a7f515329 Merge branch 'for-4.18/upstream' into for-next)
Merging coresight/next (ad2a7edcccf5 dts: juno: Update coresight bindings)
CONFLICT (content): Merge conflict in include/linux/coresight.h
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/arm/coresight.txt
Merging rtc/rtc-next (ec9cf1b7a6af rtc: pcf85063: preserve control register value between stop and start)
Merging nvdimm/libnvdimm-for-next (64742dbc88dc Merge branch 'for-4.19/dax-memory-failure' into libnvdimm-for-next)
CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/mcheck/mce.c
Merging at24/at24/for-next (a2b3bf4846e5 eeprom: at24: Add support for address-width property)
Merging ntb/ntb-next (b1ce023ae8a2 ntb_netdev: fix sleep time mismatch)
Merging kspp/for-next/kspp (163f88362143 Merge branch 'for-next/gcc-plugins' into for-next/kspp)
Merging init_task/init_task (e1e871aff3de Expand INIT_STRUCT_PID and remove)
Merging cisco/for-next (ce397d215ccd Linux 4.18-rc1)
Merging xarray/xarray (f039e3979325 radix tree: Remove radix_tree_clear_tags)
CONFLICT (content): Merge conflict in MAINTAINERS
Merging fsi/master (9840fcd8cc43 fsi: Prevent multiple concurrent rescans)
Merging siox/siox/next (1e4b044d2251 Linux 4.18-rc4)
Merging ida/ida (d69dd7ae5cd8 ida: Convert to XArray)
Merging akpm-current/current (5149c8506d15 ipc/util.c: update return value of ipc_getref from int to bool)
CONFLICT (content): Merge conflict in kernel/cgroup/cgroup.c
CONFLICT (content): Merge conflict in include/linux/sched.h
CONFLICT (content): Merge conflict in include/linux/bitops.h
CONFLICT (content): Merge conflict in fs/f2fs/data.c
CONFLICT (content): Merge conflict in drivers/xen/gntdev.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c
CONFLICT (content): Merge conflict in drivers/firmware/efi/libstub/Makefile
Applying: fixup for bit.h/bitops.h merge
$ git checkout -b akpm remotes/origin/akpm/master
Applying: drivers/hwtracing/intel_th/msu.c: change return type to vm_fault_t
Applying: fs/afs: use new return type vm_fault_t
Applying: treewide: correct "differenciate" and "instanciate" typos
Applying: fs/proc/vmcore.c: hide vmcoredd_mmap_dumps() for nommu builds
Applying: drivers/gpu/drm/gma500/: change return type to vm_fault_t
Applying: treewide: convert ISO_8859-1 text comments to utf-8
Applying: s390: ebcdic: convert comments to UTF-8
Applying: lib/fonts: convert comments to utf-8
Applying: mm: Change return type int to vm_fault_t for fault handlers
Applying: mm-change-return-type-int-to-vm_fault_t-for-fault-handlers-fix
Applying: vfs: replace current_kernel_time64 with ktime equivalent
Applying: drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow
Merging akpm/master (f05ffe68c365 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] 39+ messages in thread

* Re: linux-next: Tree for Aug 1
  2017-08-01 23:55       ` Sergey Senozhatsky
@ 2017-08-02 11:13         ` Arnd Bergmann
  0 siblings, 0 replies; 39+ messages in thread
From: Arnd Bergmann @ 2017-08-02 11:13 UTC (permalink / raw)
  To: Sergey Senozhatsky
  Cc: Greg Kroah-Hartman, Linux-Next Mailing List,
	Linux Kernel Mailing List, Stephen Rothwell, Sergey Senozhatsky

On Wed, Aug 2, 2017 at 1:55 AM, Sergey Senozhatsky
<sergey.senozhatsky.work@gmail.com> wrote:
> On (08/01/17 15:28), Arnd Bergmann wrote:
>> Does this fix it? I definitely got this part wrong as I see now, we must
>> look up the 'tail' after calling __tty_buffer_request_room, not before.
>
> yes, it does. thanks!
>
> Tested-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>

Thanks for testing! I've now submitted that fix properly with a real
changelog and your Tested-by tag.

        Arnd

^ permalink raw reply	[flat|nested] 39+ messages in thread

* Re: linux-next: Tree for Aug 1
  2017-08-01 13:28     ` Arnd Bergmann
@ 2017-08-01 23:55       ` Sergey Senozhatsky
  2017-08-02 11:13         ` Arnd Bergmann
  0 siblings, 1 reply; 39+ messages in thread
From: Sergey Senozhatsky @ 2017-08-01 23:55 UTC (permalink / raw)
  To: Arnd Bergmann
  Cc: Sergey Senozhatsky, Greg Kroah-Hartman, Linux-Next Mailing List,
	Linux Kernel Mailing List, Stephen Rothwell, Sergey Senozhatsky

Hello,

On (08/01/17 15:28), Arnd Bergmann wrote:
[..]
> > Looking into it now, sorry for the breakage.
> 
> Does this fix it? I definitely got this part wrong as I see now, we must
> look up the 'tail' after calling __tty_buffer_request_room, not before.

yes, it does. thanks!

Tested-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>

	-ss

^ permalink raw reply	[flat|nested] 39+ messages in thread

* Re: linux-next: Tree for Aug 1
  2017-08-01 13:20   ` Arnd Bergmann
@ 2017-08-01 13:28     ` Arnd Bergmann
  2017-08-01 23:55       ` Sergey Senozhatsky
  0 siblings, 1 reply; 39+ messages in thread
From: Arnd Bergmann @ 2017-08-01 13:28 UTC (permalink / raw)
  To: Sergey Senozhatsky
  Cc: Greg Kroah-Hartman, Linux-Next Mailing List,
	Linux Kernel Mailing List, Stephen Rothwell, Sergey Senozhatsky

On Tue, Aug 1, 2017 at 3:20 PM, Arnd Bergmann <arnd@arndb.de> wrote:
> On Tue, Aug 1, 2017 at 2:42 PM, Sergey Senozhatsky
> <sergey.senozhatsky.work@gmail.com> wrote:
>> Hello,
>>
>>
>> seems that commit 979990c6284814617 ("tty: improve tty_insert_flip_char()
>> fast path") panics my kernel.
>>
>> in particular, this part
>
> Looking into it now, sorry for the breakage.

Does this fix it? I definitely got this part wrong as I see now, we must
look up the 'tail' after calling __tty_buffer_request_room, not before.

      Arnd

diff --git a/drivers/tty/tty_buffer.c b/drivers/tty/tty_buffer.c
index 6a8563633d4b..f8eba1c5412f 100644
--- a/drivers/tty/tty_buffer.c
+++ b/drivers/tty/tty_buffer.c
@@ -372,12 +372,13 @@ EXPORT_SYMBOL(tty_insert_flip_string_flags);
  */
 int __tty_insert_flip_char(struct tty_port *port, unsigned char ch, char flag)
 {
-       struct tty_buffer *tb = port->buf.tail;
+       struct tty_buffer *tb;
        int flags = (flag == TTY_NORMAL) ? TTYB_NORMAL : 0;

        if (!__tty_buffer_request_room(port, 1, flags))
                return 0;

+       tb = port->buf.tail;
        if (~tb->flags & TTYB_NORMAL)
                *flag_buf_ptr(tb, tb->used) = flag;
        *char_buf_ptr(tb, tb->used++) = ch;

^ permalink raw reply	[flat|nested] 39+ messages in thread

* Re: linux-next: Tree for Aug 1
  2017-08-01 12:42 ` Sergey Senozhatsky
@ 2017-08-01 13:20   ` Arnd Bergmann
  2017-08-01 13:28     ` Arnd Bergmann
  0 siblings, 1 reply; 39+ messages in thread
From: Arnd Bergmann @ 2017-08-01 13:20 UTC (permalink / raw)
  To: Sergey Senozhatsky
  Cc: Greg Kroah-Hartman, Linux-Next Mailing List,
	Linux Kernel Mailing List, Stephen Rothwell, Sergey Senozhatsky

On Tue, Aug 1, 2017 at 2:42 PM, Sergey Senozhatsky
<sergey.senozhatsky.work@gmail.com> wrote:
> Hello,
>
>
> seems that commit 979990c6284814617 ("tty: improve tty_insert_flip_char()
> fast path") panics my kernel.
>
> in particular, this part

Looking into it now, sorry for the breakage.

      Arnd

^ permalink raw reply	[flat|nested] 39+ messages in thread

* Re: linux-next: Tree for Aug 1
  2017-08-01  7:37 Stephen Rothwell
@ 2017-08-01 12:42 ` Sergey Senozhatsky
  2017-08-01 13:20   ` Arnd Bergmann
  0 siblings, 1 reply; 39+ messages in thread
From: Sergey Senozhatsky @ 2017-08-01 12:42 UTC (permalink / raw)
  To: Arnd Bergmann, Greg Kroah-Hartman
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List,
	Stephen Rothwell, Sergey Senozhatsky, Sergey Senozhatsky

Hello,


seems that commit 979990c6284814617 ("tty: improve tty_insert_flip_char()
fast path") panics my kernel.

in particular, this part

@@ -26,7 +27,7 @@ static inline int tty_insert_flip_char(struct tty_port *port,
                *char_buf_ptr(tb, tb->used++) = ch;
                return 1;
        }
-       return tty_insert_flip_string_flags(port, &ch, &flag, 1);
+       return __tty_insert_flip_char(port, ch, flag);
 }



I see various callstacks, but all endup in llist_del_first() -> fatal exception
in interrupt -> panic()


...
uart_insert_char()
  __tty_insert_flip_char()
    __tty_buffer_request_room()
      llist_del_first()

or

...
kdb_event()
  puts_queue()
    __tty_insert_flip_char()
      __tty_buffer_request_room()
        llist_del_first()



to reproduce:

1) screen /dev/ttyS0 115200
2) send several chars down to /dev/ttyS0, enough to panic() the kernel.


reverting that __tty_insert_flip_char(port, ch, flag) seems to work
on my side.

	-ss

^ permalink raw reply	[flat|nested] 39+ messages in thread

* linux-next: Tree for Aug 1
@ 2017-08-01  7:37 Stephen Rothwell
  2017-08-01 12:42 ` Sergey Senozhatsky
  0 siblings, 1 reply; 39+ messages in thread
From: Stephen Rothwell @ 2017-08-01  7:37 UTC (permalink / raw)
  To: Linux-Next Mailing List; +Cc: Linux Kernel Mailing List

Hi all,

Changes since 20170731:

The rdma tree lost its build failure.

I reverted a commit from the staging tree that was causing overnight
build failures.

The akpm-current tree gained a build failure for which I applied a patch
and another for which I reverted a commit.

The akpm tree gained a conflict against the wberr tree.

There was a build error after the merging of the akpm trees which I have
left broken for today.

Non-merge commits (relative to Linus' tree): 3505
 3681 files changed, 120460 insertions(+), 57536 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 267 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 (2e7ca2064cbb Merge branch 'for-4.13-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup)
Merging fixes/master (b4b8cbf679c4 Cavium CNN55XX: fix broken default Kconfig entry)
Merging kbuild-current/fixes (ad8181060788 kconfig: fix sparse warnings in nconfig)
Merging arc-current/for-curr (37f1db0e85ff ARC: [plat-axs10x]: prepare dts files for enabling PAE40 on axs103)
Merging arm-current/fixes (ce184a0dee92 ARM: 8687/1: signal: Fix unparseable iwmmxt_sigframe in uc_regspace[])
Merging m68k-current/for-linus (204a2be30a7a m68k: Remove ptrace_signal_deliver)
Merging metag-fixes/fixes (b884a190afce metag/usercopy: Add missing fixups)
Merging powerpc-fixes/fixes (253fd51e2f53 powerpc/powernv/pci: Return failure for some uses of dma_set_mask())
Merging sparc/master (8cd3ec51c0c3 sbus: Convert to using %pOF instead of full_name)
Merging fscrypt-current/for-stable (42d97eb0ade3 fscrypt: fix renaming and linking special files)
Merging net/master (9975a54b3c9e bpf: fix bpf_prog_get_info_by_fd to dump correct xlated_prog_len)
Merging ipsec/master (e6194923237f esp: Fix memleaks on error paths.)
Merging netfilter/master (9beceb54fa2c netfilter: x_tables: Fix use-after-free in ipt_do_table.)
Merging ipvs/master (f7fb77fc1235 netfilter: nft_compat: check extension hook mask only if set)
Merging wireless-drivers/master (5f5d03143de5 brcmfmac: fix memleak due to calling brcmf_sdiod_sgtable_alloc() twice)
Merging mac80211/master (d7f13f745036 cfg80211: Validate frequencies nested in NL80211_ATTR_SCAN_FREQUENCIES)
Merging sound-current/for-linus (ba92b1142879 ALSA: hda - Add mute led support for HP ProBook 440 G4)
Merging pci-current/for-linus (16f73eb02d7e Linux 4.13-rc3)
Merging driver-core.current/driver-core-linus (5771a8c08880 Linux v4.13-rc1)
Merging tty.current/tty-linus (37ef38f3f838 tty: pl011: fix initialization order of QDF2400 E44)
Merging usb.current/usb-linus (45d73860530a usb: musb: fix tx fifo flush handling again)
Merging usb-gadget-fixes/fixes (520eccdfe187 Linux 4.13-rc2)
Merging usb-serial-fixes/usb-linus (9585e340db9f USB: serial: cp210x: add support for Qivicon USB ZigBee dongle)
Merging usb-chipidea-fixes/ci-for-usb-stable (cbb22ebcfb99 usb: chipidea: core: check before accessing ci_role in ci_role_show)
Merging phy/fixes (5771a8c08880 Linux v4.13-rc1)
Merging staging.current/staging-linus (cef988642cda staging: comedi: comedi_fops: do not call blocking ops when !TASK_RUNNING)
Merging char-misc.current/char-misc-linus (520eccdfe187 Linux 4.13-rc2)
Merging input-current/for-linus (293b915fd9be Input: trackpoint - assume 3 buttons when buttons detection fails)
Merging crypto-current/master (41cdf7a45389 crypto: authencesn - Fix digest_null crash)
Merging ide/master (921edf312a6a ide: avoid warning for timings calculation)
Merging vfio-fixes/for-linus (bb67b496c338 include/linux/vfio.h: Guard powerpc-specific functions with CONFIG_VFIO_SPAPR_EEH)
Merging kselftest-fixes/fixes (5771a8c08880 Linux v4.13-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 (5771a8c08880 Linux v4.13-rc1)
Merging mfd-fixes/for-mfd-fixes (9e69672e90cc dt-bindings: mfd: Update STM32 timers clock names)
Merging v4l-dvb-fixes/fixes (8033120f36c0 media: atomisp2: array underflow in imx_enum_frame_size())
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 (16f73eb02d7e Linux 4.13-rc3)
Merging drm-misc-fixes/for-linux-next-fixes (99f828436788 dma-buf/sync_file: Allow multiple sync_files to wrap a single dma-fence)
Merging kbuild/for-next (5771a8c08880 Linux v4.13-rc1)
Merging uuid/for-next (832e4c83abc5 uuid: remove uuid_be)
Merging dma-mapping/for-next (878ec36765fa ARM: NOMMU: Wire-up default DMA interface)
Merging asm-generic/master (a351e9b9fc24 Linux 4.11)
Merging arc/for-next (6f8119230ed0 ARC: set boot print log level to PR_INFO)
Merging arm/for-next (640265076a84 Merge branches 'fixes' and 'misc' into for-next)
Merging arm-perf/for-next/perf (5771a8c08880 Linux v4.13-rc1)
Merging arm-soc/for-next (1d20d8a9fce8 ARM: pxa: select both FB and FB_W100 for eseries)
Merging actions/for-next (253d192bc4aa Merge branch 'v4.14/dt' into next)
Merging alpine/alpine/for-next (a1144b2b1ec4 ARM: dts: alpine: add valid clock-frequency values)
Merging amlogic/for-next (8c31a9e33516 Merge branch 'v4.14/drivers' 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 (01c1fe77824e Merge branch 'at91-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into at91-next)
Merging bcm2835/for-next (389c81b7e7ae 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 (83bf680264c1 Merge branch 'zte/dt64' into for-next)
Merging keystone/next (fb1a6241a46e Merge branch 'for_4.14/keystone_dts' into next)
Merging mvebu/for-next (fd63b625307d Merge branch 'mvebu/dt64' into mvebu/for-next)
Merging omap/for-next (191ae5a41246 Merge branch 'omap-for-v4.14/debug-ll' into for-next)
Merging omap-pending/for-next (c20c8f750d9f ARM: OMAP2+: hwmod: fix _idle() hwmod state sanity check sequence)
Merging reset/reset/next (e0be864f1424 ARC: reset: introduce HSDKv1 reset driver)
CONFLICT (content): Merge conflict in MAINTAINERS
Merging qcom/for-next (c3c9fffc9384 soc: qcom: mdt_loader: Use request_firmware_into_buf())
Merging realtek/for-next (5771a8c08880 Linux v4.13-rc1)
Merging renesas/next (77c3d7971bba Merge branches 'fixes-for-v4.13', 'arm64-dt-for-v4.14', 'arm64-defconfig-for-v4.14', 'defconfig-for-v4.14', 'drivers-for-v4.14', 'dt-bindings-for-v4.14', 'dt-for-v4.14' and 'soc-for-v4.14' into next)
Merging rockchip/for-next (29a737be1eab Merge branch 'v4.14-armsoc/dts64' 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 (4157348c49de Merge branch 'next/dt' into for-next)
Merging sunxi/sunxi/for-next (8a34f6719024 Merge branch 'sunxi/clk-fixes-for-4.13' into sunxi/for-next)
Merging tegra/for-next (20e72aa386b0 Merge branch for-4.14/arm/defconfig into for-next)
Merging arm64/for-next/core (425e1ed73e65 arm64: fix endianness annotation for 'struct jit_ctx' and friends)
Merging clk/clk-next (1667393126d7 clk: Convert to using %pOF instead of full_name)
CONFLICT (content): Merge conflict in MAINTAINERS
Merging c6x/for-linux-next (eab89e215ae4 c6x: defconfig: Cleanup from old Kconfig options)
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 (204a2be30a7a m68k: Remove ptrace_signal_deliver)
Merging m68knommu/for-next (8f7657c37322 m68k: allow NULL clock for clk_get_rate)
Merging metag/for-next (e3cd7f013bac metag/mm: Drop pointless increment)
Merging microblaze/next (14ef905bb2ee microblaze: Fix MSR flags when returning from exception)
Merging mips/mips-for-linux-next (e36f14f04d11 Merge branch '4.13-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 (74ad3d28af21 parisc: Define CONFIG_CPU_BIG_ENDIAN)
Merging powerpc/next (f74c89bd80fb powerpc/perf: Add thread IMC PMU support)
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 (dd783b4c7bf6 Merge tag 'vfio-ccw-20170724' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/vfio-ccw into features)
Merging sparc-next/master (cb8c65ccff7f Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc)
Merging sh/for-next (6e2fbfdd585f sh: fix futex FUTEX_OP_SET op on userspace addresses)
Merging tile/master (637f23abca87 tile: array underflow in setup_maxnodemem())
Merging uml/linux-next (61e8d462457f um: Correctly check for PTRACE_GETRESET/SETREGSET)
Merging unicore32/unicore32 (bc27113620ca unicore32-oldabi: add oldabi syscall interface)
CONFLICT (content): Merge conflict in arch/unicore32/include/asm/Kbuild
Merging xtensa/xtensa-for-next (51b5e9756efd Merge branch 'xtensa-fixes' into xtensa-for-next)
Merging fscrypt/master (c250b7dd8e73 fscrypt: make ->dummy_context() return bool)
Merging befs/for-next (5771a8c08880 Linux v4.13-rc1)
Merging btrfs/next (8b8b08cbfb90 Btrfs: fix delalloc accounting after copy_from_user faults)
Merging btrfs-kdave/for-next (3497efbab8dc Merge branch 'for-next-next-v4.14-20170728' into for-next-20170728)
CONFLICT (content): Merge conflict in fs/btrfs/scrub.c
CONFLICT (content): Merge conflict in fs/btrfs/extent_io.c
Merging ceph/master (08f71ae74acc ceph: use errseq_t for writeback error reporting)
Merging cifs/for-next (235b84fc862a Merge branch 'i2c/for-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux)
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 (84969465ddc4 hfsplus: Don't clear SGID when inheriting ACLs)
Merging ext4/dev (9c5d58fb9e1d ext4: convert swap_inode_data() over to use swap() on most of the fields)
Merging f2fs/dev (1766871af8a0 f2fs: support project quota)
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 (f070e5ac9bc7 jfs: preserve i_mode if __jfs_set_acl() fails)
Merging nfs/linux-next (16f73eb02d7e Linux 4.13-rc3)
Merging nfsd/nfsd-next (b20dae70bfa5 svcrdma: fix an incorrect check on -E2BIG and -EINVAL)
Merging orangefs/for-next (2f713b5c7d2a orangefs: count directory pieces correctly)
Merging overlayfs/overlayfs-next (0e082555cec9 ovl: check for bad and whiteout index on lookup)
Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock)
Merging ubifs/linux-next (a6664433d383 ubifs: Set double hash cookie also for RENAME_EXCHANGE)
Merging xfs/for-next (cd87d8679201 xfs: don't crash on unexpected holes in dir/attr btrees)
Merging file-locks/locks-next (3953704fde7e locks: restore a warn for leaked locks on close)
Merging wberr/wberr-next (5bb05d221954 fs: convert a pile of fsync routines to errseq_t based reporting)
Merging vfs/for-next (66bf97967726 annotate RWF_... flags)
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 (5a814231ae3d printk/console: Enhance the check for consoles using init memory)
Merging pci/next (16f73eb02d7e Linux 4.13-rc3)
Merging pstore/for-next/pstore (520eccdfe187 Linux 4.13-rc2)
Merging hid/for-next (40e5101b9018 Merge branch 'for-4.13/upstream-fixes' into for-next)
Merging i2c/i2c/for-next (ba1f668f388c Merge branch 'i2c/for-4.14' 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 (f996c4155d0d dmi: Mark all struct dmi_system_id instances const)
Merging hwmon-staging/hwmon-next (2732fc0ffb35 hwmon: (i5k_amb) constify pci_device_id)
Merging jc_docs/docs-next (bc7938deaca7 docs: submitting-patches - change non-ascii character to ascii)
Merging v4l-dvb/master (da48c948c263 media: fix warning on v4l2_subdev_call() result interpreted as bool)
Merging v4l-dvb-next/master (474dfccf3685 media: svg: avoid too long lines)
Merging fbdev/fbdev-for-next (dd0c41f8a7e0 efifb: allow user to disable write combined mapping.)
Merging pm/linux-next (48851d0f2b7a Merge branch 'device-properties' into linux-next)
Merging idle/next (306899f94804 x86 tsc: Add the Intel Denverton Processor to native_calibrate_tsc())
Merging thermal/next (5d72ed35678a Merge branches 'thermal-core', 'thermal-intel' and 'thermal-soc' into next)
Merging thermal-soc/next (aa647852c32a Merge branch 'work-linus' into work-next)
Merging ieee1394/for-next (72f3c27aa646 firewire: net: max MTU off by one)
Merging dlm/next (e94d6f64e7ba dlm: print log message when cluster name is not set)
Merging swiotlb/linux-next (69369f52d28a swiotlb-xen: implement xen_swiotlb_get_sgtable callback)
Merging net-next/master (1f139ed9ec40 ipv6: Avoid going through ->sk_net to access the netns)
Merging ipsec-next/master (8bafd73093f2 xfrm: add UDP encapsulation port in migrate message)
Merging netfilter-next/master (4d3a57f23dec netfilter: conntrack: do not enable connection tracking unless needed)
Merging nfc-next/master (bd751808f9ff NFC: trf7970a: Correct register settings for 27MHz clock)
Merging ipvs-next/master (a910d20aa007 netfilter: ipvs: Fix space before '[' error.)
Merging wireless-drivers-next/master (d28ac7be15c7 rtlwifi: rtl8821ae: Fix HW_VAR_NAV_UPPER operation)
Merging bluetooth/master (fb776481c4ff Bluetooth: hci_uart: Fix uninitialized alignment value)
Merging mac80211-next/master (3dc02251f43f Merge branch 'skb-accessor-cleanups')
Merging rdma/for-next (913cc67159bc IB/hfi1: Always perform offline transition)
Merging gfs2/for-next (4676743ded4d GFS2: Delete debugfs files only after we evict the glocks)
Merging mtd/master (5771a8c08880 Linux v4.13-rc1)
Merging l2-mtd/master (1fbef470f369 mtd: mtdswap: remove unused variables 'dev' and 'gd')
Merging nand/nand/next (81667e9c8ad8 mtd: nand: mtk: release lock on error path)
Merging spi-nor/spi-nor/next (f384b352cbf0 mtd: spi-nor: parse Serial Flash Discoverable Parameters (SFDP) tables)
Merging crypto/master (e28c190db668 csrypto: ccp - Expand RSA support for a v5 ccp)
Merging drm/drm-next (e6742e1021a5 drm: linux-next: build failure after merge of the drm-misc tree)
CONFLICT (content): Merge conflict in drivers/gpu/drm/nouveau/nv50_display.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_pm.c
Merging drm-panel/drm/panel/for-next (e4bac408b084 drm/panel: simple: Add support for Winstar WF35LTIACD)
Merging drm-intel/for-linux-next (d0604a24d4e4 drm/i915: Update DRIVER_DATE to 20170731)
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_display.c
Merging drm-tegra/drm/tegra/for-next (43240bbd871e gpu: host1x: At first try a non-blocking allocation for the gather copy)
Merging drm-misc/for-linux-next (3792b7c1a708 dma-buf/sw_sync: clean up list before signaling the fence)
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 (4a630fadbb29 drm/msm: Fix potential buffer overflow issue)
Merging hdlcd/for-upstream/hdlcd (fee4964f0a6c drm/arm: hdlcd: remove unused variables)
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 (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 (790cb4c7c954 drm/imx: lock scanout transfers for consecutive bursts)
Merging etnaviv/etnaviv/next (8cc47b3ea082 drm/etnaviv: populate GEM objects on cpu_prep)
Merging kconfig/for-next (6f7da290413b Linux 4.12)
Merging regmap/for-next (a7c33d98535c Merge remote-tracking branch 'regmap/topic/namespace' into regmap-next)
Merging sound/for-next (6c5a266029cc ALSA: hda: constify pci_device_id.)
Merging sound-asoc/for-next (e7faf583e2a9 Merge remote-tracking branches 'asoc/topic/twl6040', 'asoc/topic/wm8524', 'asoc/topic/wm8804' and 'asoc/topic/zte' into asoc-next)
Merging modules/modules-next (0bf8bf50eddc module: Remove const attribute from alias for MODULE_DEVICE_TABLE)
Merging input/next (4323418d62fe Input: sur40 - skip all blobs that are not touches)
Merging block/for-next (b2a5b74635f9 Merge branch 'for-4.14/block' into for-next)
Merging lightnvm/for-next (1c6286f26301 lightnvm: fix some error code in pblk-init.c)
Merging device-mapper/for-next (2298b6212f1c dm ioctl: constify ioctl lookup table)
Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards)
Merging mmc/next (bb1407c0df2c Merge branch 'fixes' into next)
Merging kgdb/kgdb-next (7a6653fca500 kdb: Fix handling of kallsyms_symbol_next() return value)
Merging md/for-next (bd48ff8a3c91 md: replace seq_release_private with seq_release)
Merging mfd/for-mfd-next (48a14b9f0cc6 mfd: max8998: Fix potential NULL pointer dereference)
Merging backlight/for-backlight-next (8c03a937ca99 backlight: pwm_bl: Make of_device_ids const)
Merging battery/for-next (67bd22c09ac1 power: supply: bq27xxx: move platform driver code into bq27xxx_battery_hdq.c)
Merging omap_dss2/for-next (c456a2f30de5 video: smscufx: remove unused variable)
Merging regulator/for-next (4e1896446b8d Merge remote-tracking branches 'regulator/topic/cpcap', 'regulator/topic/dt', 'regulator/topic/fan53555', 'regulator/topic/pwm' and 'regulator/topic/qcom' into regulator-next)
Merging security/next (be6f039747e7 security: fix description of values returned by cap_inode_need_killpriv)
Merging integrity/next (fc26bd50539b IMA: update IMA policy documentation to include pcr= option)
Merging keys/keys-next (8ab2a6905b28 KEYS: Add documentation for asymmetric keyring restrictions)
Merging selinux/next (20a8d62eeff8 selinux: genheaders should fail if too many permissions are defined)
Merging tpmdd/next (e7d872bf1bc5 Documentation: tpm: add powered-while-suspended binding documentation)
Merging watchdog/master (c013b65ad8a1 watchdog: introduce watchdog_worker_should_ping helper)
Merging iommu/next (4f019dc5a68e Merge branches 'iommu/fixes', 'arm/exynos', 'arm/renesas', 'arm/rockchip', 'x86/vt-d' and 'core' into next)
Merging dwmw2-iommu/master (910170442944 iommu/vt-d: Fix PASID table allocation)
Merging vfio/next (7f56c30bd0a2 vfio: Remove unnecessary uses of vfio_container.group_lock)
Merging trivial/for-next (6fbc8798d946 tty: fix comment for __tty_alloc_driver())
Merging audit/next (739bde1f2229 selinux: remove AVC init audit log message)
Merging devicetree/for-next (b041303c3e88 Merge branch 'dt/linus' into for-next)
Merging mailbox/mailbox-for-next (25bfee16d5a3 mailbox: Introduce Qualcomm APCS IPC driver)
Merging spi/for-next (b88c58644bcb Merge remote-tracking branches 'spi/topic/stm32', 'spi/topic/sunxi', 'spi/topic/tegra' and 'spi/topic/tools' into spi-next)
Merging tip/auto-latest (69779ccbf624 Merge branch 'x86/urgent')
Merging clockevents/clockevents/next (2287d8664fe7 timers: Make the cpu base lock raw)
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 (2efdda4a4108 EDAC, cpc925, ppc4xx: Convert to using %pOF instead of full_name)
Merging irqchip/irqchip/for-next (c1ae3cfa0e89 Linux 4.11-rc1)
Merging ftrace/for-next (2e028c4fe129 ftrace: Fix uninitialized variable in match_records())
Merging rcu/rcu/next (0904659d8f09 membarrier: Expedited private command)
CONFLICT (content): Merge conflict in arch/x86/mm/tlb.c
Merging kvm/linux-next (7b5e0a4e82bf Merge branch 'kvm-ppc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc into kvm-master)
Merging kvm-arm/next (7e5a672289c9 KVM: arm/arm64: Handle hva aging while destroying the vm)
Merging kvm-mips/next (dc44abd6aad2 KVM: MIPS/Emulate: Properly implement TLBR for T&E)
Merging kvm-ppc/kvm-ppc-next (8b24e69fc47e KVM: PPC: Book3S HV: Close race with testing for signals on guest entry)
Merging kvms390/next (5091d7c8ca2d KVM: s390: Multiple Epoch Facility support)
Merging xen-tip/linux-next (e91b2b119433 xen: dont fiddle with event channel masking in suspend/resume)
Merging percpu/for-next (5e81ee3e6a79 percpu: update header to contain bitmap allocator explanation.)
Merging workqueues/for-next (5dab90af0906 Merge branch 'for-4.13-fixes' into for-next)
Merging drivers-x86/for-next (972777171f33 platform/x86: wmi: Fix error handling in acpi_wmi_init())
Merging chrome-platform/for-next (3c778a7fcfaa platform/chrome : Add myself as Maintainer)
Merging hsi/for-next (67ddd75771b6 HSI: core: Use kcalloc() in two functions)
Merging leds/for-next (c68729119f4d leds: tlc591xx: add missing of_node_put)
Merging ipmi/for-next (8c3cbb96adf6 char: ipmi: eliminate misleading print info when being probed via ACPI)
Merging driver-core/driver-core-next (1af824f085e8 Merge branch 'bind_unbind' into driver-core-next)
Merging usb/usb-next (e978e9b977b0 c67x00-hcd: constify hc_driver structures)
Merging usb-gadget/next (5771a8c08880 Linux v4.13-rc1)
Merging usb-serial/usb-next (5771a8c08880 Linux v4.13-rc1)
Merging usb-chipidea-next/ci-for-usb-next (7c3a8b81503c usb: chipidea: core: do not register extcon notifier if extcon device is not existed)
Merging phy-next/next (e7cded272612 phy: allwinner: phy-sun4i-usb: Add log when probing)
Merging tty/tty-next (065ea0a7afd6 tty: improve tty_insert_flip_char() slow path)
Merging char-misc/char-misc-next (24a81a2c2581 Merge 4.13-rc2 into char-misc-next)
Merging extcon/extcon-next (5c27036d2b05 extcon: Convert to using %pOF instead of full_name)
Merging staging/staging-next (5551ad1e9fad staging: wlan-ng: Fix the types of the hfa384x_comm_tallies_16/32 members)
Applying: Revert "staging: fsl-mc: allow the driver compile multi-arch"
Merging mux/for-next (a351e9b9fc24 Linux 4.11)
Merging slave-dma/next (d4381f3cff0b Merge branch 'topic/bcm' into next)
Merging cgroup/for-next (dba9eccd4164 Merge branch 'for-4.14' into for-next)
Merging scsi/for-next (0dbbec278e24 Merge branch 'misc' into for-next)
Merging scsi-mkp/for-next (bb9be3739281 scsi: qla2xxx: Fix remoteport disconnect for FC-NVMe)
Merging target-updates/for-next (40435d86a62f tcmu: clean up the scatter helper)
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 (1fa69733bc9d Merge branch 'for-4.13-fixes' into for-next)
Merging binfmt_misc/for-next (4af75df6a410 binfmt_misc: add F option description to documentation)
Merging vhost/linux-next (cfa0ebc9d6d6 virtio-net: fix module unloading)
Merging rpmsg/for-next (5771a8c08880 Linux v4.13-rc1)
Merging gpio/for-next (8d2c6297aec9 Merge branch 'devel' into for-next)
CONFLICT (content): Merge conflict in drivers/gpio/gpio-mvebu.c
Merging pinctrl/for-next (ece5946c2eed Merge branch 'devel' into for-next)
Merging pinctrl-samsung/for-next (bbed85f45b2b pinctrl: samsung: Remove unneeded local variable initialization)
Merging pwm/for-next (5ec8c48a6235 Merge branch 'for-4.13/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 (64a76d0d64be signal: Fix sending signals with siginfo)
Merging ktest/for-next (f7c6401ff84a ktest: Make sure wait_for_input does honor the timeout)
Merging random/dev (72e5c740f633 random: reorder READ_ONCE() in get_random_uXX)
Merging aio/master (4c1d69950da4 fs: aio: fix the increment of aio-nr and counting against aio-max-nr)
Merging kselftest/next (f471e1fd82df selftests: sync: convert to use TAP13 ksft framework)
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 (26d8d1e9bb48 Merge branch 'for-4.12/upstream-fixes' into for-next)
Merging coresight/next (ee0c4a55a06c perf: cs-etm: Fix ETMv4 CONFIGR entry in perf.data file)
Merging rtc/rtc-next (2f7f1b780dd6 rtc: max8925: remove redundant check on ret)
Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field)
Merging nvdimm/libnvdimm-for-next (bbb3be170ac2 device-dax: fix sysfs duplicate warnings)
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 (152b74676664 randstruct: Enable function pointer struct detection)
Merging akpm-current/current (ad7a3f950f52 ipc: convert kern_ipc_perm.refcount from atomic_t to refcount_t)
Applying: mm: treewide: remove GFP_TEMPORARY allocation flag fix
$ git checkout -b akpm remotes/origin/akpm/master
Applying: mm: remove optimizations based on i_size in mapping writeback waits
CONFLICT (content): Merge conflict in include/linux/fs.h
Applying: fscache: fix fscache_objlist_show format processing
Applying: IB/mlx4: fix sprintf format warning
Applying: iopoll: avoid -Wint-in-bool-context warning
Applying: Kbuild: use -fshort-wchar globally
Applying: sparc64: NG4 memset 32 bits overflow
Applying: lib/crc-ccitt: add CCITT-FALSE CRC16 variant
Merging akpm/master (dfa5d8a30b13 lib/crc-ccitt: add CCITT-FALSE CRC16 variant)
Applying: Revert "mm-thp-enable-thp-migration-in-generic-path-fix"

^ permalink raw reply	[flat|nested] 39+ messages in thread

* linux-next: Tree for Aug 1
@ 2016-08-01  4:02 Stephen Rothwell
  0 siblings, 0 replies; 39+ messages in thread
From: Stephen Rothwell @ 2016-08-01  4:02 UTC (permalink / raw)
  To: linux-next; +Cc: linux-kernel

Hi all,

Please do not add material destined for v4.9 to your linux-next included
branches until after v4.8-rc1 has been released.

Changes since 20160729:

New Tree: befs

Non-merge commits (relative to Linus' tree): 4300
 3495 files changed, 145910 insertions(+), 65285 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
(this fails its final link) and pseries_le_defconfig and i386, sparc
and sparc64 defconfig.

Below is a summary of the state of the merge.

I am currently merging 241 trees (counting Linus' and 35 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

$ git checkout master
$ git reset --hard stable
Merging origin/master (c9b95e5961c0 Merge tag 'sound-4.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound)
Merging fixes/master (3fc9d690936f Merge branch 'for-4.8/drivers' of git://git.kernel.dk/linux-block)
Merging kbuild-current/rc-fixes (b36fad65d61f kbuild: Initialize exported variables)
Merging arc-current/for-curr (9bd54517ee86 arc: unwind: warn only once if DW2_UNWIND is disabled)
Merging arm-current/fixes (f6492164ecb1 ARM: 8577/1: Fix Cortex-A15 798181 errata initialization)
Merging m68k-current/for-linus (6bd80f372371 m68k/defconfig: Update defconfigs for v4.7-rc2)
Merging metag-fixes/fixes (0164a711c97b metag: Fix ioremap_wc/ioremap_cached build errors)
Merging powerpc-fixes/fixes (bfa37087aa04 powerpc: Initialise pci_io_base as early as possible)
Merging powerpc-merge-mpe/fixes (bc0195aad0da Linux 4.2-rc2)
Merging sparc/master (797cee982eef Merge branch 'stable-4.8' of git://git.infradead.org/users/pcmoore/audit)
Merging net/master (bb9c0fa3aa29 net: dsa: bcm_sf2: Unwind errors in correct order)
Merging ipsec/master (6916fb3b10b3 xfrm: Ignore socket policies when rebuilding hash tables)
Merging netfilter/master (ea43f860d984 Merge branch 'ethoc-fixes')
Merging ipvs/master (ea43f860d984 Merge branch 'ethoc-fixes')
Merging wireless-drivers/master (034fdd4a17ff Merge ath-current from ath.git)
Merging mac80211/master (16a910a6722b cfg80211: handle failed skb allocation)
Merging sound-current/for-linus (0984d159c8ad sound: oss: Use kernel_read_file_from_path() for mod_firmware_load())
Merging pci-current/for-linus (ef0dab4aae14 PCI: Fix unaligned accesses in VC code)
Merging driver-core.current/driver-core-linus (523d939ef98f Linux 4.7)
Merging tty.current/tty-linus (0e06f5c0deee Merge branch 'akpm' (patches from Andrew))
Merging usb.current/usb-linus (e65805251f2d Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip)
Merging usb-gadget-fixes/fixes (50c763f8c1ba usb: dwc3: Set the ClearPendIN bit on Clear Stall EP command)
Merging usb-serial-fixes/usb-linus (4c2e07c6a29e Linux 4.7-rc5)
Merging usb-chipidea-fixes/ci-for-usb-stable (ea1d39a31d3b usb: common: otg-fsm: add license to usb-otg-fsm)
Merging staging.current/staging-linus (0e06f5c0deee Merge branch 'akpm' (patches from Andrew))
Merging char-misc.current/char-misc-linus (0e06f5c0deee Merge branch 'akpm' (patches from Andrew))
Merging input-current/for-linus (080888286377 Merge branch 'next' into for-linus)
Merging crypto-current/master (8cf740ae85df crypto: marvell - Don't copy IV vectors from the _process op for ciphers)
Merging ide/master (797cee982eef Merge branch 'stable-4.8' of git://git.infradead.org/users/pcmoore/audit)
Merging rr-fixes/fixes (8244062ef1e5 modules: fix longstanding /proc/kallsyms vs module insertion race.)
Merging vfio-fixes/for-linus (ce7585f3c4d7 vfio/pci: Allow VPD short read)
Merging kselftest-fixes/fixes (f80eb4289491 selftests/exec: Makefile is a run-time dependency, add it to the install list)
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 mfd-fixes/for-mfd-fixes (5baaf3b9efe1 usb: dwc3: st: Use explicit reset_control_get_exclusive() API)
Merging drm-intel-fixes/for-linux-next-fixes (ed2eebbd61af drm/i915: add missing condition for committing planes on crtc)
Merging asm-generic/master (b0da6d44157a asm-generic: Drop renameat syscall from default list)
Merging arc/for-next (3925a16ae980 ARC: mm: don't loose PTE_SPECIAL in pte_modify())
Merging arm/for-next (bf9cb4359182 Merge branches 'component', 'cpuidle', 'fixes' and 'misc' into for-next)
Merging arm-perf/for-next/perf (1a695a905c18 Linux 4.7-rc1)
Merging arm-soc/for-next (9914c2a60844 arm-soc: document merge)
CONFLICT (content): Merge conflict in drivers/net/ethernet/freescale/fec.h
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/broadcom/ns2.dtsi
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/broadcom/ns2-svk.dts
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/apm/apm-shadowcat.dtsi
CONFLICT (content): Merge conflict in arch/arm/mach-mxs/Kconfig
CONFLICT (content): Merge conflict in arch/arm/mach-imx/mach-imx51.c
CONFLICT (content): Merge conflict in arch/arm/mach-bcm/board_bcm21664.c
CONFLICT (content): Merge conflict in arch/arm/Kconfig
Applying: clocksource/drivers/clps_711x: fixup for "ARM: clps711x: Switch to MULTIPLATFORM"
Merging amlogic/for-next (4d9b3db03bd4 Merge remote-tracking branch 'clk/clk-s905' into tmp/aml-rebuild)
Merging at91/at91-next (0f59c948faed Merge tag 'at91-ab-4.8-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into at91-next)
Merging bcm2835/for-next (aa5c0a1e15c2 Merge branch anholt/bcm2835-dt-64-next into for-next)
Merging berlin/berlin/for-next (d433580f3b4e Merge branches 'berlin64/dt' and '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 (63a404a3f177 Merge branch 'imx/defconfig' into for-next)
Merging keystone/next (eef6bb9fc17a Merge branch 'for_4.8/keystone' into next)
Merging mvebu/for-next (feaf6b0beba8 Merge branch 'mvebu/defconfig64' into mvebu/for-next)
Merging omap/for-next (370c3261ba8a Merge branch 'omap-for-v4.8/soc' into for-next)
Merging omap-pending/for-next (c20c8f750d9f ARM: OMAP2+: hwmod: fix _idle() hwmod state sanity check sequence)
Merging qcom/for-next (289f9fb05d0c ARM: dts: msm8916: Add smsm and smp2p nodes)
Merging renesas/next (314a0bb0dd88 Merge branch 'heads/soc-fixes-for-v4.8' into next)
Merging rockchip/for-next (ebbfb5d5627d Merge branch 'v4.8-armsoc/dts64' into for-next)
Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2)
Merging samsung/for-next (1a695a905c18 Linux 4.7-rc1)
Merging samsung-krzk/for-next (253256f64294 Merge branch 'next/soc' into for-next)
CONFLICT (content): Merge conflict in arch/arm/boot/dts/exynos5420.dtsi
Merging tegra/for-next (b551165a4593 Merge branch for-4.8/arm64/defconfig into for-next)
Merging arm64/for-next/core (fd6380b75065 arm64: arm: Fix-up the removal of the arm64 regs_query_register_name() prototype)
Merging blackfin/for-linus (391e74a51ea2 eth: bf609 eth clock: add pclk clock for stmmac driver probe)
CONFLICT (content): Merge conflict in arch/blackfin/mach-common/pm.c
Merging c6x/for-linux-next (ca3060d39ae7 c6x: Use generic clkdev.h header)
Merging cris/for-next (f9f3f864b5e8 cris: Fix section mismatches in architecture startup code)
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 (6bd80f372371 m68k/defconfig: Update defconfigs for v4.7-rc2)
Merging m68knommu/for-next (33688abb2802 Linux 4.7-rc4)
Merging metag/for-next (fb2bb461e2d8 metag: Remove duplicate KERN_<LEVEL> prefix)
Merging microblaze/next (52e9e6e05617 microblaze: pci: export isa_io_base to fix link errors)
Merging mips/mips-for-linux-next (c94ff0653c94 Merge branch '4.7-fixes' into mips-for-linux-next)
Merging nios2/for-next (9fa78f63a892 nios2: Add order-only DTC dependency to %.dtb target)
Merging parisc-hd/for-next (5975b2c0c10a Merge branch 'parisc-4.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux)
Merging powerpc/next (719dbb2df78f Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux into next)
Merging powerpc-mpe/next (bc0195aad0da Linux 4.2-rc2)
Merging fsl/next (9f595fd8b548 powerpc/8xx: Force VIRT_IMMR_BASE to be a positive number)
Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc)
Merging s390/features (e64a5470dcd2 s390/ftrace/jprobes: Fix conflict between jprobes and function graph tracing)
Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
Merging sh/for-next (0748d718ba7e sh: Delete unnecessary checks before the function call "mempool_destroy")
CONFLICT (content): Merge conflict in arch/sh/include/asm/spinlock.h
Applying: locking/spinlock, arch: merge fix for "sh: add J2 atomics using the cas.l instruction"
Merging tile/master (74050a3188c8 tile-srom: avoid krealloc(... __GFP_ZERO) pattern)
Merging uml/linux-next (a78ff1112263 um: add extended processor state save/restore support)
Merging unicore32/unicore32 (c83d8b2fc986 unicore32: mm: Add missing parameter to arch_vma_access_permitted)
Merging xtensa/for_next (9da8320bb977 xtensa: add test_kc705_hifi variant)
Merging befs/for-next (20af61a9f5b7 MAINTAINERS: befs: add new maintainers)
Merging btrfs/next (8b8b08cbfb90 Btrfs: fix delalloc accounting after copy_from_user faults)
Merging btrfs-kdave/for-next (d84c090ad3e9 Fixup: fs_info/root cleanups and qgroups patches)
CONFLICT (content): Merge conflict in fs/btrfs/extent_io.c
CONFLICT (content): Merge conflict in fs/btrfs/compression.c
Merging ceph/master (a0f2b6527541 ceph: fix symbol versioning for ceph_monc_do_statfs)
Merging cifs/for-next (27ae0c41ed2e Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse)
Merging configfs/for-next (3dc3afadeb04 configfs: don't set buffer_needs_fill to zero if show() returns error)
Merging ecryptfs/next (2bdcdbea80bd ecryptfs: don't allow mmap when the lower fs doesn't support it)
Merging ext3/for_next (e008bb6134a6 quota: use time64_t internally)
Merging ext4/dev (7bc949164511 ext4: verify extent header depth)
Merging f2fs/dev (194dc870a589 Add braces to avoid "ambiguous ‘else’" compiler warnings)
Merging freevxfs/for-next (bf1bb4b460c8 freevxfs: update Kconfig information)
Merging fscache/fscache (b00c2ae2ed3c FS-Cache: Don't override netfs's primary_index if registering failed)
Merging fuse/for-next (7244b9538994 f2fs: use filemap_check_errors())
Applying: btrfs: merge fix for "mm: export filemap_check_errors() to modules"
Merging gfs2/for-next (e1cb6be9e142 GFS2: Fix gfs2_replay_incr_blk for multiple journal sizes)
Merging jfs/jfs-next (6ed71e9819ac jfs: Coalesce some formats)
Merging nfs/linux-next (944171cbf499 pNFS: Actively set attributes as invalid if LAYOUTCOMMIT is outstanding)
Merging nfsd/nfsd-next (4b954bf8b629 nfsd: check that S_IFDIR implies d_can_lookup)
Merging orangefs/for-next (78fee0b6846f orangefs: fix namespace handling)
Merging overlayfs/overlayfs-next (b92a89750dba Revert "vfs: add lookup_hash() helper")
Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock)
Merging ubifs/linux-next (5d71afb00840 ubi: Use bitmaps in Fastmap self-check code)
Merging xfs/for-next (f2bdfda9a1c6 Merge branch 'xfs-4.8-misc-fixes-4' into for-next)
Merging file-locks/linux-next (5af9c2e19da6 Merge branch 'akpm' (patches from Andrew))
Merging vfs/for-next (38a8a5e62f9a Merge branch 'work.const-qstr' into for-next)
CONFLICT (content): Merge conflict in fs/f2fs/f2fs.h
CONFLICT (content): Merge conflict in fs/f2fs/dir.c
Applying: qstr: unconstify fuse_reverse_inval_entry parameter
Merging pci/next (e667f341ff20 Merge branch 'pci/host-artpec' into next)
Merging pstore/for-next/pstore (35da60941e44 pstore/ram: add Device Tree bindings)
Merging hid/for-next (de1bcd764ea0 Merge branch 'for-4.8/upstream' into for-next)
Merging i2c/i2c/for-next (c35d490516e6 Merge branch 'i2c/for-4.8' 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 (0deb6b2c087a dmi-id: don't free dev structure after calling device_register)
Merging hwmon-staging/hwmon-next (1d3dd4ce210f Documentation: dtb: xgene: Add hwmon dts binding documentation)
Merging v4l-dvb/master (bcbadf9d8331 Merge branch 'topic/docs-next' into to_next)
Merging pm/linux-next (6a0b69070529 Merge branch 'pnp' into linux-next)
Merging idle/next (f55532a0c0b8 Linux 4.6-rc1)
Merging thermal/next (2c5ce98e1e83 thermal: sysfs: add comments describing locking strategy)
Merging thermal-soc/next (9a1d2bd3e7fd Merge branch 'work-fixes' into work-next)
CONFLICT (add/add): Merge conflict in drivers/thermal/thermal_sysfs.c
CONFLICT (add/add): Merge conflict in drivers/thermal/thermal_helpers.c
CONFLICT (content): Merge conflict in drivers/thermal/thermal_core.c
Merging ieee1394/for-next (384fbb96f926 firewire: nosy: Replace timeval with timespec64)
Merging dlm/next (5c93f56f770e dlm: Use kmemdup instead of kmalloc and memcpy)
Merging swiotlb/linux-next (386744425e35 swiotlb: Make linux/swiotlb.h standalone includible)
Merging slave-dma/next (61fa0c294347 Merge branch 'for-linus' into next)
Merging net-next/master (6a492b0f23d2 Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi)
Merging ipsec-next/master (cb866e3298cd xfrm: Increment statistic counter on inner mode error)
Merging netfilter-next/master (4b512e1c1f8d netfilter: nft_compat: fix crash when related match/target module is removed)
Merging ipvs-next/master (ae9442f688c3 ipvs: Use IS_ERR_OR_NULL(svc) instead of IS_ERR(svc) || svc == NULL)
Merging wireless-drivers-next/master (cb6a11518850 wlcore: spi: fix build warning caused by redundant variable)
Merging bluetooth/master (4f6781836206 mac802154: use rate limited warnings for malformed frames)
Merging mac80211-next/master (7d27a0ba7adc cfg80211: Add mesh peer AID setting API)
Merging rdma/for-next (fb92d8fb1b9c Merge branches 'cxgb4-4.8', 'mlx5-4.8' and 'fw-version' into k.o/for-4.8)
Merging rdma-leon/rdma-next (4c2e07c6a29e Linux 4.7-rc5)
Merging rdma-leon-test/testing/rdma-next (92d21ac74a9e Linux 4.7-rc7)
Merging mtd/master (7ce9ea7e6b35 mtd: nand: omap2: Add check for old elm binding)
Merging l2-mtd/master (1dcff2e4ae72 mtd: spi-nor: don't build Cadence QuadSPI on non-ARM)
CONFLICT (content): Merge conflict in drivers/mtd/devices/Kconfig
Merging nand/nand/next (8490c03bd9d4 mtd: nand: jz4780: Update MODULE_AUTHOR email address)
Merging crypto/master (0f95e2ffc58f Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6)
Merging drm/drm-next (1cf915d305b6 Merge tag 'imx-drm-fixes-2016-07-27' of git://git.pengutronix.de/git/pza/linux into drm-next)
CONFLICT (modify/delete): drivers/staging/android/sync.h deleted in HEAD and modified in drm/drm-next. Version drm/drm-next of drivers/staging/android/sync.h left in tree.
CONFLICT (content): Merge conflict in drivers/media/platform/omap/omap_voutdef.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/sti/sti_drv.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/rockchip/rockchip_drm_drv.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/msm/msm_drv.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_debugfs.c
CONFLICT (content): Merge conflict in Documentation/index.rst
$ git rm -f drivers/staging/android/sync.h
Applying: staging/android: merge fix up for sync.h renaming
Merging drm-panel/drm/panel/for-next (9bb34c4c730d drm/panel: simple: Add support for Starry KR122EA0SRA panel)
Merging drm-intel/for-linux-next (a7b4667a0002 drm/i915: Never fully mask the the EI up rps interrupt on SNB/IVB)
Merging drm-tegra/drm/tegra/for-next (64ea25c3bc86 drm/tegra: sor: Reject HDMI 2.0 modes)
Merging drm-misc/topic/drm-misc (12ae57aab438 drm/arm: mali-dp: Fix error return code in malidp_bind())
Merging drm-exynos/exynos-drm/for-next (25364a9e54fb Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid)
Merging drm-msm/msm-next (0a677125d0ff drm/msm: Delete an unnecessary check before drm_gem_object_unreference())
Merging hdlcd/for-upstream/hdlcd (523d939ef98f Linux 4.7)
Merging mali-dp/for-upstream/mali-dp (59ba2422b430 MAINTAINERS: Add entry for Mali-DP driver)
Merging sunxi/sunxi/for-next (25d6a931b3f3 Merge branches 'sunxi/clk-fixes-for-4.7', 'sunxi/defconfig-for-4.8', 'sunxi/drm-fixes-for-4.7' and 'sunxi/dt-for-4.8' into sunxi/for-next)
Merging kbuild/for-next (f6830d5346c9 Merge branch 'kbuild/misc' into kbuild/for-next)
CONFLICT (content): Merge conflict in Makefile
Merging kspp/for-next/kspp (6fbe16013e52 Merge branch 'for-next/ro_after_init' into for-next/kspp)
CONFLICT (content): Merge conflict in mm/page_alloc.c
CONFLICT (content): Merge conflict in drivers/char/random.c
CONFLICT (content): Merge conflict in arch/x86/kernel/x86_init.c
CONFLICT (content): Merge conflict in arch/powerpc/Kconfig
CONFLICT (content): Merge conflict in arch/arm64/include/asm/uaccess.h
Merging kconfig/for-next (5bcba792bb30 localmodconfig: Fix whitespace repeat count after "tristate")
Merging regmap/for-next (efeb1a3ab91d Merge remote-tracking branches 'regmap/topic/bulk', 'regmap/topic/i2c', 'regmap/topic/iopoll', 'regmap/topic/irq' and 'regmap/topic/maintainers' into regmap-next)
Merging sound/for-next (0984d159c8ad sound: oss: Use kernel_read_file_from_path() for mod_firmware_load())
Merging sound-asoc/for-next (e70a386d6f07 Merge remote-tracking branch 'asoc/fix/rcar' into asoc-linus)
Merging modules/modules-next (8acc0026b0f3 extable.h: add stddef.h so "NULL" definition is not implicit)
Merging input/next (192bd2be1a75 Input: add driver for Silead touchscreens)
Merging block/for-next (b013517951a1 Merge branch 'for-4.8/core' into for-next)
Merging lightnvm/for-next (191d684c5d4f Merge branch 'for-4.8/drivers' into for-next)
Merging device-mapper/for-next (b5ab4a9ba557 dm: allow bio-based table to be upgraded to bio-based with DAX support)
Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards)
Merging mmc-uh/next (6ea625794518 mmc: rtsx_pci: Remove deprecated create_singlethread_workqueue)
Merging md/for-next (4fe0a741cdde raid5: fix incorrectly counter of conf->empty_inactive_list_nr)
Merging mfd/for-mfd-next (f37be01e6dc6 mfd: qcom_rpm: Parametrize also ack selector size)
Merging backlight/for-backlight-next (602553073892 backlight: lp855x: Add enable regulator)
Merging battery/master (4fcd504edbf7 power: reset: add reboot mode driver)
Merging omap_dss2/for-next (ab366b40b851 fbdev: Use IS_ENABLED() instead of checking for built-in or module)
Merging regulator/for-next (a485f5fc8c8e Merge remote-tracking branches 'regulator/topic/qcom-spmi', 'regulator/topic/rn5t618', 'regulator/topic/tps65218' and 'regulator/topic/twl' into regulator-next)
Merging security/next (7616ac70d1bb apparmor: fix SECURITY_APPARMOR_HASH_DEFAULT parameter handling)
Merging integrity/next (544e1cea03e6 ima: extend the measurement entry specific pcr)
Merging keys/keys-next (05638c9bc586 Merge branch 'keys-asym-keyctl' into keys-next)
Merging selinux/next (3f09354ac84c netlabel: Implement CALIPSO config functions for SMACK.)
Merging tpmdd/next (82cc1a49b635 tpm: Add TPM 2.0 support to the Nuvoton i2c driver (NPCT6xx family))
Merging watchdog/master (1ac06563434e watchdog: gpio_wdt: Fix missing platform_set_drvdata() in gpio_wdt_probe())
Merging iommu/next (f360d3241f55 Merge branches 'x86/amd', 'x86/vt-d', 'arm/exynos', 'arm/mediatek', 'arm/msm', 'arm/rockchip', 'arm/smmu' and 'core' into next)
CONFLICT (content): Merge conflict in drivers/iommu/mtk_iommu.c
Merging dwmw2-iommu/master (2566278551d3 Merge git://git.infradead.org/intel-iommu)
Merging vfio/next (0991bbdbf5b8 vfio: platform: check reset call return code during release)
Merging jc_docs/docs-next (a88b1672d4dd doc-rst: kernel-doc: fix handling of address_space tags)
Merging trivial/for-next (34df117414d7 fat: fix error message for bogus number of directory entries)
Merging audit/next (43761473c254 audit: fix a double fetch in audit_log_single_execve_arg())
Merging devicetree/for-next (e973f4ec130a xtensa: Partially Revert "xtensa: Remove unnecessary of_platform_populate with default match table")
Merging mailbox/mailbox-for-next (a68b216676e8 mailbox: Fix format and type mismatches in Broadcom PDC driver)
Merging spi/for-next (2932c287108e spi: img-spfi: Remove spi_master_put in img_spfi_remove())
Merging tip/auto-latest (0bd99d3b2034 Merge branch 'x86/urgent')
Merging clockevents/clockevents/next (1d661bf5327a clocksource/drivers/time-armada-370-xp: Fix return value check)
Merging edac/linux_next (12f0721c5a70 sb_edac: correctly fetch DIMM width on Ivy Bridge and Haswell)
Merging edac-amd/for-next (a67adb32d941 ARM: dts: Add Arria10 Ethernet EDAC devicetree entry)
Merging irqchip/irqchip/for-next (77d50b17c990 Merge branch 'irqchip/misc' into irqchip/for-next)
Merging ftrace/for-next (78aebca2c955 printk, tracing: Avoiding unneeded blank lines)
Merging rcu/rcu/next (5bc94664884a rcu: Avoid redundant quiescent-state chasing)
CONFLICT (content): Merge conflict in kernel/rcu/tree.c
Merging kvm/linux-next (912902ce78b0 Merge tag 'kvm-arm-for-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into next)
CONFLICT (content): Merge conflict in virt/kvm/kvm_main.c
CONFLICT (modify/delete): virt/kvm/arm/vgic.c deleted in kvm/linux-next and modified in HEAD. Version HEAD of virt/kvm/arm/vgic.c left in tree.
CONFLICT (content): Merge conflict in include/linux/irqchip/arm-gic-v3.h
CONFLICT (content): Merge conflict in arch/x86/kvm/vmx.c
CONFLICT (content): Merge conflict in arch/s390/mm/gmap.c
CONFLICT (content): Merge conflict in arch/s390/hypfs/hypfs_diag.c
CONFLICT (content): Merge conflict in arch/powerpc/kernel/traps.c
CONFLICT (content): Merge conflict in arch/powerpc/kernel/idle_book3s.S
CONFLICT (content): Merge conflict in arch/powerpc/kernel/exceptions-64s.S
CONFLICT (content): Merge conflict in arch/powerpc/kernel/Makefile
CONFLICT (content): Merge conflict in arch/powerpc/include/asm/paca.h
$ git rm -f virt/kvm/arm/vgic.c
Applying: s390: fix merge conflict in arch/s390/kvm/kvm-s390.c
Applying: s390: merge fix up for __diag204 move
Merging kvm-arm/next (3f312db6b65b KVM: arm: vgic-irqfd: Workaround changing kvm_set_routing_entry prototype)
CONFLICT (content): Merge conflict in virt/kvm/irqchip.c
CONFLICT (content): Merge conflict in Documentation/virtual/kvm/api.txt
Merging kvm-ppc/kvm-ppc-next (c63517c2e381 KVM: PPC: Book3S: correct width in XER handling)
Merging kvm-ppc-paulus/kvm-ppc-next (93d17397e4e2 KVM: PPC: Book3S HV: Save/restore TM state in H_CEDE)
Merging kvms390/next (9acc317b183f KVM: s390: let ptff intercepts result in cc=3)
Merging xen-tip/linux-next (d34c30cc1fa8 xen: add static initialization of steal_clock op to xen_time_ops)
Merging percpu/for-next (6710e594f71c percpu: fix synchronization between synchronous map extension and chunk destruction)
Merging workqueues/for-next (d945b5e9f0e3 workqueue: Fix setting affinity of unbound worker threads)
Merging drivers-x86/for-next (c37636b450ae dell-wmi: Ignore WMI event 0xe00e)
Merging chrome-platform/for-next (31b764171cb5 Revert "platform/chrome: chromeos_laptop: Add Leon Touch")
Merging hsi/for-next (9c99e5e51988 HSI: omap_ssi: drop pm_runtime_irq_safe)
Merging leds/for-next (5706c01fcfb3 leds: is31fl32xx: define complete i2c_device_id table)
Merging ipmi/for-next (92cad0931b08 ipmi: remove trydefaults parameter and default init)
Merging driver-core/driver-core-next (523d939ef98f Linux 4.7)
Merging tty/tty-next (0e06f5c0deee Merge branch 'akpm' (patches from Andrew))
Merging usb/usb-next (0bf048abebb6 staging: emxx_udc: allow modular build)
Merging usb-gadget/next (15e4292a2d21 usb: renesas_usbhs: protect the CFIFOSEL setting in usbhsg_ep_enable())
Merging usb-serial/usb-next (3161da970d38 USB: serial: use variable for status)
Merging usb-chipidea-next/ci-for-usb-next (229d43daf8ed usb: chipidea: imx: set over current polarity per dts setting)
Merging staging/staging-next (0e06f5c0deee Merge branch 'akpm' (patches from Andrew))
Merging char-misc/char-misc-next (0e06f5c0deee Merge branch 'akpm' (patches from Andrew))
Merging extcon/extcon-next (c2692f2dad4f extcon: Block the bit masking operation for cable state except for extcon core)
Merging cgroup/for-next (1cab4a96cab6 Merge branch 'for-4.8' into for-next)
Merging scsi/for-next (d242e6680e81 fcoe: Use default VLAN for FIP VLAN discovery)
Merging target-updates/for-next (291e3e51a34d target: fix spelling mistake: "limitiation" -> "limitation")
Merging target-merge/for-next-merge (2994a7518317 cxgb4: update Kconfig and Makefile)
Merging libata/for-next (737bee9308c4 libata-scsi: better style in ata_msense_*())
Merging binfmt_misc/for-next (4af75df6a410 binfmt_misc: add F option description to documentation)
Merging pinctrl/for-next (9573e7923007 pinctrl: fix pincontrol definition for marvell)
Merging vhost/linux-next (139ab4d4e68b tools/virtio: add noring tool)
Merging remoteproc/for-next (7a6271a80cae remoteproc/wkup_m3: Use MODULE_DEVICE_TABLE to export alias)
Merging rpmsg/for-next (e937b335a738 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
Merging gpio/for-next (152b09f20130 Merge branch 'devel' into for-next)
Merging dma-mapping/dma-mapping-next (d770e558e219 Linux 4.2-rc1)
Merging pwm/for-next (53de7c26ded7 Merge branch 'for-4.8/regulator' into for-next)
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/pwm/pwm-tiehrpwm.txt
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 (aeaa4a79ff6a fs: Call d_automount with the filesystems creds)
Merging ktest/for-next (2dcd0af568b0 Linux 4.6)
Merging clk/clk-next (d22527fed2f0 Merge branch 'clk-fixes' into clk-next)
Merging random/dev (59b8d4f1f5d2 random: use for_each_online_node() to iterate over NUMA nodes)
Merging aio/master (b562e44f507e Linux 4.5)
Merging kselftest/next (d78388dbec25 selftests: media_tests add a new video device test)
Merging y2038/y2038 (549eb7b22e24 AFS: Correctly use 64-bit time for UUID)
Merging luto-misc/next (2dcd0af568b0 Linux 4.6)
Merging borntraeger/linux-next (b562e44f507e Linux 4.5)
Merging livepatching/for-next (6d9122078097 Merge branch 'for-4.7/core' into for-next)
Merging coresight/next (27ee11458de3 coresight: tmc: Delete an unnecessary check before the function call "kfree")
Merging rtc/rtc-next (144d2fe0ad37 rtc: asm9260: remove .owner field for driver)
CONFLICT (content): Merge conflict in arch/x86/platform/efi/efi_64.c
Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field)
Merging nvdimm/libnvdimm-for-next (0606263f24f3 Merge branch 'for-4.8/libnvdimm' into libnvdimm-for-next)
Merging dax-misc/dax-misc (4d9a2c874667 dax: Remove i_mmap_lock protection)
Merging akpm-current/current (1042ef17ceff ipc/msg.c: use freezable blocking call)
CONFLICT (content): Merge conflict in include/linux/thread_info.h
CONFLICT (content): Merge conflict in fs/befs/linuxvfs.c
CONFLICT (content): Merge conflict in arch/x86/include/asm/thread_info.h
$ git checkout -b akpm remotes/origin/akpm/master
Applying: drivers/net/wireless/intel/iwlwifi/dvm/calib.c: simplfy min() expression
Applying: drivers/fpga/Kconfig: fix build failure
Applying: tree-wide: replace config_enabled() with IS_ENABLED()
Applying: include/linux/bitmap.h: cleanup
Applying: powerpc: add explicit #include <asm/asm-compat.h> for jump label
Applying: sparc: support static_key usage in non-module __exit sections
Applying: tile: support static_key usage in non-module __exit sections
Applying: arm: jump label may reference text in __exit
Applying: jump_label: remove bug.h, atomic.h dependencies for HAVE_JUMP_LABEL
Applying: dynamic_debug: add jump label support
Applying: ipc/sem.c: fix complex_count vs. simple op race
Applying: media: mtk-vcodec: remove unused dma_attrs
Applying: dma-mapping: use unsigned long for dma_attrs
Applying: alpha: dma-mapping: use unsigned long for dma_attrs
Applying: arc: dma-mapping: use unsigned long for dma_attrs
Applying: ARM: dma-mapping: use unsigned long for dma_attrs
Applying: arm64: dma-mapping: use unsigned long for dma_attrs
Applying: avr32: dma-mapping: use unsigned long for dma_attrs
Applying: blackfin: dma-mapping: use unsigned long for dma_attrs
Applying: c6x: dma-mapping: use unsigned long for dma_attrs
Applying: cris: dma-mapping: use unsigned long for dma_attrs
Applying: frv: dma-mapping: use unsigned long for dma_attrs
Applying: drm/exynos: dma-mapping: use unsigned long for dma_attrs
Applying: drm/mediatek: dma-mapping: use unsigned long for dma_attrs
Applying: drm/msm: dma-mapping: use unsigned long for dma_attrs
Applying: drm/nouveau: dma-mapping: use unsigned long for dma_attrs
Applying: drm/rockship: dma-mapping: use unsigned long for dma_attrs
Applying: infiniband: dma-mapping: use unsigned long for dma_attrs
Applying: iommu: dma-mapping: use unsigned long for dma_attrs
Applying: media: dma-mapping: use unsigned long for dma_attrs
Applying: xen: dma-mapping: use unsigned long for dma_attrs
Applying: swiotlb: dma-mapping: use unsigned long for dma_attrs
Applying: powerpc: dma-mapping: use unsigned long for dma_attrs
Applying: video: dma-mapping: use unsigned long for dma_attrs
Applying: x86: dma-mapping: use unsigned long for dma_attrs
Applying: iommu: intel: dma-mapping: use unsigned long for dma_attrs
Applying: h8300: dma-mapping: use unsigned long for dma_attrs
Applying: hexagon: dma-mapping: use unsigned long for dma_attrs
Applying: ia64: dma-mapping: use unsigned long for dma_attrs
Applying: m68k: dma-mapping: use unsigned long for dma_attrs
Applying: metag: dma-mapping: use unsigned long for dma_attrs
Applying: microblaze: dma-mapping: use unsigned long for dma_attrs
Applying: mips: dma-mapping: use unsigned long for dma_attrs
Applying: mn10300: dma-mapping: use unsigned long for dma_attrs
Applying: nios2: dma-mapping: use unsigned long for dma_attrs
Applying: openrisc: dma-mapping: use unsigned long for dma_attrs
Applying: parisc: dma-mapping: use unsigned long for dma_attrs
Applying: misc: mic: dma-mapping: use unsigned long for dma_attrs
Applying: s390: dma-mapping: use unsigned long for dma_attrs
Applying: sh: dma-mapping: use unsigned long for dma_attrs
Applying: sparc: dma-mapping: use unsigned long for dma_attrs
Applying: tile: dma-mapping: use unsigned long for dma_attrs
Applying: unicore32: dma-mapping: use unsigned long for dma_attrs
Applying: xtensa: dma-mapping: use unsigned long for dma_attrs
Applying: remoteproc: qcom: use unsigned long for dma_attrs
Applying: dma-mapping: remove dma_get_attr
Applying: dma-mapping: document the DMA attributes next to the declaration
Applying: samples/kprobe: convert the printk to pr_info/pr_err
Applying: samples/jprobe: convert the printk to pr_info/pr_err
Applying: samples/kretprobe: convert the printk to pr_info/pr_err
Applying: samples/kretprobe: fix the wrong type
Merging akpm/master (5bdda9f163b7 samples/kretprobe: fix the wrong type)

^ permalink raw reply	[flat|nested] 39+ messages in thread

* linux-next: Tree for Aug 1
@ 2014-08-01  9:14 Stephen Rothwell
  0 siblings, 0 replies; 39+ messages in thread
From: Stephen Rothwell @ 2014-08-01  9:14 UTC (permalink / raw)
  To: linux-next; +Cc: linux-kernel

[-- Attachment #1: Type: text/plain, Size: 34409 bytes --]

Hi all,

Changes since 20140731:

The modules tree still had its build failure so I used the version from
next-20140725.

The mmc-uh tree still had its build failure so I used the version from
next-20140725.

The kvm tree gained a conflict against the ftrace tree.

The staging tree gained a conflict against the v4l-dvb tree.

The gpio tree still had its build failure so I used the version from
next-20140728.

The akpm-current tree lost its build failure.

Non-merge commits (relative to Linus' tree): 9899
 8612 files changed, 368967 insertions(+), 434639 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 223 trees (counting Linus' and 30 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 (7c909b09372d Merge tag 'clk-fixes-for-linus' of git://git.linaro.org/people/mike.turquette/linux)
Merging fixes/master (1795cd9b3a91 Linux 3.16-rc5)
Merging kbuild-current/rc-fixes (dd5a6752ae7d firmware: Create directories for external firmware)
Merging arc-current/for-curr (89ca3b881987 Linux 3.15-rc4)
Merging arm-current/fixes (a5ab9a0e748f ARM: idmap: add identity mapping usage node)
Merging m68k-current/for-linus (5bc8c7cdeb6e m68k: Export mach_random_get_entropy to modules)
Merging metag-fixes/fixes (ffe6902b66aa asm-generic: remove _STK_LIM_MAX)
Merging mips-fixes/mips-fixes (08a9c3c9afcf MIPS: OCTEON: make get_system_type() thread-safe)
Merging powerpc-merge/merge (396a34340cdf powerpc: Fix endianness of flash_block_list in rtas_flash)
Merging sparc/master (31dab719fa50 Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6)
Merging net/master (47fab41ab51a bridge: Don't include NDA_VLAN for FDB entries with vid 0)
Merging ipsec/master (a0e5ef53aac8 xfrm: Fix installation of AH IPsec SAs)
Merging sound-current/for-linus (7440850c20b6 ALSA: hda - fix an external mic jack problem on a HP machine)
Merging pci-current/for-linus (bf177a1eb6d1 MAINTAINERS: Update mx6 PCI driver maintainer's email)
Merging wireless/master (c01fac1c77a0 ath9k: fix aggregation session lockup)
Merging driver-core.current/driver-core-linus (9a3c4145af32 Linux 3.16-rc6)
Merging tty.current/tty-linus (1795cd9b3a91 Linux 3.16-rc5)
Merging usb.current/usb-linus (9a3c4145af32 Linux 3.16-rc6)
Merging usb-gadget-fixes/fixes (a8a85b01d185 usb: musb/cppi41: call musb_ep_select() before accessing an endpoint's CSR)
Merging usb-serial-fixes/usb-linus (1795cd9b3a91 Linux 3.16-rc5)
Merging staging.current/staging-linus (4aa0abed3a2a staging: vt6655: Fix disassociated messages every 10 seconds)
Merging char-misc.current/char-misc-linus (9a3c4145af32 Linux 3.16-rc6)
Merging input-current/for-linus (f62d14a8072b Input: document INPUT_PROP_TOPBUTTONPAD)
Merging md-current/for-linus (d47648fcf061 raid5: avoid finding "discard" stripe)
Merging crypto-current/master (4c63f83c2c2e crypto: af_alg - properly label AF_ALG socket)
Merging ide/master (15ba2236f355 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging dwmw2/master (5950f0803ca9 pcmcia: remove RPX board stuff)
Merging devicetree-current/devicetree/merge (5a12a597a862 arm: Add devicetree fixup machine function)
Merging rr-fixes/fixes (79465d2fd48e module: remove warning about waiting module removal.)
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 (f4be89cecea4 drm/i915: Fix crash when failing to parse MIPI VBT)
Merging asm-generic/master (fb9de7ebc3a2 xtensa: Use generic asm/mmu.h for nommu)
Merging arc/for-next (3a5d0df211dd mm, arc: remove obsolete pagefault oom killer comment)
Merging arm/for-next (740c54c889b6 Merge branch 'devel-stable' into for-next)
CONFLICT (content): Merge conflict in arch/arm/mach-mvebu/headsmp-a9.S
Merging arm-perf/for-next/perf (4c834452aad0 Linux 3.16-rc3)
Merging arm-soc/for-next (716519f1f349 Merge branch 'next/defconfig' into for-next)
CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/headsmp.S
CONFLICT (modify/delete): arch/arm/mach-s5pv210/include/mach/memory.h deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/mach-s5pv210/include/mach/memory.h left in tree.
CONFLICT (content): Merge conflict in arch/arm/mach-mvebu/headsmp-a9.S
CONFLICT (modify/delete): arch/arm/mach-integrator/include/mach/memory.h deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/mach-integrator/include/mach/memory.h left in tree.
$ git rm -f arch/arm/mach-integrator/include/mach/memory.h arch/arm/mach-s5pv210/include/mach/memory.h
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 (5424d6fd48e6 Merge branch 'imx/cleanup' into for-next)
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 (2e11b0361fb0 Merge branch 'mvebu/dt' into mvebu/for-next)
Merging renesas/next (b869bc06bc67 Merge branch 'heads/shdma-for-v3.17' into next)
Merging samsung/for-next (d5e49aabb545 Merge branch 'v3.17-next/dt-samsung-2' into for-next)
Merging sunxi/sunxi/for-next (44b61dc11c6d Merge branch 'sunxi/dt-for-3.17' into sunxi/for-next)
Merging tegra/for-next (9a3c4145af32 Linux 3.16-rc6)
Merging arm64/for-next/core (94156675847c Revert "arm64: dmi: Add SMBIOS/DMI support")
Merging blackfin/for-linus (b76f98236a23 blackfin: vmlinux.lds.S: reserve 32 bytes space at the end of data section for XIP kernel)
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 (6b15075c2c36 [IA64] sn: Do not needlessly convert between pointers and integers)
Merging m68k/for-next (9117710a5997 m68k/sun3: Remove define statement no longer needed)
Merging m68knommu/for-next (9a1a1aea7572 m68knommu: Remove unnecessary prototype for kobjsize())
Merging metag/for-next (f93125ae17d1 metag: cachepart: Fix failure check)
Merging microblaze/next (ef264cf0c490 microblaze: Change libgcc-style functions from lib-y to obj-y)
Merging mips/mips-for-linux-next (815fa52f5ddd 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 (64aa90f26c06 Linux 3.16-rc7)
Merging powerpc/next (ea668936b708 Add Michael Ellerman as powerpc co-maintainer)
Merging fsl/next (78eb9094ca08 powerpc/t2080rdb: Add T2080RDB board support)
Merging mpc5xxx/next (bc7505942233 powerpc/512x: dts: add MPC5125 clock specs)
Merging s390/features (26d766c60f4e s390/3215: fix hanging console issue)
Merging sparc-next/master (cfcfe22256d5 Merge branch 'sparc64_io')
Merging tile/master (ed93567c6fbc tile: Remove tile-specific _sinitdata and _einitdata)
Merging uml/next (989e59fa41c5 um: Include generic barrier.h)
CONFLICT (content): Merge conflict in arch/um/include/asm/Kbuild
Merging unicore32/unicore32 (d670878e2c9a unicore32: Remove ARCH_HAS_CPUFREQ config option)
Merging xtensa/for_next (4ed2ad38b3b4 Merge tag 'xtensa-for-next-20140715' of git://github.com/jcmvbkbc/linux-xtensa into for_next)
Merging btrfs/next (c7548af69d9e Btrfs: convert smp_mb__{before,after}_clear_bit)
Merging ceph/master (d1a5fb9fecd4 rbd: remove extra newlines from rbd_warn() messages)
Merging cifs/for-next (bb7cd8d76356 [CIFS] Update cifs version)
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 (04ec5f5c0022 ecryptfs: remove unnecessary break after goto)
Merging ext3/for_next (3f1be4f9c9dc udf: avoid redundant memcpy when writing data in ICB)
Merging ext4/dev (e7c22a2e7d23 ext4: fix ext4_discard_allocated_blocks() if we can't allocate the pa struct)
Merging f2fs/dev (33be828ada72 f2fs: remove redundant lines in allocate_data_block)
Merging fscache/fscache (fe02fb3ec109 FS-Cache: Handle removal of unadded object to the fscache_object_list rb tree)
Merging fuse/for-next (d7afaec0b564 fuse: add FUSE_NO_OPEN_SUPPORT flag to INIT)
Merging gfs2/master (dec5ac00c840 GFS2: fs/gfs2/super.c: replace seq_printf by seq_puts)
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 (e655f945cd7b Merge branch 'bugfixes' into linux-next)
Merging nfsd/nfsd-next (03adc840085e nfsd: add some comments to the nfsd4 object definitions)
CONFLICT (content): Merge conflict in fs/nfsd/nfs4xdr.c
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 (25601a3c9737 UBIFS: Add log overlap assertions)
Merging xfs/for-next (c3dd0d14e34a Merge branch 'xfs-misc-fixes-3.17-1' into for-next)
Merging file-private-locks/linux-next (73a8f5f7e635 locks: purge fl_owner_t from fs/locks.c)
Merging vfs/for-next (cd67b9ac44ea switch iov_iter_get_pages() to passing maximal number of pages)
Merging hch-vfs/vfs-for-3.17 (f68cbb8bd2c3 dcache: d_splice_alias should detect loops)
Merging pci/next (981c191778a4 Merge branches 'pci/host-designware', 'pci/host-mvebu' and 'pci/host-tegra' into next)
Merging hid/for-next (914b9e7fdb8d Merge branch 'for-3.17/sony' into for-next)
Merging i2c/i2c/for-next (80e2f6405074 Merge branch 'i2c/for-current' into i2c/for-next)
Merging jdelvare-hwmon/master (c7208164e66f Linux 3.15-rc7)
Merging hwmon-staging/hwmon-next (f69b017bef03 hwmon: (pwm-fan) Make SENSORS_PWM_FAN depend on OF)
Merging v4l-dvb/master (50b8879ed699 Merge branch 'patchwork' into to_next)
Merging kbuild/for-next (9586848e26c7 Merge branch 'kbuild/kbuild' into kbuild/for-next)
Merging kconfig/for-next (95edca5c523c localmodconfig: Add config depends by default settings)
Merging libata/for-next (1eecf0052607 Merge branch 'for-3.17' into for-next)
Merging pm/linux-next (dad3624f47de Merge branch 'acpica')
CONFLICT (content): Merge conflict in drivers/cpuidle/Kconfig.arm
Merging idle/next (24153da3e88d intel_idle: Disable BYT Core and Module C6 auto-demotion)
Merging apm/for-next (53675abbd1e5 x86, apm: Remove unused variable)
Merging cpupowerutils/master (f16603386b38 cpupower tools: add install target to the debug tools' makefiles)
Merging thermal/next (47d104ba5879 Merge branches 'exynos-fix', 'for-rc', 'int3403-fix', 'misc', 'rcar-thermal' and 'sti-thermal' of .git into next)
Merging ieee1394/for-next (d584a6627994 firewire: ohci: disable MSI for VIA VT6315 again)
Merging dlm/next (883854c5457a dlm: keep listening connection alive with sctp mode)
Merging swiotlb/linux-next (8e0629c1d4ce swiotlb: don't assume PA 0 is invalid)
Merging slave-dma/next (4fbd804e009a dmaengine: sun6i: Fix memory leaks)
Merging dmaengine/next (fbeec99ad5c0 dma: mv_xor: Rename __mv_xor_slot_cleanup() to mv_xor_slot_cleanup())
Merging net-next/master (8e97b85a8f1b Merge branch 'stmmac-next')
Merging ipsec-next/master (1759389e8af4 xfrm4: Remove duplicate semicolon)
Merging wireless-next/master (dc6be9f54a4e bcma: use NS prefix for names of Northstar specific cores)
CONFLICT (content): Merge conflict in net/6lowpan/iphc.c
Merging bluetooth/master (dc6be9f54a4e bcma: use NS prefix for names of Northstar specific cores)
Merging infiniband/for-next (56c5333cfc84 Merge branches 'cxgb4' and 'mlx5' into for-next)
Merging mtd/master (b6603fe574af Merge tag 'for-linus-20140716' of git://git.infradead.org/linux-mtd)
Merging l2-mtd/master (2a500afe1e0e mtd: gpmi: make blockmark swapping optional)
Merging crypto/master (4839ddcaba26 crypto: ccp - Remove "select OF" from Kconfig)
Merging drm/drm-next (8bed5cc765ff drm/rcar-du: Fix maximum frame buffer pitch computation)
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_drv.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem_render_state.c
Merging drm-panel/drm/panel/for-next (ea44739db37f drm/panel: simple: add support for InnoLux N156BGE-L21 panel)
Merging drm-intel/for-linux-next (17c58fe801f5 drm/i915: Align intel_dsi*.c files a bit)
Merging drm-tegra/drm/tegra/for-next (9a9195228478 drm/tegra: dsi - Handle non-continuous clock flag)
Merging sound/for-next (00ef99408b6c ALSA: hda - add mic mute led hook for dell machines)
Merging sound-asoc/for-next (e6e8c40bd606 Merge remote-tracking branches 'asoc/topic/wm8904', 'asoc/topic/wm8962' and 'asoc/topic/wm8985' into asoc-next)
Merging modules/modules-next (2e3a10a1551d ARM: avoid ARM binutils leaking ELF local symbols)
$ git reset --hard HEAD^
Merging next-20140725 version of modules
Merging virtio/virtio-next (eeec626366ff Revert "hwrng: virtio - ensure reads happen after successful probe")
Merging input/next (e179d5fa8d6d Input: imx_keypad - remove ifdef round PM methods)
Merging input-mt/for-next (5e01dc7b26d9 Linux 3.12)
Merging block/for-next (a84352f82862 Merge branch 'for-3.17/core' into for-next)
Merging device-mapper/for-next (2ca3856b413b 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 (25f7dadbd982 mmc: dw_mmc: change to use recommended reset procedure)
$ git reset --hard HEAD^
Merging next-20140725 version of mmc-uh
Merging kgdb/kgdb-next (6bedf31c25dd kdb: Remove unhandled ssb command)
Merging uclinux/for-next (6dbe51c251a3 Linux 3.9-rc1)
Merging md/for-next (af5628f05db6 md: disable probing for md devices 512 and over.)
Merging mfd/for-mfd-next (7caa79917ad4 MAINTAINERS: Update MFD repo location)
Merging backlight/for-backlight-next (2188a988bb87 backlight: Add driver for iPAQ micro backlight)
Merging battery/master (5e37195f30cc ipaq_micro_battery: fix sparse non static symbol warning)
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 (fea85621060f Merge branch '3.17/hdmi-infoframe' into for-next)
Merging regulator/for-next (e38dc0902f68 Merge remote-tracking branches 'regulator/topic/tps65217', 'regulator/topic/tps65218', 'regulator/topic/tps6586x' and 'regulator/topic/twl' into regulator-next)
Merging security/next (a3d64df849bc tpm: simplify code by using %*phN specifier)
Merging integrity/next (e27319cdf468 ima: provide double buffering for hash calculation)
CONFLICT (content): Merge conflict in include/linux/key.h
Merging selinux/next (615e51fdda6f selinux: reduce the number of calls to synchronize_net() when flushing caches)
Merging lblnet/next (d8ec26d7f828 Linux 3.13)
Merging watchdog/master (4ebe25a4b055 Documentation: fix two typos in watchdog-api.txt)
Merging iommu/next (e2045c68c4b6 Merge branches 'x86/vt-d', 'x86/amd', 'arm/omap', 'ppc/pamu' and 'arm/smmu' 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 (51a7097426f2 doc: fix two typos in watchdog-api.txt)
CONFLICT (content): Merge conflict in arch/arm/mach-msm/Kconfig
CONFLICT (content): Merge conflict in Documentation/laptops/freefall.c
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/powerpc/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 (5194066ed8ae Merge branch 'devicetree/next-overlay' into devicetree/next)
Merging dt-rh/for-next (99de64984c3a OF: fix of_find_node_by_path() assumption that of_allnodes is root)
Merging spi/for-next (62219aa00e43 Merge remote-tracking branch 'spi/topic/topcliff-pch' into spi-next)
Merging tip/auto-latest (49144c53f900 Merge branch 'x86/xsave')
CONFLICT (content): Merge conflict in drivers/net/wireless/ath/ath9k/hw.c
CONFLICT (content): Merge conflict in drivers/acpi/acpi_extlog.c
Merging clockevents/clockevents/next (3252a646aa2c clocksource: exynos_mct: Only use 32-bits where possible)
Merging edac/linux_next (50d1bb93672f sb_edac: add support for Haswell based systems)
Merging edac-amd/for-next (eba4bfb34d45 EDAC, MCE, AMD: Add MCE decoding for F15h M60h)
Merging irqchip/irqchip/for-next (c115d15552c0 Merge branch 'irqchip/atmel-aic' into irqchip/for-next)
CONFLICT (content): Merge conflict in drivers/irqchip/irq-gic.c
CONFLICT (content): Merge conflict in arch/arm64/Kconfig
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/arm/gic.txt
Merging ftrace/for-next (6386b361ccf0 Merge branch 'trace/ftrace/core' into trace/for-next)
Merging rcu/rcu/next (1c91efb24799 rcutorture: Specify CONFIG_CPUMASK_OFFSTACK=y for TREE07)
Merging uprobes/for-next (0326f5a94dde uprobes/core: Handle breakpoint and singlestep exceptions)
Merging kvm/linux-next (42cbc04fd3b5 x86/kvm: Resolve shadow warnings in macro expansion)
CONFLICT (content): Merge conflict in arch/x86/kvm/mmutrace.h
Merging kvm-arm/next (fb3ec67942e9 KVM: arm64: GICv3: mandate page-aligned GICV region)
CONFLICT (content): Merge conflict in virt/kvm/arm/vgic.c
Applying: merge fixup provided by Marc Zyngier <marc.zyngier@arm.com>
Merging kvm-ppc/kvm-ppc-next (1287cb3fa85c KVM: PPC: Book3S: Move vcore definition to end of kvm_arch struct)
CONFLICT (content): Merge conflict in Documentation/virtual/kvm/api.txt
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 (28d4ce7322cf Merge branch 'devel/for-linus-3.17' into linux-next)
CONFLICT (content): Merge conflict in include/xen/grant_table.h
CONFLICT (content): Merge conflict in drivers/xen/grant-table.c
CONFLICT (content): Merge conflict in arch/x86/xen/grant-table.c
Merging percpu/for-next (1e59e00cdf4d Merge branch 'for-3.17' into for-next)
Merging workqueues/for-next (ebb48ccd98d1 Merge branch 'for-3.17' into for-next)
CONFLICT (content): Merge conflict in kernel/workqueue.c
Merging drivers-x86/linux-next (f82bdd0d77b6 hp-wmi: Enable hotkeys on some systems)
Merging chrome-platform/for-next (5502486a2077 platform/chrome: chromeos_laptop - Add a limit for deferred retries)
Merging sysctl/master (4e474a00d7ff sysctl: protect poll() in entries that may go away)
Merging regmap/for-next (3059bfa09df6 Merge remote-tracking branches 'regmap/topic/getdev' and 'regmap/topic/getreg' into regmap-next)
Merging hsi/for-next (3fd276e9c0d7 HSI: omap_ssi: Fix return value check in ssi_debug_add_ctrl())
Merging leds/for-next (e661c8978e48 leds: ipaq-micro: fix sparse non static symbol warning)
CONFLICT (add/add): Merge conflict in drivers/hid/hid-gt683r.c
Merging driver-core/driver-core-next (0542ad88fbdd firmware loader: Fix _request_firmware_load() return val for fw load abort)
CONFLICT (content): Merge conflict in lib/Kconfig.debug
CONFLICT (content): Merge conflict in drivers/gpu/drm/armada/armada_crtc.c
CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/setup-r7s72100.c
Merging tty/tty-next (22524b02b17b Revert "ARC: [arcfpga] stdout-path now suffices for earlycon/console")
Merging usb/usb-next (d508d992026c Merge tag 'for_3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy into usb-next)
CONFLICT (content): Merge conflict in drivers/usb/musb/musb_host.c
CONFLICT (content): Merge conflict in drivers/phy/phy-samsung-usb2.h
CONFLICT (content): Merge conflict in drivers/phy/phy-samsung-usb2.c
CONFLICT (content): Merge conflict in drivers/phy/Makefile
CONFLICT (content): Merge conflict in drivers/phy/Kconfig
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/phy/samsung-phy.txt
Applying: phy: fix up for devm_phy_create api change
Merging usb-gadget/next (8346b33fad01 Documentation: DocBook: elieminate doc build break)
Merging usb-serial/usb-next (5bc9e5933a41 USB: kl5kusb105: Remove klsi_105_tiocmset function)
Merging staging/staging-next (bf6c0d110e0b Staging: rts5208: Replace custom macro with dev_dbg)
CONFLICT (modify/delete): drivers/staging/media/sn9c102/Kconfig deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/sn9c102/Kconfig left in tree.
CONFLICT (modify/delete): drivers/staging/dgrp/dgrp_tty.c deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/dgrp/dgrp_tty.c left in tree.
CONFLICT (modify/delete): drivers/staging/cxt1e1/linux.c deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/cxt1e1/linux.c left in tree.
CONFLICT (content): Merge conflict in MAINTAINERS
$ git rm -f drivers/staging/dgrp/dgrp_tty.c drivers/staging/cxt1e1/linux.c drivers/staging/media/sn9c102/Kconfig
Merging char-misc/char-misc-next (16eb2bfc65ef Merge tag 'extcon-next-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon into char-misc-next)
CONFLICT (content): Merge conflict in drivers/dma/Makefile
CONFLICT (content): Merge conflict in drivers/Makefile
CONFLICT (content): Merge conflict in drivers/Kconfig
Merging cgroup/for-next (abdfd21809f2 Merge branch 'for-3.17' into for-next)
Merging scsi/for-next (cbf67842c3d9 scsi_debug: support scsi-mq, queues and locks)
CONFLICT (content): Merge conflict in include/scsi/sg.h
CONFLICT (content): Merge conflict in drivers/scsi/cxgbi/libcxgbi.h
Merging scsi-core/core-for-3.16 (89fb4cd1f717 scsi: handle flush errors properly)
Merging scsi-drivers/drivers-for-3.16 (8faeb529b2da virtio-scsi: fix various bad behavior on aborted requests)
Merging target-updates/for-next (a497c3ba1d97 Linux 3.16-rc2)
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 (e1ee5c578fb1 pinctrl: baytrail: Convert to use gpiolib irqchip)
Merging vhost/linux-next (970379f59d81 vhost: move memory pointer to VQs)
CONFLICT (content): Merge conflict in drivers/vhost/net.c
Merging remoteproc/for-next (9a3c4145af32 Linux 3.16-rc6)
Merging rpmsg/for-next (397944df3290 rpmsg: fix kconfig dependencies for VIRTIO)
Merging gpio/for-next (39b2bbe3d715 gpio: add flags argument to gpiod_get*() functions)
CONFLICT (content): Merge conflict in arch/arm/mach-tegra/board-paz00.c
$ git reset --hard HEAD^
Merging next-20140728 version of gpio
Merging dma-mapping/dma-mapping-next (f70e3c4f8b6a CMA: correct unlock target)
Merging pwm/for-next (eae266a284f3 pwm: rockchip: document device tree bindings)
Merging dma-buf/for-next (b23b35445ec8 Documentation: devres: Add devm_kmalloc() et al)
Merging userns/for-next (99ac1b6393f0 mnt: Add tests for unprivileged remount cases that have found to be faulty)
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 (d14c17b235ab clk: clps711x: Add DT bindings documentation)
CONFLICT (content): Merge conflict in drivers/base/platform.c
Merging random/dev (b65797d576be random: limit the contribution of the hw rng to at most half)
CONFLICT (content): Merge conflict in include/uapi/asm-generic/unistd.h
CONFLICT (content): Merge conflict in include/linux/syscalls.h
CONFLICT (content): Merge conflict in drivers/char/hw_random/core.c
CONFLICT (content): Merge conflict in arch/x86/syscalls/syscall_64.tbl
CONFLICT (content): Merge conflict in arch/x86/syscalls/syscall_32.tbl
Merging lzo-update/lzo-update (42b775abafaf lib/lzo: huge LZO decompression speedup on ARM by using unaligned access)
Merging aio/master (00fefb9cf2b5 aio: use iovec array rather than the single one)
Merging llvmlinux/for-next (7380100aa7ce arm64: LLVMLinux: Use current_stack_pointer in kernel/traps.c)
Merging powernv-cpuidle/powernv-cpuidle (0888839c5b62 cpuidle/powernv: Parse device tree to setup idle states)
Merging rd-docs/master (da8a7613e7ef Maintainers often repeat the same feedback on poorly written changelogs - describe the problem, justify your changes, quantify optimizations, describe user-visible changes - but our documentation on writing changelogs doesn't include these things.  Fix that.)
CONFLICT (content): Merge conflict in Documentation/laptops/freefall.c
Merging signal-cleanup/signal_v4 (b9f0fb2d4a7a powerpc: Use sigsp())
Merging akpm-current/current (929c76e4e629 fs/dlm/debug_fs.c: remove unnecessary null test before debugfs_remove)
CONFLICT (content): Merge conflict in kernel/kexec.c
CONFLICT (content): Merge conflict in drivers/rapidio/devices/tsi721_dma.c
CONFLICT (content): Merge conflict in arch/arm64/Kconfig
$ git checkout -b akpm remotes/origin/akpm/master
Applying: drivers/gpio/gpio-zevio.c: fix build
Applying: x86, vdso: fix vdso2c's special_pages error checking
Applying: arm64,ia64,ppc,s390,sh,tile,um,x86,mm: remove default gate area
Applying: init/main.c: code clean-up
Applying: Update Roland McGrath's mail
Applying: MAINTAINERS: remove two ancient EATA sections
Applying: MAINTAINERS: update IBM ServeRAID RAID info
Applying: arch/arm/mach-omap2: replace strict_strto* with kstrto*
Applying: arch/arm/mach-pxa: replace strict_strto call with kstrto
Applying: arch/arm/mach-s3c24xx/mach-jive.c: replace strict_strto* with kstrto*
Applying: arch/arm/mach-w90x900/cpu.c: replace obsolete strict_strto
Applying: arch/powerpc: replace obsolete strict_strto* calls
Applying: arch/x86: replace strict_strto calls
Applying: drivers/scsi: replace strict_strto calls
Applying: include/linux: remove strict_strto* definitions
Applying: pci-dma-compat: add pci_zalloc_consistent helper
Applying: atm: use pci_zalloc_consistent
Applying: block: use pci_zalloc_consistent
Applying: crypto: use pci_zalloc_consistent
Applying: infiniband: use pci_zalloc_consistent
Applying: i810: use pci_zalloc_consistent
Applying: media: use pci_zalloc_consistent
Applying: amd: use pci_zalloc_consistent
Applying: atl1e: use pci_zalloc_consistent
Applying: enic: use pci_zalloc_consistent
Applying: sky2: use pci_zalloc_consistent
Applying: micrel: use pci_zalloc_consistent
Applying: qlogic: use pci_zalloc_consistent
Applying: irda: use pci_zalloc_consistent
Applying: ipw2100: use pci_zalloc_consistent
Applying: mwl8k: use pci_zalloc_consistent
Applying: rtl818x: use pci_zalloc_consistent
Applying: rtlwifi: use pci_zalloc_consistent
Applying: scsi: use pci_zalloc_consistent
Applying: staging: use pci_zalloc_consistent
Applying: synclink_gt: use pci_zalloc_consistent
Applying: vme: bridges: use pci_zalloc_consistent
Applying: drivers/net/ethernet/amd/pcnet32.c: neaten and remove unnecessary OOM messages
Applying: kernel/posix-timers.c: code clean-up
Applying: kernel-posix-timersc-code-clean-up-checkpatch-fixes
Applying: MAINTAINERS: update microcode patterns
Applying: MAINTAINERS: update cifs location
Applying: MAINTAINERS: use the correct efi-stub location
Applying: MAINTAINERS: update clk/sirf patterns
Applying: MAINTAINERS: fix ssbi pattern
Applying: MAINTAINERS: use correct filename for sdhci-bcm-kona
Applying: MAINTAINERS: fix PXA3xx NAND FLASH DRIVER pattern
Applying: MAINTAINERS: update picoxcell patterns
Applying: MAINTAINERS: remove section CIRRUS LOGIC EP93XX OHCI USB HOST DRIVER
Applying: MAINTAINERS: remove METAG imgdafs pattern
Applying: MAINTAINERS: remove unused radeon drm pattern
Applying: MAINTAINERS: remove unusd ARM/QUALCOMM MSM pattern
Applying: MAINTAINERS: remove unused NFSD pattern
Applying: mm: allow drivers to prevent new writable mappings
Applying: shm: add sealing API
Applying: shm: add memfd_create() syscall
Applying: selftests: add memfd_create() + sealing tests
Applying: selftests: add memfd/sealing page-pinning tests
Applying: shm: wait for pins to be released when sealing
Applying: bin2c: move bin2c in scripts/basic
Applying: kernel: build bin2c based on config option CONFIG_BUILD_BIN2C
Applying: kexec: rename unusebale_pages to unusable_pages
Applying: kexec: move segment verification code in a separate function
Applying: kexec: use common function for kimage_normal_alloc() and kimage_crash_alloc()
Applying: resource: provide new functions to walk through resources
Applying: kexec: make kexec_segment user buffer pointer a union
Applying: kexec: new syscall kexec_file_load() declaration
Applying: kexec: implementation of new syscall kexec_file_load
Applying: kexec-implementation-of-new-syscall-kexec_file_load-checkpatch-fixes
Applying: kexec: return error if file bytes are less then file size
Applying: purgatory/sha256: provide implementation of sha256 in purgaotory context
Applying: purgatory: core purgatory functionality
Applying: purgatory: run host built programs from objtree
Applying: kexec: load and relocate purgatory at kernel load time
Applying: kexec-load-and-relocate-purgatory-at-kernel-load-time-fix
Applying: kexec-bzImage64: support for loading bzImage using 64bit entry
Applying: kexec: fix freeing up for image loader data loading
Applying: kexec: support for kexec on panic using new system call
Applying: kexec-bzimage64: fix the ordering of registers
Applying: kexec: support kexec/kdump on EFI systems
Applying: kexec-support-kexec-kdump-on-efi-systems-fix
Applying: kexec: verify the signature of signed PE bzImage
Applying: fs.h: remove unnecessary extern prototypes
Applying: fs.h: whitespace neatening
Applying: fs.h: a few more whitespace neatenings
Applying: fs.h: add argument names to struct file_lock_operations (*funcs)
Applying: fs.h: add member argument descriptions to lock_manager_operations
Applying: fs/dlm/plock.c: add argument descriptions to notify
Applying: dlm, lockd: remove unused conf from lm_grant
Applying: dlm: plock: reduce indentation by rearranging order
Applying: timer: provide an api for deferrable timeout
Applying: ksm: provide support to use deferrable timers for scanner thread
Applying: ksm-provide-support-to-use-deferrable-timers-for-scanner-thread-fix
Applying: ksm-provide-support-to-use-deferrable-timers-for-scanner-thread-fix-fix-2
Applying: MAINTAINERS: update DMA BUFFER SHARING patterns
Applying: MAINTAINERS: update usb/gadget patterns
Applying: MAINTAINERS: update samsung pinctrl patterns
Applying: MAINTAINERS: update nomadik patterns
Applying: kernel/kprobes.c: convert printk to pr_foo()
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: 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: drivers/w1/w1_int.c: call put_device if device_register fails
Applying: mm: add strictlimit knob
Merging akpm/master (3f83f83b8230 mm: add strictlimit knob)

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

^ permalink raw reply	[flat|nested] 39+ messages in thread

* Re: linux-next: Tree for Aug 1
  2013-08-01  7:25 Stephen Rothwell
@ 2013-08-01  7:50 ` Sedat Dilek
  0 siblings, 0 replies; 39+ messages in thread
From: Sedat Dilek @ 2013-08-01  7:50 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: linux-next, linux-kernel

On Thu, Aug 1, 2013 at 9:25 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> Changes since 20130731:
>
> Removed trees: xen-arm (merged into the xen-tip tree)
>
> The ext4 tree still has its build failure so I used the version from
> next-20130726.
>
> The driver-core tree gained a conflict against the net-next tree.
>
> The usb-gadget tree lost its build failure but gained conflicts against
> Linus' tree.
>
> ----------------------------------------------------------------------------
>

Just FYI:
On some arches (like IA64) you will see a breakage in drm.
See pending "drm/mm: include required headers in drm_mm.h" patch in drm-next.

[1] https://patchwork.kernel.org/patch/2833468/
[2] http://cgit.freedesktop.org/~airlied/linux/commit/?h=drm-next&id=86e81f0e624b55fa9f1560c3b64bc80e458c5168

^ permalink raw reply	[flat|nested] 39+ messages in thread

* linux-next: Tree for Aug 1
@ 2013-08-01  7:25 Stephen Rothwell
  2013-08-01  7:50 ` Sedat Dilek
  0 siblings, 1 reply; 39+ messages in thread
From: Stephen Rothwell @ 2013-08-01  7:25 UTC (permalink / raw)
  To: linux-next; +Cc: linux-kernel

[-- Attachment #1: Type: text/plain, Size: 25383 bytes --]

Hi all,

Changes since 20130731:

Removed trees: xen-arm (merged into the xen-tip tree)

The ext4 tree still has its build failure so I used the version from
next-20130726.

The driver-core tree gained a conflict against the net-next tree.

The usb-gadget tree lost its build failure but gained conflicts against
Linus' tree.

----------------------------------------------------------------------------

I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/next/ ).  If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one.  You should use "git fetch" as mentioned in the FAQ on the wiki
(see below).

You can see which trees have been included by looking in the Next/Trees
file in the source.  There are also quilt-import.log and merge.log files
in the Next directory.  Between each merge, the tree was built with
a ppc64_defconfig for powerpc and an allmodconfig for x86_64. After the
final fixups (if any), it is also built with powerpc allnoconfig (32 and
64 bit), ppc44x_defconfig and allyesconfig (minus
CONFIG_PROFILE_ALL_BRANCHES - this fails its final link) and i386, sparc,
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 221 trees (counting Linus' and 30 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 (06693f3 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging fixes/master (b3a3a9c Merge tag 'trace-3.11-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace)
Merging kbuild-current/rc-fixes (ad81f05 Linux 3.11-rc1)
Merging arc-current/for-curr (4ffd9e2 ARC: SMP build breakage)
Merging arm-current/fixes (cd717a2 ARM: Add .text annotations where required after __CPUINIT removal)
Merging m68k-current/for-linus (ad81f05 Linux 3.11-rc1)
Merging metag-fixes/fixes (dfe248b MAINTAINERS: add linux-metag mailing list)
Merging powerpc-merge/merge (ff3d79d powerpc/perf: BHRB filter configuration should follow the task)
Merging sparc/master (6d128e1 Revert "Makefile: Fix install error with make -j option")
Merging net/master (cf3c4c0 8139cp: Add dma_mapping_error checking)
Merging ipsec/master (01cb71d net_sched: restore "overhead xxx" handling)
Merging sound-current/for-linus (a8d3060 ALSA: compress: fix the return value for SNDRV_COMPRESS_VERSION)
Merging pci-current/for-linus (aa914f5 PCI: Retry allocation of only the resource type that failed)
Merging wireless/master (11a4582 Merge tag 'nfc-fixes-3.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-fixes)
Merging driver-core.current/driver-core-linus (5ae90d8 Linux 3.11-rc3)
Merging tty.current/tty-linus (d5a12ea serial: arc_uart: Fix module alias)
Merging usb.current/usb-linus (fed1f1e USB: serial: ftdi_sio: add more RT Systems ftdi devices)
Merging staging.current/staging-linus (0207379 staging: zcache: fix "zcache=" kernel parameter)
Merging char-misc.current/char-misc-linus (5ae90d8 Linux 3.11-rc3)
Merging input-current/for-linus (88ce3c3 Merge branch 'next' into for-linus)
Merging md-current/for-linus (f94c0b6 md/raid5: fix interaction of 'replace' and 'recovery'.)
Merging audit-current/for-linus (c158a35 audit: no leading space in audit_log_d_path prefix)
Merging crypto-current/master (e70308e Revert "crypto: crct10dif - Wrap crc_t10dif function all to use crypto transform framework")
Merging ide/master (6d128e1 Revert "Makefile: Fix install error with make -j option")
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 devicetree-current/devicetree/merge (cf9e236 of/irq: init struct resource to 0 in of_irq_to_resource())
Merging rr-fixes/fixes (96f97a8 virtio: console: return -ENODEV on all read operations after unplug)
Merging mfd-fixes/master (5649d8f mfd: ab8500-sysctrl: Let sysctrl driver work without pdata)
Merging vfio-fixes/for-linus (d24cdbf vfio-pci: Avoid deadlock on remove)
Merging drm-intel-fixes/drm-intel-fixes (61c2542 drm/i915: fix gen4 digital port hotplug definitions)
Merging asm-generic/master (fb9de7e xtensa: Use generic asm/mmu.h for nommu)
Merging arc/for-next (524a105 ARC: [ASID] Optimize the threads-of-process switching case)
Merging arm/for-next (7616732 Merge branch 'devel-stable' into for-next)
Merging arm-perf/for-next/perf (ad81f05 Linux 3.11-rc1)
Merging davinci/davinci-next (fe0d422 Linux 3.0-rc6)
Merging xilinx/arm-next (b028161 Merge branch 'for-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup)
Merging arm64/upstream (845ad05 arm64: Change kernel stack size to 16K)
Merging blackfin/for-linus (eb043d3 smp: blackfin: fix check error, using atomic_ops to handle atomic_t type)
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)
CONFLICT (content): Merge conflict in arch/cris/arch-v32/drivers/Kconfig
Merging hexagon/linux-next (de44443 HEXAGON: Remove non existent reference to GENERIC_KERNEL_EXECVE & GENERIC_KERNEL_THREAD)
Merging ia64/next (9c510f7 [IA64] dmi.h: Make dmi_alloc use kzalloc)
CONFLICT (content): Merge conflict in arch/ia64/configs/xen_domu_defconfig
CONFLICT (content): Merge conflict in arch/ia64/configs/tiger_defconfig
CONFLICT (content): Merge conflict in arch/ia64/configs/gensparse_defconfig
CONFLICT (content): Merge conflict in arch/ia64/configs/generic_defconfig
Merging m68k/for-next (ad81f05 Linux 3.11-rc1)
Merging m68knommu/for-next (703b943 m68k/coldfire: flush cache when creating the signal stack frame)
Merging metag/for-next (8a69782 metag: tz1090: instantiate gpio-tz1090-pdc)
Merging microblaze/next (a9b9d22 of/pci: Use of_pci_range_parser)
Merging mips/mips-for-linux-next (d0e4912 Merge branch '3.11-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 (06693f3 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging powerpc/next (3b2f64d Linux 3.11-rc2)
Merging 4xx/next (2074b1d powerpc: Fix irq distribution)
Merging mpc5xxx/next (dd0120d powerpc/mpc512x: enable USB support in defconfig)
Merging galak/next (9e2ecdb powerpc/fsl-booke: add the reg prop for pci bridge device node for T4/B4)
Merging s390/features (83b6bcd s390/sclp: reword cpu capability change message)
Merging sh/sh-latest (37284bd Merge branches 'sh/hw-breakpoints' and 'sh/serial-of' into sh-latest)
CONFLICT (content): Merge conflict in include/linux/serial_sci.h
CONFLICT (content): Merge conflict in 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 (9ae8480 tile: convert uses of "inv" to "finv")
Merging unicore32/unicore32 (c284464 arch/unicore32: remove CONFIG_EXPERIMENTAL)
Merging xtensa/for_next (3b2f64d Linux 3.11-rc2)
Merging btrfs/next (cbacd76 Merge branch 'for-chris' of git://git.kernel.org/pub/scm/linux/kernel/git/josef/btrfs-next into next)
Merging ceph/master (71b4325 ceph: wake up writer if vmtruncate work get blocked)
Merging cifs/for-next (66ffd11 cifs: set sb->s_d_op before calling d_make_root())
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 (07bc9dc Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc)
Merging ext3/for_next (e729eac udf: Refuse RW mount of the filesystem instead of making it RO)
Merging ext4/dev (4a8603e ext4: avoid reusing recently deleted inodes in no journal mode)
$ git reset --hard HEAD^
Merging next-20130726 version of ext4
Merging f2fs/dev (cbd56e7 f2fs: fix handling orphan inodes)
Merging fscache/fscache (bcd7351 Merge tag 'fscache-20130702' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs)
Merging fuse/for-next (c7263bc fuse: readdirplus: cleanup)
Merging gfs2/master (6daf3e6 GFS2: WQ_NON_REENTRANT is meaningless and going away)
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 (55b5929 NFSv4: Fix nfs4_init_uniform_client_string for net namespaces)
Merging nfsd/nfsd-next (df66e75 nfsd: nfs4_file_get_access: need to be more careful with O_RDWR)
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 (b3f8ab4 fs: 9p: use strlcpy instead of strncpy)
Merging ubifs/linux-next (beadadf UBIFS: correct mount message)
Merging xfs/for-next (7a378c9 xfs: WQ_NON_REENTRANT is meaningless and going away)
Merging vfs/for-next (d405be4 ext4: ->tmpfile() support)
CONFLICT (content): Merge conflict in fs/ext4/namei.c
Merging pci/next (b7c75de PCI: Claim ACS support for AMD southbridge devices)
Merging hid/for-next (093aba1 Merge branch 'for-3.12/upstream' into for-next)
Merging i2c/i2c/for-next (3b2f64d Linux 3.11-rc2)
Merging jdelvare-hwmon/master (6f7e0b6 hwmon: (w83792d) Update module author)
Merging hwmon-staging/hwmon-next (d8df13e hwmon: (nct6775) Fix size of data->temp array)
Merging v4l-dvb/master (2217438 Merge /home/v4l/v4l/for_upstream)
Merging kbuild/for-next (8de6aeb Merge branches 'kbuild/kconfig' 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 (3ea47c0 Merge branch 'for-3.12' into for-next)
Merging pstore/master (bd08ec3 pstore/ram: Restore ecc information block)
Merging pm/linux-next (abe513f Merge branch 'acpi-sleep-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 cpupowerutils/master (f166033 cpupower tools: add install target to the debug tools' makefiles)
Merging thermal/next (ace120d Thermal: Fix lockup of cpu_down())
Merging ieee1394/for-next (0a41981 firewire: core: typecast from gfp_t to bool more safely)
Merging ubi/linux-next (83ff59a UBI: support ubi_num on mtd.ubi command line)
Merging dlm/next (ededf30 dlm: WQ_NON_REENTRANT is meaningless and going away)
Merging swiotlb/linux-next (af51a9f swiotlb: Do not export swiotlb_bounce since there are no external consumers)
Merging slave-dma/next (8f48475 Merge branch 'for-linus' into next)
Merging dmaengine/next (41ef2d5 Linux 3.9-rc7)
Merging net-next/master (49dfe76 Documentation: add networking/netdev-FAQ.txt)
Merging ipsec-next/master (0289094 af_key: constify lookup tables)
Merging wireless-next/master (2cdf359 mwifiex: code rearrangement in sdio.c)
CONFLICT (content): Merge conflict in drivers/net/ethernet/broadcom/Kconfig
Merging bluetooth/master (473c131 Bluetooth: replace strict_strtol() with kstrtol())
Merging infiniband/for-next (569935d Merge branches 'cma', 'cxgb3', 'cxgb4', 'ipoib', 'misc', 'mlx4', 'mlx5', 'nes', 'ocrdma' and 'qib' into for-next)
Merging mtd/master (a637b0d Merge tag 'for-linus-20130509' of git://git.infradead.org/linux-mtd)
Merging l2-mtd/master (fb1585b mtd: nand: omap2: clean-up BCHx_HW and BCHx_SW ECC configurations in device_probe)
Merging crypto/master (aa2faec crypto: caam - Moved macro DESC_JOB_IO_LEN to desc_constr.h)
Merging drm/drm-next (aed2c03 drm/gem: fix mmap vma size calculations)
CONFLICT (content): Merge conflict in drivers/gpu/drm/qxl/qxl_release.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_dma.c
Merging drm-intel/for-linux-next (fae5cbf drm/i915: clean up crtc timings computation)
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_pm.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_dma.c
Merging drm-tegra/drm/for-next (ebae30b gpu: host1x: Rework CPU syncpoint increment)
Merging sound/for-next (da96fb5 ALSA: hda - Fix invalid multi-io creation on VAIO-Z laptops)
Merging sound-asoc/for-next (49605b3 Merge remote-tracking branch 'asoc/topic/wm8994' into asoc-next)
Merging modules/modules-next (ad81f05 Linux 3.11-rc1)
Merging virtio/virtio-next (314081f virtio: console: fix locking around send_sigio_to_port())
Merging input/next (46146e7 Input: nspire-keypad - replace magic offset with define)
Merging input-mt/for-next (ad81f05 Linux 3.11-rc1)
Merging cgroup/for-next (d29cae9 Merge branch 'for-3.12' into for-next)
Merging block/for-next (3fe9649 Merge branch 'for-3.11/drivers' into for-next)
Merging device-mapper/master (ad81f05 Linux 3.11-rc1)
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 (6d1d6b4 mmc: tmio: fix compiler warning)
Merging kgdb/kgdb-next (6bedf31 kdb: Remove unhandled ssb command)
Merging slab/for-next (0450b0c Merge branch 'slab/next' into for-next)
Merging uclinux/for-next (6dbe51c Linux 3.9-rc1)
Merging md/for-next (5ad58b4 md/raid5: make release_stripe lockless)
Merging mfd/master (38c4faa mfd: ucb1x00: Explicitely include linux/device.h)
Merging battery/master (5a6c220 charger-manager: Fix regulator_get() return check)
Merging fbdev/for-next (5e8be02 video: atmel_lcdfb: add device tree suport)
Merging viafb/viafb-next (838ac78 viafb: avoid refresh and mode lookup in set_par)
Merging omap_dss2/for-next (3b2f64d Linux 3.11-rc2)
Merging regulator/for-next (ac6b916 Merge remote-tracking branch 'regulator/topic/tps65912' into regulator-next)
Merging security/next (9548906 xattr: Constify ->name member of "struct xattr".)
Merging selinux/master (2be4d74 Add SELinux policy capability for always checking packet and peer classes.)
CONFLICT (content): Merge conflict in security/selinux/hooks.c
Merging lblnet/master (07bc9dc Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc)
Merging watchdog/master (b3a3a9c Merge tag 'trace-3.11-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace)
Merging dwmw2-iommu/master (6491d4d intel-iommu: Free old page tables before creating superpage)
Merging iommu/next (01ce784 Merge branches 'x86/vt-d', 'arm/omap', 'core', 'x86/amd' and 'arm/smmu' into next)
Merging vfio/next (47188d3 Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4)
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 (a24a4b9 include/linux/coda.h: remove useless '#else')
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 (f0a56c4 amd64_edac: Fix single-channel setups)
Merging devicetree/devicetree/next (245d964 of/platform: Staticize of_platform_device_create_pdata())
Merging dt-rh/for-next (d683b96 Linux 3.10-rc4)
Merging spi/for-next (39e5a3f Merge remote-tracking branch 'spi/topic/xilinx' into spi-next)
Merging tip/auto-latest (4b8c6f8 Merge branch 'x86/urgent')
Merging ftrace/for-next (1c80c43 ftrace: Consolidate some duplicate code for updating ftrace ops)
Merging rcu/rcu/next (0f791c9 nohz_full: Force RCU's grace-period kthreads onto timekeeping CPU)
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 (bf64087 KVM: s390: Make KVM_HVA_ERR_BAD usable on s390)
Merging kvm-arm/kvm-arm-next (8bd4ffd ARM: kvm: don't include drivers/virtio/Kconfig)
Merging kvm-ppc/kvm-ppc-next (20f7462 Merge remote-tracking branch 'cmadma/for-v3.12-cma-dma' into kvm-ppc-next)
CONFLICT (content): Merge conflict in mm/Kconfig
Merging oprofile/for-next (f722406 Linux 3.10-rc1)
Merging fw-nohz/nohz/next (74876a9 printk: Wake up klogd using irq_work)
Merging xen-tip/linux-next (eea3e0b Merge tag 'stable/for-linus-3.11-rc3-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen into linux-next)
Merging percpu/for-next (a424445 percpu-refcount: use RCU-sched insted of normal RCU)
Merging workqueues/for-next (1315b5c Merge branch 'for-3.12' into for-next)
Merging drivers-x86/linux-next (de91b53 x86 platform drivers: fix gpio leak)
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 (f021e63 Merge remote-tracking branch 'regmap/topic/sparse' into regmap-next)
Merging hsi/for-next (43139a6 HSI: hsi_char: Update ioctl-number.txt)
Merging leds/for-next (077e91f leds: use dev_get_platdata())
Merging driver-core/driver-core-next (e70b091 tile / cpu topology: remove stale Macro arch_provides_topology_pointers)
CONFLICT (content): Merge conflict in net/core/net-sysfs.c
Merging tty/tty-next (e26439c serial: pch_uart: Fix signed-ness and casting of uartclk related fields)
Merging usb/usb-next (7d50195 usb: host: Faraday fotg210-hcd driver)
Merging usb-gadget/next (f074245 usb: renesas: use dev_get_platdata())
CONFLICT (content): Merge conflict in drivers/usb/musb/tusb6010.c
CONFLICT (content): Merge conflict in drivers/usb/musb/omap2430.c
CONFLICT (content): Merge conflict in drivers/usb/gadget/udc-core.c
Merging staging/staging-next (b9b9b35 staging: gdm724x: depend on CONFIG_TTY)
Merging char-misc/char-misc-next (9c5891b Merge 3.11-rc3 into char-misc-next.)
Merging scsi/for-next (2cb6e5f [SCSI] st: convert class code to use dev_groups)
Merging target-updates/for-next (ca40d24 iser-target: Ignore non TEXT + LOGOUT opcodes for discovery)
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 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 (8bb495e Linux 3.10)
Merging hwspinlock/linux-next (8b37fcf hwspinlock: add MAINTAINERS entries)
Merging pinctrl/for-next (fa8ec8f Merge branch 'devel' into for-next)
Merging vhost/linux-next (22fa90c vhost: Remove custom vhost rcu usage)
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 gpio/for-next (b0305e9 Merge branch 'devel' into for-next)
Merging arm-soc/for-next (c53414f Merge branch 'fixes' into for-next)
Merging bcm2835/for-next (7d13205 Linux 3.10-rc6)
Merging cortex/for-next (3ad87ac ARM: ARMv7-M: Fix name of NVIC handler function)
Merging ep93xx/ep93xx-for-next (9c59be7 Merge branch 'ep93xx-devel' into ep93xx-for-next)
Merging imx-mxs/for-next (184b94c Merge branches 'mxs/dt', 'imx/fixes', 'imx/weim', 'imx/soc' and 'imx/dt' into for-next)
CONFLICT (content): Merge conflict in arch/arm/Kconfig.debug
Merging ixp4xx/next (19f949f Linux 3.8)
Merging msm/for-next (28fd577 Merge branch 'for-3.12/msm-cleanup2' into for-next)
CONFLICT (content): Merge conflict in arch/arm/Kconfig.debug
Merging mvebu/for-next (5c0f737 Merge branches 'mvebu/fixes-non-critical', 'mvebu/boards', 'mvebu/defconfig' and 'mvebu/dt' into for-next)
Merging renesas/next (833574a Merge tag 'renesas-clocksource-for-v3.12' into next)
Merging samsung/for-next (abba936 Merge branch 'v3.11-samsung-fixes-2' into for-next)
Merging tegra/for-next (c8cd3e7 Merge branch for-3.12/defconfig into for-next)
Merging dma-mapping/dma-mapping-next (f7d8f1e Merge remote-tracking branch 'dma-public/for-v3.12-cma-dma' into for-next)
Merging pwm/for-next (6d0cf4d ARM: dts: Use the PWM polarity flags)
Merging dma-buf/for-next (8bb495e Linux 3.10)
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 (406c598 clk: exynos5250: Add G2D gate clock)
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.)
Merging ptr-ret/PTR_RET (ad151d5 GFS2: Replace PTR_RET with PTR_ERR_OR_ZERO)
Merging aio/master (6878ea7 aio: be defensive to ensure request batching is non-zero instead of BUG_ON())
Merging scsi-post-merge/merge-base:master (65112dc Merge git://git.samba.org/sfrench/cifs-2.6)
Merging akpm-current/current (36313f8 lz4: fix compression/decompression signedness mismatch)
CONFLICT (content): Merge conflict in fs/binfmt_elf.c
$ git checkout -b akpm remotes/origin/akpm/master
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: inode: move inode to a different list inside lock
Applying: dcache: convert to use new lru list infrastructure
Applying: list_lru: per-node list infrastructure
Applying: list_lru: per-node list infrastructure fix
Applying: list_lru: fix broken LRU_RETRY behaviour
Applying: list_lru: per-node API
Applying: list_lru: remove special case function list_lru_dispose_all.
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: xfs: fix dquot isolation hang
Applying: fs: convert fs shrinkers to new scan/count API
Applying: fs-convert-fs-shrinkers-to-new-scan-count-api-fix
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: super: fix for destroy lrus
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
Merging akpm/master (d6c1238 staging/lustre/libcfs: cleanup linux-mem.h)

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 39+ messages in thread

* Re: linux-next: Tree for Aug 1
  2011-08-02  1:29     ` Stephen Rothwell
@ 2011-08-02 10:38       ` Sedat Dilek
  0 siblings, 0 replies; 39+ messages in thread
From: Sedat Dilek @ 2011-08-02 10:38 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Randy Dunlap, linux-next, LKML, Stephen Boyd, Andrew Morton

On Tue, Aug 2, 2011 at 3:29 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> On Mon, 1 Aug 2011 14:54:22 -0700 Randy Dunlap <rdunlap@xenotime.net> wrote:
>>
>> On Mon, 1 Aug 2011 09:01:21 +0200 Sedat Dilek wrote:
>>
>> > Just FYI: mmotm-tree still misses the fixup-patch from [1].
>> >
>> > [1] https://patchwork.kernel.org/patch/1021602/
>>
>> Yes, I am applying this patch daily (among others).  :(
>>
>> Acked-by: Randy Dunlap <rdunlap@xenotime.net>
>
> OK, I will apply this patch to linux-next as a merge fixup on top of
> Andrew's tree.
>
> --
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
> http://www.canb.auug.org.au/~sfr/
>

Thanks for taking care, Stephen.
Just FYI: Andrew will carry the fix as
"consolidate-config_debug_strict_user_copy_checks-fix.patch" in his
tree.

- Sedat -

^ permalink raw reply	[flat|nested] 39+ messages in thread

* Re: linux-next: Tree for Aug 1
  2011-08-01 21:54   ` Randy Dunlap
@ 2011-08-02  1:29     ` Stephen Rothwell
  2011-08-02 10:38       ` Sedat Dilek
  0 siblings, 1 reply; 39+ messages in thread
From: Stephen Rothwell @ 2011-08-02  1:29 UTC (permalink / raw)
  To: Randy Dunlap
  Cc: sedat.dilek, Sedat Dilek, linux-next, LKML, Stephen Boyd, Andrew Morton

[-- Attachment #1: Type: text/plain, Size: 589 bytes --]

Hi all,

On Mon, 1 Aug 2011 14:54:22 -0700 Randy Dunlap <rdunlap@xenotime.net> wrote:
>
> On Mon, 1 Aug 2011 09:01:21 +0200 Sedat Dilek wrote:
> 
> > Just FYI: mmotm-tree still misses the fixup-patch from [1].
> > 
> > [1] https://patchwork.kernel.org/patch/1021602/
> 
> Yes, I am applying this patch daily (among others).  :(
> 
> Acked-by: Randy Dunlap <rdunlap@xenotime.net>

OK, I will apply this patch to linux-next as a merge fixup on top of
Andrew's tree.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

^ permalink raw reply	[flat|nested] 39+ messages in thread

* Re: linux-next: Tree for Aug 1
  2011-08-01  7:01 ` Sedat Dilek
@ 2011-08-01 21:54   ` Randy Dunlap
  2011-08-02  1:29     ` Stephen Rothwell
  0 siblings, 1 reply; 39+ messages in thread
From: Randy Dunlap @ 2011-08-01 21:54 UTC (permalink / raw)
  To: sedat.dilek
  Cc: Sedat Dilek, Stephen Rothwell, linux-next, LKML, Stephen Boyd,
	Andrew Morton

On Mon, 1 Aug 2011 09:01:21 +0200 Sedat Dilek wrote:

> On Mon, Aug 1, 2011 at 6:47 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > Hi all,
> >
> > Just in case anyone needs reminding:  Please do not add anything destined
> > for v3.2 into linux-next included trees until after v3.1-rc1.
> >
> > The powerpc allyesconfig build (at least) fails today.
> >
> > Changes since 20110729:
> >
> > Linus' tree still lost its build failure.
> >
> > The v4l-dvb tree lost its conflicts.
> >
> > The kgdb tree gained a build failure for which I reverted 3 commits.
> >
> > The moduleh tree gained a conflict against the slabe-dma tree but lost
> > its build failures (except for a few remaining merge fixups).
> >
> > ----------------------------------------------------------------------------
> >
> 
> Just FYI: mmotm-tree still misses the fixup-patch from [1].
> 
> - Sedat -
> 
> [1] https://patchwork.kernel.org/patch/1021602/

Yes, I am applying this patch daily (among others).  :(

Acked-by: Randy Dunlap <rdunlap@xenotime.net>

---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***

^ permalink raw reply	[flat|nested] 39+ messages in thread

* Re: linux-next: Tree for Aug 1
  2011-08-01  4:47 Stephen Rothwell
@ 2011-08-01  7:01 ` Sedat Dilek
  2011-08-01 21:54   ` Randy Dunlap
  0 siblings, 1 reply; 39+ messages in thread
From: Sedat Dilek @ 2011-08-01  7:01 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: linux-next, LKML, Stephen Boyd, Andrew Morton, Randy Dunlap

On Mon, Aug 1, 2011 at 6:47 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> Just in case anyone needs reminding:  Please do not add anything destined
> for v3.2 into linux-next included trees until after v3.1-rc1.
>
> The powerpc allyesconfig build (at least) fails today.
>
> Changes since 20110729:
>
> Linus' tree still lost its build failure.
>
> The v4l-dvb tree lost its conflicts.
>
> The kgdb tree gained a build failure for which I reverted 3 commits.
>
> The moduleh tree gained a conflict against the slabe-dma tree but lost
> its build failures (except for a few remaining merge fixups).
>
> ----------------------------------------------------------------------------
>

Just FYI: mmotm-tree still misses the fixup-patch from [1].

- Sedat -

[1] https://patchwork.kernel.org/patch/1021602/

^ permalink raw reply	[flat|nested] 39+ messages in thread

* linux-next: Tree for Aug 1
@ 2011-08-01  4:47 Stephen Rothwell
  2011-08-01  7:01 ` Sedat Dilek
  0 siblings, 1 reply; 39+ messages in thread
From: Stephen Rothwell @ 2011-08-01  4:47 UTC (permalink / raw)
  To: linux-next; +Cc: LKML

[-- Attachment #1: Type: text/plain, Size: 15973 bytes --]

Hi all,

Just in case anyone needs reminding:  Please do not add anything destined
for v3.2 into linux-next included trees until after v3.1-rc1.

The powerpc allyesconfig build (at least) fails today.

Changes since 20110729:

Linus' tree still lost its build failure.

The v4l-dvb tree lost its conflicts.

The kgdb tree gained a build failure for which I reverted 3 commits.

The moduleh tree gained a conflict against the slabe-dma tree but lost
its build failures (except for a few remaining merge fixups).

----------------------------------------------------------------------------

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/v2.6/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 200 trees (counting Linus' and 28 trees of patches pending
for Linus' tree), more are welcome (even if they are currently empty).
Thanks to those who have contributed, and to those who haven't, please do.

Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next .  If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.

Thanks to Randy Dunlap for doing many randconfig builds.

There is a wiki covering stuff to do with linux-next at
http://linux.f-seidel.de/linux-next/pmwiki/ .  Thanks to Frank Seidel.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

$ git checkout master
$ git reset --hard stable
Merging origin/master
Merging fixes/fixes
Merging kbuild-current/rc-fixes
Merging arm-current/master
Merging m68k-current/for-linus
Merging powerpc-merge/merge
Merging 52xx-and-virtex-current/powerpc/merge
Merging sparc-current/master
Merging scsi-rc-fixes/master
Merging net-current/master
Merging sound-current/for-linus
Merging pci-current/for-linus
Merging wireless-current/master
Merging driver-core.current/driver-core-linus
Merging tty.current/tty-linus
Merging usb.current/usb-linus
Merging staging.current/staging-linus
Merging cpufreq-current/fixes
Merging input-current/for-linus
Merging md-current/for-linus
Merging audit-current/for-linus
Merging crypto-current/master
Merging ide-curent/master
Merging dwmw2/master
Merging sh-current/sh-fixes-for-linus
Merging rmobile-current/rmobile-fixes-for-linus
Merging fbdev-current/fbdev-fixes-for-linus
Merging devicetree-current/devicetree/merge
Merging spi-current/spi/merge
Merging arm/for-next
Merging arm-lpae/for-next
CONFLICT (content): Merge conflict in arch/arm/include/asm/pgalloc.h
CONFLICT (content): Merge conflict in arch/arm/include/asm/pgtable.h
CONFLICT (content): Merge conflict in arch/arm/include/asm/proc-fns.h
CONFLICT (content): Merge conflict in arch/arm/include/asm/tlb.h
CONFLICT (content): Merge conflict in arch/arm/mm/context.c
CONFLICT (content): Merge conflict in arch/arm/mm/proc-v7.S
Merging arm-soc/for-next
CONFLICT (content): Merge conflict in arch/arm/mach-exynos4/pm.c
CONFLICT (content): Merge conflict in arch/arm/mach-imx/mm-imx25.c
CONFLICT (content): Merge conflict in arch/arm/mach-imx/mm-imx31.c
CONFLICT (content): Merge conflict in arch/arm/mach-imx/mm-imx35.c
CONFLICT (content): Merge conflict in arch/arm/mach-mx5/mm.c
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/cm-regbits-44xx.h
Merging at91/at91-next
Merging davinci/davinci-next
Merging i.MX/for-next
Merging linux-spec/for-next
Merging msm/for-next
Merging omap/for-next
Merging pxa/for-next
Merging samsung/next-samsung
Merging s5p/for-next
CONFLICT (content): Merge conflict in arch/arm/mach-exynos4/Kconfig
CONFLICT (content): Merge conflict in arch/arm/mach-exynos4/mach-smdkc210.c
Merging tegra/for-next
Merging ux500-core/ux500-core
Merging xilinx/arm-next
Merging blackfin/for-linus
Merging cris/for-next
Merging ia64/test
Merging m68k/for-next
Merging m68knommu/for-next
Merging microblaze/next
Merging mips/mips-for-linux-next
Merging openrisc/for-upstream
Merging parisc/for-next
Merging powerpc/next
Merging 4xx/next
Merging 52xx-and-virtex/powerpc/next
Merging galak/next
Merging s390/features
Merging sh/sh-latest
Merging rmobile/rmobile-latest
Merging sparc/master
Merging tile/master
Merging unicore32/unicore32
Merging xtensa/master
Merging ceph/for-next
CONFLICT (content): Merge conflict in fs/ceph/export.c
Merging cifs/master
Merging configfs/linux-next
Merging ecryptfs/next
Merging ext3/for_next
Merging ext4/dev
CONFLICT (content): Merge conflict in fs/ext4/inode.c
Applying: vfs/ext4: merge fixup for moved function
Merging fatfs/master
Merging fuse/for-next
Merging gfs2/master
Merging hfsplus/for-next
Merging jfs/next
Merging logfs/master
CONFLICT (content): Merge conflict in fs/logfs/logfs.h
Merging nfs/linux-next
Merging nfsd/nfsd-next
Merging nilfs2/for-next
Merging ocfs2/linux-next
Merging omfs/for-next
Merging squashfs/master
Merging udf/for_next
Merging v9fs/for-next
Merging ubifs/linux-next
Merging xfs/master
Merging vfs/for-next
Merging vfs-scale/vfs-scale-working
Merging pci/linux-next
Merging of-pci/of-pci
Merging hid/for-next
Merging quilt/i2c
Merging bjdooks-i2c/next-i2c
Merging quilt/jdelvare-hwmon
Merging hwmon-staging/hwmon-next
Merging quilt/kernel-doc
Merging docs/docs-move
Merging v4l-dvb/master
Merging kbuild/for-next
Merging kconfig/for-next
Merging ide/master
Merging libata/NEXT
Merging infiniband/for-next
Merging acpi/test
CONFLICT (content): Merge conflict in arch/ia64/Kconfig
CONFLICT (content): Merge conflict in arch/powerpc/Kconfig
CONFLICT (content): Merge conflict in arch/x86/Kconfig
CONFLICT (content): Merge conflict in lib/Kconfig
CONFLICT (content): Merge conflict in lib/Makefile
Merging idle-test/idle-test
Merging powertools/tools-test
Merging cpupowerutils/master
Merging ieee1394/for-next
Merging ubi/linux-next
Merging dlm/next
Merging swiotlb/master
Merging ibft/master
Merging scsi/master
Merging iscsi-target/for-next
Merging slave-dma/next
CONFLICT (content): Merge conflict in drivers/dma/mv_xor.c
Merging async_tx/next
Merging net/master
Merging wireless/master
Merging bluetooth/master
Merging mtd/master
Merging l2-mtd/master
CONFLICT (content): Merge conflict in drivers/mtd/maps/lantiq-flash.c
CONFLICT (content): Merge conflict in drivers/mtd/maps/pxa2xx-flash.c
Merging crypto/master
Merging sound/for-next
Merging sound-asoc/for-next
Merging cpufreq/next
Merging quilt/rr
Merging input/next
Merging input-mt/next
Merging lsm/for-next
Merging block/for-next
Merging quilt/device-mapper
Merging embedded/master
Merging firmware/master
Merging pcmcia/master
Merging battery/master
Merging leds/for-mm
CONFLICT (content): Merge conflict in drivers/leds/Kconfig
Merging backlight/for-mm
Merging mmc/mmc-next
Merging kgdb/kgdb-next
Merging slab/for-next
Merging uclinux/for-next
Merging md/for-next
Merging mfd/for-next
Merging hdlc/hdlc-next
Merging drm/drm-next
Merging fbdev/master
Merging viafb/viafb-next
Merging omap_dss2/for-next
Merging voltage/for-next
Merging security-testing/next
Merging selinux/master
Merging lblnet/master
Merging agp/agp-next
Merging watchdog/master
Merging bdev/master
Merging dwmw2-iommu/master
Merging cputime/cputime
Merging osd/linux-next
Merging jc_docs/docs-next
Merging nommu/master
Merging trivial/for-next
Merging audit/for-next
Merging suspend/linux-next
Merging apm/for-next
Merging fsnotify/for-next
Merging irda/for-next
Merging i7core_edac/linux_next
Merging i7300_edac/linux_next
Merging devicetree/devicetree/next
Merging spi/spi/next
Merging gpio/gpio/next
Merging tip/auto-latest
Merging rcu/rcu/next
Merging kvm/linux-next
Merging oprofile/for-next
Merging ptrace/ptrace
Merging xen/upstream/xen
Merging xen-two/linux-next
Merging xen-pvhvm/linux-next
Merging edac-amd/for-next
Merging percpu/for-next
Merging workqueues/for-next
Merging sfi/sfi-test
Merging asm-generic/next
Merging drivers-x86/linux-next
CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt
Merging hwpoison/hwpoison
Merging sysctl/master
Merging namespace/master
Merging regmap/for-next
Merging driver-core/driver-core-next
Merging tty/tty-next
Merging usb/usb-next
Merging staging/staging-next
Merging bkl-config/config
Merging tmem/linux-next
Merging writeback/next
Merging arm-dt/devicetree/arm-next
Merging scsi-post-merge/merge-base:master
Merging moduleh/module.h-split
CONFLICT (content): Merge conflict in drivers/dma/ste_dma40.c
Applying: include export.h to use EXPORT_SYMBOL
Applying: block: bsg-lib.c needs export.h
$ git checkout akpm
Applying: kernel/fork.c:267: error: implicit declaration of function
Applying: WARNING: line over 80 characters
Applying: arch/cris/arch-v10/drivers/sync_serial.c:628: error: 'ret' undeclared (first use in this function)
Applying: arch/cris/arch-v10/drivers/sync_serial.c:961: error: conflicting types for 'sync_serial_ioctl'
Applying: arch/cris/arch-v10/kernel/irq.c:239: error: implicit declaration of function 'kgdb_init'
Applying: My load tests on PowerPC freeze within minutes in __slab_free().  I
Applying: The parameter's origin type is long.  On an i386 architecture, it can
Applying: kernel/time.c:578: error: conflicting types for 'jiffies_to_clock_t'
Applying: It's about time to revert 16d752397301b9 ("thermal: Create
Applying: We'll soon need to reuse it.
Applying: THERMAL_HWMON is implemented inside the thermal_sys driver and has no
Applying: b552a8c56db8 ("ACPI: remove NID_INVAL") removed the left over uses of
Applying: Linux supports some optional features, but it should notify the BIOS about
Applying: Add support for Aspire 1410 BIOS v1.3314.  Fixes the following error:
Applying: This makes the iris driver use the platform API, so it is properly exposed
Applying: - remove commented-out code
Applying: There was one code block that I commented to be able to test the patch dnd
Applying: On x86_32 casting the unsigned int result of get_random_int() to long may
Applying: This new driver replaces the old PCEngines Alix 2/3 LED driver with a new
Applying: Replace the bubble sort in sanitize_e820_map() with a call to the generic
Applying: Don't allow everybody to use a modem.
Applying: The address limit is already set in flush_old_exec() so this
Applying: A call to va_copy() should always be followed by a call to va_end() in the
Applying: Don't dereference em if it's NULL or an error pointer.
Applying: The buffer 'sc.cpu_mask' is a kernel buffer.  If bitmap_parse is used
Applying: fb_set_suspend() must be called with the console semaphore held, which
Applying: Unless I'm very much missing something these tests are intended to check
Applying: The address limit is already set in flush_old_exec() so this
Applying: The address limit is already set in flush_old_exec() so this
Applying: Mike McLagan hasn't contributed in many years and his email bounces.
Applying: proc_fork_connector() uses ->real_parent lockless.  This is not safe if
Applying: backlight_device_register() returns ERR_PTR() on error.
Applying: 1. current implementation tests wrong value for setting aat2870_bl->max_current.
Applying: i386 allmodconfig:
Applying: ext4_{set,clear}_bit() is defined as __test_and_{set,clear}_bit_le() for
Applying: The dqc_bitmap field of struct ocfs2_local_disk_chunk is 32-bit aligned,
Applying: The address limit is already set in flush_old_exec() so those calls to
Applying: When do pci remove/rescan on system that have more iommus, got
Applying: The current implementation of dmi_name_in_vendors() is an invitation to
Applying: fix comment layout
Applying: The address limit is already set in flush_old_exec() so those calls to
Applying: For headers that get exported to userland and make use of u32 style
Applying: Fix sparse warnings of right shift bigger than source value size:
Applying: We leak in drivers/scsi/aacraid/commctrl.c::aac_send_raw_srb() :
Applying: brd_make_request() always returns 0, which doesn't make much sense.
Applying: Remove the (unsigned long long) cast in diskstats_show() and adjusts the
Applying: The report has an ISO which has a very long manufacturer ID.  It seems
Applying: The address limit is already set in flush_old_exec() so this assignment of
Applying: x86_64 allmodconfig:
Applying: alpha allmodconfig:
Applying: alpha allmodconfig:
Applying: alpha allmodconfig:
Applying: Cc: Greg KH <greg@kroah.com>
Applying: Use the nice enumerated constant.
Applying: A patchset to extend tmpfs to MAX_LFS_FILESIZE by abandoning its peculiar
Applying: If swap entries are to be stored along with struct page pointers in a
Applying: The maximum size of a shmem/tmpfs file has been limited by the maximum
Applying: While it's at its least, make a number of boring nitpicky cleanups to
Applying: Bring truncate.c's code for truncate_inode_pages_range() inline into
Applying: Disable the toy swapping implementation in shmem_writepage() - it's hard
Applying: Convert shmem_unuse_inode() to use a lockless gang lookup of the radix
Applying: Convert shmem_getpage_gfp(), the engine-room of shmem, to expect page or
Applying: Remove mem_cgroup_shmem_charge_fallback(): it was only required when we
Applying: Convert shmem_writepage() to use shmem_delete_from_page_cache() to use
Applying: But we've not yet removed the old swp_entry_t i_direct[16] from
Applying: Remove PageSwapBacked (!page_is_file_cache) cases from
Applying: Fix NULL dereference I introduced in mincore_page().
Applying: Expand the fs/Kconfig "help" info to clarify why it's a bad idea to
Applying: Expand the fs/Kconfig "help" info to clarify why you might need to select
Applying: smp_call_function() only lets all other CPUs execute a specific function,
Applying: auto_demotion_disable is called only for online CPUs.  For hotplugged
Applying: Enabling DEBUG_STRICT_USER_COPY_CHECKS causes the following warning:
Applying: Strict user copy checks are only really supported on x86_32 even though
Applying: The help text for this config is duplicated across the x86, parisc, and
Applying: Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Applying: Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Applying: No need to declare show_regs() in ptrace.h, sched.h does this.
Applying: Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Applying: Expand root=PARTUUID=UUID syntax to support selecting a root partition by
Applying: Update kernel-parameters.txt to point users to the authoritative comment
Applying: While ramoops writes to ram, accessing the dump requires using /dev/mem
Merging akpm
Applying: power_supply: max8997_charger.c need to include module.h
[master a87004f] Revert "kdb,kgdb: Allow arbitrary kgdb magic knock sequences"
[master bdd1281] Revert "kdb: Remove all references to DOING_KGDB2"
[master 92450785] Revert "kdb,kgdb: Implement switch and pass buffer from kdb -> gdb"

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

^ permalink raw reply	[flat|nested] 39+ messages in thread

end of thread, other threads:[~2019-08-01  6:14 UTC | newest]

Thread overview: 39+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-08-01  6:14 linux-next: Tree for Aug 1 Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2018-08-01  7:58 Stephen Rothwell
2018-08-01 22:48 ` Guenter Roeck
2018-08-01 22:52   ` James Bottomley
2018-08-01 23:00     ` James Bottomley
2018-08-02  0:05       ` Stephen Rothwell
2018-08-02  1:19         ` Guenter Roeck
2018-08-01 23:47     ` Guenter Roeck
2018-08-01 23:57       ` Ming Lei
2018-08-02  0:03         ` James Bottomley
2018-08-02  0:20           ` Guenter Roeck
2018-08-02  4:58           ` Guenter Roeck
2018-08-02  5:04             ` Bart Van Assche
2018-08-02 12:46               ` Guenter Roeck
2018-08-02 12:51                 ` Johannes Thumshirn
2018-08-02 13:00                   ` Guenter Roeck
2018-08-02 13:06                     ` Johannes Thumshirn
2018-08-02 11:35             ` Ming Lei
2018-08-02 13:05               ` Guenter Roeck
2018-08-02 16:27                 ` Ming Lei
2018-08-02 16:40                   ` Bart Van Assche
2018-08-02 16:50                     ` Ming Lei
2018-08-02 16:57                       ` Bart Van Assche
2018-08-02  0:12         ` Guenter Roeck
2017-08-01  7:37 Stephen Rothwell
2017-08-01 12:42 ` Sergey Senozhatsky
2017-08-01 13:20   ` Arnd Bergmann
2017-08-01 13:28     ` Arnd Bergmann
2017-08-01 23:55       ` Sergey Senozhatsky
2017-08-02 11:13         ` Arnd Bergmann
2016-08-01  4:02 Stephen Rothwell
2014-08-01  9:14 Stephen Rothwell
2013-08-01  7:25 Stephen Rothwell
2013-08-01  7:50 ` Sedat Dilek
2011-08-01  4:47 Stephen Rothwell
2011-08-01  7:01 ` Sedat Dilek
2011-08-01 21:54   ` Randy Dunlap
2011-08-02  1:29     ` Stephen Rothwell
2011-08-02 10:38       ` Sedat Dilek

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).