lkml.org 
[lkml]   [2018]   [Nov]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: Tree for Nov 14
Hi all,

Changes since 20181113:

The tip tree still had its build failure for which I applied a fix patch.

Non-merge commits (relative to Linus' tree): 2696
2835 files changed, 114088 insertions(+), 98851 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 296 trees (counting Linus' and 67 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 (ccda4af0f4b9 Linux 4.20-rc2)
Merging fixes/master (7c6c54b505b8 Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux)
Merging kbuild-current/fixes (f9af851aa8e7 kernel hacking: support building kernel with -Og optimization level)
Merging arc-current/for-curr (121e38e5acdc ARC: mm: fix uninitialised signal code in do_page_fault)
Merging arm-current/fixes (e46daee53bb5 ARM: 8806/1: kprobes: Fix false positive with FORTIFY_SOURCE)
Merging arm64-fixes/for-next/fixes (24cc61d8cb5a arm64: memblock: don't permit memblock resizing until linear mapping is up)
Merging m68k-current/for-linus (58c116fb7dc6 m68k/sun3: Remove is_medusa and m68k_pgtable_cachemode)
Merging powerpc-fixes/fixes (2c7645b0f7d1 selftests/powerpc: Fix wild_bctr test to work on ppc64)
Merging sparc/master (1f2b5b8e2df4 sparc64: Wire up compat getpeername and getsockname.)
Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2)
Merging net/master (77e461d14ed1 bnx2x: Assign unique DMAE channel number for FW DMAE transactions.)
Merging bpf/master (da85d8bfd151 kselftests/bpf: use ping6 as the default ipv6 ping binary when it exists)
Merging ipsec/master (ca92e173ab34 xfrm: Fix bucket count reported to userspace)
Merging netfilter/master (29e3880109e3 netfilter: nf_tables: fix use-after-free when deleting compat expressions)
Merging ipvs/master (feb9f55c33e5 netfilter: nft_dynset: allow dynamic updates of non-anonymous set)
Merging wireless-drivers/master (b374e8686fc3 mt76: fix building without CONFIG_LEDS_CLASS)
Merging mac80211/master (113f3aaa81bd cfg80211: Prevent regulatory restore during STA disconnect in concurrent interfaces)
Merging rdma-fixes/for-rc (99b77fef3c6c net/mlx5: Fix XRC SRQ umem valid bits)
Merging sound-current/for-linus (d99501b8575d ALSA: hda/ca0132 - Call pci_iounmap() instead of iounmap())
Merging sound-asoc-fixes/for-linus (fed9aaa78a5f Merge branch 'asoc-4.20' into asoc-linus)
Merging regmap-fixes/for-linus (35a7f35ad1b1 Linux 4.19-rc8)
Merging regulator-fixes/for-linus (4a6432ade8ba Merge branch 'regulator-4.20' into regulator-linus)
Merging spi-fixes/for-linus (f8303a12bb45 Merge branch 'spi-4.20' into spi-linus)
Merging pci-current/for-linus (1a87119b7bcf Revert "ACPI/PCI: Pay attention to device-specific _PXM node values")
Merging driver-core.current/driver-core-linus (a66d972465d1 devres: Align data[] to ARCH_KMALLOC_MINALIGN)
Merging tty.current/tty-linus (ccda4af0f4b9 Linux 4.20-rc2)
Merging usb.current/usb-linus (11644a765952 xhci: Add quirk to workaround the errata seen on Cavium Thunder-X2 Soc)
Merging usb-gadget-fixes/fixes (d9707490077b usb: dwc2: Fix call location of dwc2_check_core_endianness)
Merging usb-serial-fixes/usb-linus (ccda4af0f4b9 Linux 4.20-rc2)
Merging usb-chipidea-fixes/ci-for-usb-stable (a930d8bd94d8 usb: chipidea: Always build ULPI code)
Merging phy/fixes (778d2a611628 phy: qcom-qusb2: Fix HSTX_TRIM tuning with fused value for SDM845)
Merging staging.current/staging-linus (5a96b2d38dc0 staging: vchiq_arm: fix compat VCHIQ_IOC_AWAIT_COMPLETION)
Merging char-misc.current/char-misc-linus (432798195bbc uio: Fix an Oops on load)
Merging soundwire-fixes/fixes (651022382c7f Linux 4.20-rc1)
Merging input-current/for-linus (e94b9f12fa2c Input: atkbd - clean up indentation issue)
Merging crypto-current/master (9f4debe38415 crypto: user - Zeroize whole structure given to user space)
Merging ide/master (df2def49c57b Merge tag 'acpi-4.19-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm)
Merging vfio-fixes/for-linus (0e714d27786c vfio/pci: Fix potential Spectre v1)
Merging kselftest-fixes/fixes (651022382c7f Linux 4.20-rc1)
Merging modules-fixes/modules-linus (be71eda5383f module: Fix display of wrong module .text address)
Merging slave-dma-fixes/fixes (651022382c7f Linux 4.20-rc1)
Merging backlight-fixes/for-backlight-fixes (ce397d215ccd Linux 4.18-rc1)
Merging mtd-fixes/master (98ee3fc7ef83 mtd: nand: Fix nanddev_pos_next_page() kernel-doc header)
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 (10492ee8ed91 mfd: omap-usb-host: Fix dts probe of children)
Merging v4l-dvb-fixes/fixes (df18bfd35bbf media: v4l: fix uapi mpeg slice params definition)
Merging reset-fixes/reset/fixes (26fce0557fa6 reset: imx7: Fix always writing bits as 0)
Merging mips-fixes/mips-fixes (25517ed4e99b MIPS: Let early memblock_alloc*() allocate memories bottom-up)
Merging at91-fixes/at91-fixes (651022382c7f Linux 4.20-rc1)
Merging omap-fixes/fixes (91e43395820b Merge branch 'fixes-dts' into omap-for-v4.20/fixes)
Merging kvm-fixes/master (5f8bb004bca4 KVM: vmx: hyper-v: don't pass EPT configuration info to vmx_hv_remote_flush_tlb())
Merging kvms390-fixes/master (40ebdb8e59df KVM: s390: Make huge pages unavailable in ucontrol VMs)
Merging hwmon-fixes/hwmon (35fdc3902179 hwmon: (raspberrypi) Fix initial notify)
Merging nvdimm-fixes/libnvdimm-fixes (2121db096301 Revert "acpi, nfit: Further restrict userspace ARS start requests")
Merging btrfs-fixes/next-fixes (3ece0204d546 Merge branch 'misc-4.20' into next-fixes)
Merging vfs-fixes/fixes (3df629d873f8 gfs2_meta: ->mount() can get NULL dev_name)
Merging dma-mapping-fixes/for-linus (f62717551b2b arm64: fix warnings without CONFIG_IOMMU_DMA)
Merging i3c-fixes/master (651022382c7f Linux 4.20-rc1)
Merging drivers-x86-fixes/fixes (651022382c7f Linux 4.20-rc1)
Merging samsung-krzk-fixes/fixes (651022382c7f Linux 4.20-rc1)
Merging pinctrl-samsung-fixes/pinctrl-fixes (651022382c7f Linux 4.20-rc1)
Merging devicetree-fixes/dt/linus (89c38422e072 of, numa: Validate some distance map rules)
Merging scsi-fixes/fixes (8e4829c6f747 scsi: ufs: Fix hynix ufs bug with quirk on hi36xx SoC)
Merging drm-fixes/drm-fixes (73b6f96cbc01 Merge branch 'drm-fixes-4.20' of git://people.freedesktop.org/~agd5f/linux into drm-fixes)
Merging drm-intel-fixes/for-linux-next-fixes (44a7276b30c3 drm/i915: Fix hpd handling for pins with two encoders)
Merging mmc-fixes/fixes (c0b1a75d6e25 mmc: sdhci-pci: Try "cd" for card-detect lookup before using NULL)
Merging rtc-fixes/rtc-fixes (9bde0afb7a90 rtc: pcf2127: fix a kmemleak caused in pcf2127_i2c_gather_write)
Merging drm-misc-fixes/for-linux-next-fixes (adf59dd2408c drm/meson: venc: dmt mode must use encp)
Merging kbuild/for-next (a4219aff51b8 kernel hacking: support building kernel with -Og optimization level)
CONFLICT (content): Merge conflict in init/Kconfig
CONFLICT (content): Merge conflict in include/linux/compiler-gcc.h
Merging compiler-attributes/compiler-attributes (24efee412c75 Compiler Attributes: improve explanation of header)
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 (886643b76632 arm64: use the generic swiotlb_dma_ops)
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 (1f2b7bda0949 Merge branches 'fixes', 'misc' and 'spectre' into for-next)
Merging arm-perf/for-next/perf (5b394b2ddf03 Linux 4.19-rc1)
Merging arm-soc/for-next (ec534ead9922 ARM: Document merges)
Merging actions/for-next (fb9c1c1deb5e Merge branch 'v4.20/drivers+s900-sps' into next)
Merging alpine/alpine/for-next (7928b2cbe55b Linux 4.16-rc1)
Merging amlogic/for-next (6456dc61314e Merge branch 'v4.20/drivers' into tmp/aml-rebuild)
Merging aspeed/for-next (3368e06e2a91 ARM: dts: aspeed: Adding Facebook TiogaPass BMC)
Merging at91/at91-next (5fc4d4425024 Merge branch 'at91-dt' into at91-next)
Merging bcm2835/for-next (1c8ca6a2d2e5 Merge branch 'bcm2835-dt-next' into for-next)
Merging imx-mxs/for-next (d52afa81dfba Merge branch 'imx/defconfig' into for-next)
Merging keystone/next (a74cab3c7dcb Merge branch 'for_4.20/drivers-soc' into next)
Merging mediatek/for-next (42ac5fee3a13 Merge branch 'v4.19-next/soc' into for-next)
Merging mvebu/for-next (0f8a14a7cb8c Merge branch 'mvebu/dt64' into mvebu/for-next)
Merging omap/for-next (91e43395820b Merge branch 'fixes-dts' into omap-for-v4.20/fixes)
Merging reset/reset/next (2a6cb2b1d83b reset: Add reset_control_get_count())
Merging qcom/for-next (6252f3298861 Merge tag 'qcom-arm64-defconfig-for-4.20' into 4.20-tagged)
Merging realtek/for-next (2b6286eb7ab8 Merge branch 'v4.15/dt64' into next)
Merging renesas/next (a83061133f7a Merge branches 'fixes-for-v4.20', 'dt-bindings-for-v4.21', 'arm-defconfig-for-v4.21', 'arm-dt-for-v4.21', 'arm64-dt-for-v4.21' and 'arm64-defconfig-for-v4.21' into next)
Merging rockchip/for-next (6d5aaac52143 Merge branch 'v4.20-armsoc/dts64-fixes' into for-next)
Merging samsung/for-next (bebc6082da0a Linux 4.14)
Merging samsung-krzk/for-next (f6de2b8919b8 Merge branch 'next/dt64' into for-next)
Merging sunxi/sunxi/for-next (4b1d4fba9e26 Merge branch 'sunxi/dt64-for-4.21' into sunxi/for-next)
Merging tegra/for-next (fc5be21fcece Merge branch for-4.21/clk into for-next)
Merging arm64/for-next/core (966866892cf8 arm64: kprobe: make page to RO mode when allocate it)
Merging clk/clk-next (47d2e40c2635 Merge branch 'clk-fixes' into clk-next)
Merging clk-samsung/for-next (651022382c7f Linux 4.20-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 (252050365823 dt-bindings: timer: gx6605s SOC timer)
Merging h8300/h8300-next (4bdf61ccbe76 h8300: fix IRQ no)
Merging ia64/next (c51836246f97 ia64: generate uapi header and system call table files)
Merging m68k/for-next (58c116fb7dc6 m68k/sun3: Remove is_medusa and m68k_pgtable_cachemode)
Merging m68knommu/for-next (ccda4af0f4b9 Linux 4.20-rc2)
Merging microblaze/next (68a385c6c750 microblaze: Typo s/use use/use/)
Merging mips/mips-next (d0894409d171 lib/gcd: Remove use of CPU_NO_EFFICIENT_FFS macro)
Merging nds32/next (3fb688b03d0c nds32: support hardware prefetcher)
Merging nios2/for-next (cb41e6f95d8e nios2: update_mmu_cache preload the TLB with the new PTE)
Merging openrisc/for-next (5600779ea5f3 openrisc: use generic dma_noncoherent_ops)
Merging parisc-hd/for-next (86d4d068df57 parisc: Revert "Release spinlocks using ordered store")
Merging powerpc/next (ccda4af0f4b9 Linux 4.20-rc2)
Merging fsl/next (b6ae3550c8e2 powerpc/8xx: add missing header in 8xx_mmu.c)
Merging risc-v-pjw/for-next (467e050e9760 Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux)
Merging risc-v/for-next (003ec445f15f automerging branch "kernel.org-palmer-linux/next-sg_chain" into "for-next")
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 (005af85c50f7 Merge tag 'vfio-ccw-20181113' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/vfio-ccw into fixes)
Merging sparc-next/master (345671ea0f92 Merge branch 'akpm' (patches from Andrew))
Merging sh/for-next (ac21fc2dcb40 sh: switch to NO_BOOTMEM)
Merging uml/linux-next (917e2fd2c53e um: Make line/tty semantics use true write IRQ)
Merging xtensa/xtensa-for-next (11418596b31f Merge branch 'xtensa-fixes' into xtensa-for-next)
Merging fscrypt/master (e1cc40e5d42a fscrypt: log the crypto algorithm implementations)
Merging befs/for-next (55d945e2e4aa fs: befs: btree: Fixed some coding standard issues)
Merging btrfs/next (29dcea88779c Linux 4.17)
Merging btrfs-kdave/for-next (e18b78fa9833 Merge branch 'for-next-next-v4.20-20181106' into for-next-20181106)
Merging ceph/master (23c625ce3065 libceph: assume argonaut on the server side)
Merging cifs/for-next (deec7c24e5d7 cifs: update internal module version number)
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 (2c67b8573da7 Pull EVENT_ON_CHILD fsnotify fix from Amir.)
Merging ext4/dev (53692ec074d0 ext4: fix buffer leak in ext4_expand_extra_isize_ea() on error path)
Merging f2fs/dev (78130819695f f2fs: fix to keep project quota consistent)
Merging fuse/for-next (ebacb8127359 fuse: fix use-after-free in fuse_direct_IO())
Merging jfs/jfs-next (a83722f45c5b jfs: fix spelling mistake, EACCESS -> EACCES)
Merging nfs/linux-next (e3d5e573a54d SUNRPC: Fix a bogus get/put in generic_key_to_expire())
Merging nfs-anna/linux-next (9f0c5124f4a8 NFS: Don't open code clearing of delegation state)
Merging nfsd/nfsd-next (3697a0042c36 nfsd4: delay filehandle verification errors)
Merging orangefs/for-next (22fc9db296fc orangefs: no need to check for service_operation returns > 0)
Merging overlayfs/overlayfs-next (d47748e5ae5a ovl: automatically enable redirect_dir on metacopy=on)
Merging ubifs/linux-next (001260910c46 ubifs: auth: add CONFIG_KEYS dependency)
Merging v9fs/9p-next (3f4f393757a5 net/9p: include trans_common.h to fix missing prototype warning.)
Merging xfs/for-next (837514f7a4ca xfs: fix overflow in xfs_attr3_leaf_verify)
Merging file-locks/locks-next (41920d9f5f27 VFS: locks: remove unnecessary white space.)
Merging vfs/for-next (d708e87ca399 Merge branch 'work.mount' into for-next)
CONFLICT (content): Merge conflict in fs/proc/inode.c
CONFLICT (content): Merge conflict in fs/f2fs/super.c
CONFLICT (content): Merge conflict in fs/compat_ioctl.c
CONFLICT (content): Merge conflict in drivers/vfio/Kconfig
CONFLICT (content): Merge conflict in drivers/infiniband/Kconfig
CONFLICT (content): Merge conflict in arch/sparc/kernel/setup_64.c
Merging vfs-miklos/next (0eb8af4916a5 vfs: use helper for calling f_op->fsync())
Merging printk/for-next (a61eee132f1e Merge branch 'for-4.20-vsprintf-hash-fixes' into for-next)
Merging pci/next (651022382c7f Linux 4.20-rc1)
Merging pstore/for-next/pstore (1227daa43bce pstore/ram: Clarify resource reservation labels)
Merging hid/for-next (4f7dd34027d4 Merge branch 'for-4.21/hidraw' into for-next)
Merging i2c/i2c/for-next (ccda4af0f4b9 Linux 4.20-rc2)
Merging i3c/i3c/next (6cbd8043761e dt-bindings: i3c: Document Cadence I3C master bindings)
Merging dmi/master (57361846b52b Linux 4.19-rc2)
Merging hwmon-staging/hwmon-next (1818f19c7c7a dt-bindings: hwmon: tmp108: add optional interrupts and #thermal-sensor-cells)
Merging jc_docs/docs-next (2a1e03ca33be doc: tracing: Fix a number of typos)
Merging v4l-dvb/master (fbe57dde7126 media: ov7740: constify structures stored in fields of v4l2_subdev_ops structure)
Merging v4l-dvb-next/master (357b50f3ccc8 drm: amd: dc: don't use FP math when Kcov is enabled)
Merging fbdev/fbdev-for-next (217188d9f985 video: fbdev: remove redundant 'default n' from Kconfig-s)
Merging pm/linux-next (193255e3f4da Merge branch 'pm-cpuidle' into linux-next)
Merging cpupower/cpupower (dbc4ca339c8d tools cpupower: Override CFLAGS assignments)
Merging idle/next (8a5776a5f498 Linux 4.14-rc4)
Merging opp/opp/linux-next (534245cc69c2 OPP: Remove of_dev_pm_opp_find_required_opp())
Merging thermal/next (c2b59d279dbb thermal: core: using power_efficient_wq for thermal worker)
Merging thermal-soc/next (760eea43f8c6 thermal: da9062/61: Prevent hardware access during system suspend)
Merging ieee1394/for-next (188775181bc0 firewire-ohci: work around oversized DMA reads on JMicron controllers)
Merging dlm/next (58a923adf4d9 dlm: fix possible call to kfree() for non-initialized pointer)
Merging swiotlb/linux-next (da689221f952 xen/blkfront: avoid NULL blkfront_info dereference on device removal)
Merging rdma/for-next (8c9959689b20 IB/rxe: make rxe_unregister_device void)
Merging net-next/master (3e536cff3424 net: phy: check if advertising is zero using linkmode_empty)
Merging bpf-next/master (407be8d03e20 Merge branch 'narrow-loads')
CONFLICT (content): Merge conflict in net/core/filter.c
Merging ipsec-next/master (6ac098b2a9d3 xfrm: policy: add 2nd-level saddr trees for inexact policies)
Merging mlx5-next/mlx5-next (b02394aa75e3 IB/mlx5: Improve ODP debugging messages)
Merging netfilter-next/master (b96609876922 netfilter: nf_flow_table: simplify nf_flow_offload_gc_step())
Merging nfc-next/master (1f008cfec5d5 NFC: fdp: Fix unused variable warnings)
Merging ipvs-next/master (26a1ccc6c117 bpf: test: fix spelling mistake "REUSEEPORT" -> "REUSEPORT")
Merging wireless-drivers-next/master (bb38177cb6c6 Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git)
Merging bluetooth/master (261501d94e80 Merge branch 'sctp-add-support-for-sk_reuseport')
Merging mac80211-next/master (ecbc12ad6b68 {nl,mac}80211: add rssi to mesh candidates)
Merging gfs2/for-next (8d52c6496a3d gfs2: read journal in large chunks to locate the head)
Merging mtd/mtd/next (f7d6cf6d0c7e mtd: cfi_cmdset_0020: Mark expected switch fall-throughs)
Merging nand/nand/next (647ad49ca672 staging: Remove the mt29f_spinand driver)
Merging spi-nor/spi-nor/next (41fe242979e4 mtd: spi-nor: fsl-quadspi: fix read error for flash size larger than 16MB)
Merging crypto/master (196ad6043e9f crypto: testmgr - mark cts(cbc(aes)) as FIPS allowed)
Merging drm/drm-next (651022382c7f Linux 4.20-rc1)
Merging drm-panel/drm/panel/for-next (e4bac408b084 drm/panel: simple: Add support for Winstar WF35LTIACD)
Merging drm-intel/for-linux-next (704e504bd616 drm/i915: add ICP support to cnp_rawclk() and kill icp_rawclk())
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_hotplug.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_display.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_reg.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_irq.c
Merging drm-tegra/drm/tegra/for-next (5ac93f81096a drm/tegra: Detach devices from IOMMU DMA domain on arm32)
Merging drm-misc/for-linux-next (7db647aa8b13 drm/meson: Add primary plane scaling)
CONFLICT (content): Merge conflict in drivers/gpu/drm/sun4i/sun4i_tcon.c
Merging drm-msm/msm-next (fa81b1ad6976 drm/msm: dpu: Don't set legacy plane->crtc pointer)
CONFLICT (content): Merge conflict in drivers/gpu/drm/msm/hdmi/hdmi.c
Merging hdlcd/for-upstream/hdlcd (d664b851eb2b drm/arm/hdlcd: Reject atomic commits that disable only the plane)
Merging mali-dp/for-upstream/mali-dp (fd99bd8b805c drm: malidp: Add the size of the superblocks when calculating total size for AFBC buffers)
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 (6cec571b70ec drm/imx: ipuv3-plane: add function to query atomic update status)
Merging etnaviv/etnaviv/next (99e294492ef9 drm/etnaviv: Replace drm_dev_unref with drm_dev_put)
Merging kconfig/for-next (bebc6082da0a Linux 4.14)
Merging regmap/for-next (031aef723a7d Merge remote-tracking branches 'regmap/topic/noinc' and 'regmap/topic/single-rw' into regmap-next)
Merging sound/for-next (fba43f454cdf ALSA: oxfw: add support for APOGEE duet FireWire)
Merging sound-asoc/for-next (a46e337748ca Merge branch 'asoc-4.21' into asoc-next)
Merging modules/modules-next (e84cd7ee630e modsign: use all trusted keys to verify module signature)
Merging input/next (f39f8688888a Input: synaptics - avoid using uninitialized variable when probing)
Merging block/for-next (d16a67667c61 ide: don't clear special on ide_queue_rq() entry)
CONFLICT (content): Merge conflict in drivers/scsi/ufs/ufshcd.c
Merging lightnvm/for-next (1c6286f26301 lightnvm: fix some error code in pblk-init.c)
Merging device-mapper/for-next (c49f3571b597 dm mpath: only flush workqueue when needed)
Merging pcmcia/pcmcia-next (95691e3eddc4 pcmcia: Implement CLKRUN protocol disabling for Ricoh bridges)
Merging mmc/next (422d90e2abb9 mmc: sdhci: Convert sdhci_allocate_bounce_buffer() to return void)
Merging kgdb/kgdb-next (3bd67b37e350 kdb: print real address of pointers instead of hashed addresses)
Merging md/for-next (d033bfe037c5 raid1: avoid dereference bitmap before barrier)
Merging mfd/for-mfd-next (a521dcb18b6d mfd: tps6586x: Handle interrupts on suspend)
Merging backlight/for-backlight-next (e1c9f2eaa0fb backlight: Remove ld9040 driver)
Merging battery/for-next (195ca1703784 power: supply: Add Spreadtrum SC27XX fuel gauge unit driver)
Merging regulator/for-next (f8ed925e6287 Merge remote-tracking branch 'regulator/topic/coupled' into regulator-next)
Merging security/next-testing (26b76320a8a5 Merge tag 'v4.20-rc2' into next-general)
Merging apparmor/apparmor-next (5f21585384a4 Merge tag 'for-linus-20181102' of git://git.kernel.dk/linux-block)
Merging integrity/next-integrity (2b48646cd60f docs: Extend trusted keys documentation for TPM 2.0)
Merging keys/keys-next (1e684d3820d8 pkcs7: Set the module licence to prevent tainting)
Merging selinux/next (5df275cd4cf5 selinux: policydb - fix byte order and alignment issues)
Merging tpmdd/next (09c573ab853d tpm: tpm_ibmvtpm: fix kdoc warnings)
Merging watchdog/master (ccda4af0f4b9 Linux 4.20-rc2)
Merging iommu/next (dec276483c57 Merge branches 'iommu/fixes', 'arm/renesas', 'arm/mediatek', 'x86/vt-d' and 'core' into next)
Merging dwmw2-iommu/master (d8a5b80568a9 Linux 4.15)
Merging vfio/next (104c7405a64d vfio: add edid support to mbochs sample driver)
Merging trivial/for-next (75a24b822d38 kfifo: fix inaccurate comment)
Merging audit/next (f905c2fc3980 audit: Use 'mark' name for fsnotify_mark variables)
Merging devicetree/for-next (f8274f14a9b1 Merge tag 'kfree_validate_v7-for-4.20' of git://git.kernel.org/pub/scm/linux/kernel/git/frowand/linux into dt/next)
Merging mailbox/mailbox-for-next (9f0a0a381c5d mailbox: mediatek: Add check for possible failure of kzalloc)
Merging spi/for-next (ade03ef70c31 Merge remote-tracking branches 'spi/topic/3wire-gpio' and 'spi/topic/mtd' into spi-next)
Merging tip/auto-latest (11b080f48a8a Merge branch 'x86/urgent')
Applying: fix for "locking/atomics: Check generated headers are up-to-date"
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 (861e6ed667c8 EDAC: Drop per-memory controller buses)
Merging irqchip/irq/irqchip-next (2130b789b3ef irqchip/gic: Unify GIC priority definitions)
Merging ftrace/for-next (a2acce536921 tracing: Have stack tracer trace full stack)
Merging rcu/rcu/next (e785d03d27b1 sched: Replace call_rcu_sched() with call_rcu())
Merging kvm/linux-next (22a7cdcae6a4 KVM/nVMX: Do not validate that posted_intr_desc_addr is page aligned)
Merging kvm-arm/next (e4e11cc0f81e KVM: arm64: Safety check PSTATE when entering guest and handle IL)
Merging kvm-mips/next (dc44abd6aad2 KVM: MIPS/Emulate: Properly implement TLBR for T&E)
Merging kvm-ppc/kvm-ppc-next (651022382c7f Linux 4.20-rc1)
Merging kvms390/next (ed3054a30258 Merge branch 'apv11' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into kernelorgnext)
Merging xen-tip/linux-next (3941552aec1e xen: remove size limit of privcmd-buf mapping interface)
Merging percpu/for-next (ad19ef010db1 Merge branch 'for-4.19-fixes' into for-next)
Merging workqueues/for-next (87915adc3f0a workqueue: re-add lockdep dependencies for flushing)
Merging drivers-x86/for-next (8122e7cd806d platform/x86: intel_pmc_core: Decode Snoop / Non Snoop LTR)
Merging chrome-platform/for-next (bc3f4b5c60db platform/chrome: chromeos_tbmc - Remove unneeded const)
Merging hsi/for-next (5b394b2ddf03 Linux 4.19-rc1)
Merging leds/for-next (eabf06ed6169 Fix pattern handling optimalization)
Merging ipmi/for-next (99d18a3da861 ipmi: clean an indentation issue, remove extraneous space)
Merging driver-core/driver-core-next (6be244dcd59b kobject: Fix warnings in lib/kobject_uevent.c)
Merging usb/usb-next (4c96499c39e3 USB: remove the unused struct hcd_timeout definition)
Merging usb-gadget/next (3b766f453557 USB: net2280: Remove ->disconnect() callback from net2280_pullup())
Merging usb-serial/usb-next (32d8a6fc5bd6 USB: serial: mos7840: remove set but not used variables 'st, data1, iflag')
Merging usb-chipidea-next/ci-for-usb-next (59739131e0ca usb: chipidea: Fix otg event handler)
Merging phy-next/next (db3f45b2726f phy: allwinner: add phy driver for USB3 PHY on Allwinner H6 SoC)
Merging tty/tty-next (c17a1ca14cbb Merge 4.20-rc2 into tty-next)
Merging char-misc/char-misc-next (651022382c7f Linux 4.20-rc1)
Merging extcon/extcon-next (a2dc50914744 extcon: max8997: Fix lack of path setting in USB device mode)
Merging soundwire/next (b1635596860d soundwire: intel: constify snd_soc_dai_ops structures)
Merging staging/staging-next (e0f7d41e1715 staging: wilc1000: rename tsf_hi element of network_info struct)
Merging mux/for-next (a1ad5ff63944 Merge branch 'i2c-mux/for-next' into for-next)
Merging icc/icc-next (23ba90b47dfc interconnect: fix build error without DEBUGFS)
Merging slave-dma/next (651022382c7f Linux 4.20-rc1)
Merging cgroup/for-next (c1bbd933e5fa cgroup: Add .__DEBUG__. prefix to debug file names)
Merging scsi/for-next (adc8d569040f Merge branch 'misc' into for-next)
Merging scsi-mkp/for-next (d90996dae8e4 scsi: ufs: Add UFS platform driver for Cadence UFS)
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 vhost/linux-next (79f800b2e769 MAINTAINERS: remove reference to bogus vsock file)
Merging rpmsg/for-next (9099a252d44c Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
Merging gpio/for-next (f06db74ce447 Merge branch 'devel' into for-next)
Merging pinctrl/for-next (b533adfdb2f6 Merge branch 'devel' into for-next)
Merging pinctrl-samsung/for-next (651022382c7f Linux 4.20-rc1)
Merging pwm/for-next (2153bbc12f77 pwm: lpss: Only set update bit if we are actually changing the settings)
Merging userns/for-next (1e9c75fb9c47 mnt: fix __detach_mounts infinite loop)
Merging ktest/for-next (6cd110a91f52 ktest: Take submenu into account for grub2 menus)
Merging random/dev (05cbbb6f9ed5 drivers/char/random.c: make primary_crng static)
Merging aio/master (2a8a98673c13 fs: aio: fix the increment of aio-nr and counting against aio-max-nr)
Merging kselftest/next (e55c884ea5c6 media: rc: self test for IR encoders and decoders)
Merging y2038/y2038 (67314ec7b025 RISC-V: Request newstat syscalls)
Merging livepatching/for-next (c72a7f515329 Merge branch 'for-4.18/upstream' into for-next)
Merging coresight/next (903242b80a97 coresight: etm3x: Release CLAIM tag when operated from perf)
Merging rtc/rtc-next (03f39f47dc86 rtc: class: remove devm_rtc_device_unregister)
Merging nvdimm/libnvdimm-for-next (594861215c83 acpi, nfit: Further restrict userspace ARS start requests)
Merging at24/at24/for-next (9a9e295e7c5c eeprom: at24: fix unexpected timeout under high load)
Merging ntb/ntb-next (651022382c7f Linux 4.20-rc1)
Merging kspp/for-next/kspp (ec9b3877c2fd Merge branch 'for-next/array_size' into for-next/kspp)
Merging init_task/init_task (e1e871aff3de Expand INIT_STRUCT_PID and remove)
Merging cisco/for-next (dfc79fe78b0b Merge branch 'for-x86' into for-next)
CONFLICT (content): Merge conflict in arch/x86/kernel/setup.c
Merging fsi/master (15e2a7218c27 fsi: sbefifo: Bump max command length)
Merging siox/siox/next (1e4b044d2251 Linux 4.18-rc4)
Merging slimbus/for-next (e178307d3459 slimbus: ngd: QCOM_QMI_HELPERS has to be selected)
Merging nvmem/for-next (5035d66cc629 nvmem: meson-efuse: add peripheral clock)
Merging xarray/xarray (8f3f4351bac3 XArray: Correct some 64-bit assumptions)
Merging akpm-current/current (3b2dca79c671 ipc: conserve sequence numbers in extended IPCMNI mode)
$ git checkout -b akpm remotes/origin/akpm/master
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 (e77b06c3ec7c drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow)
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2018-11-14 06:27    [W:0.079 / U:3.556 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site