linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* linux-next: Tree for Feb 7
@ 2012-02-07  6:09 Stephen Rothwell
  2012-02-07 18:09 ` linux-next: Tree for Feb 7 (sound/soc) Randy Dunlap
  0 siblings, 1 reply; 12+ messages in thread
From: Stephen Rothwell @ 2012-02-07  6:09 UTC (permalink / raw)
  To: linux-next; +Cc: LKML

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

Hi all,

Changes since 20120206:

The wireless-next tree lost its conflict.

The l2-mtd tree lost its build failure but gained another so I used the
version from next-20120203.

The sound-asoc tree lost its build failure.

The mmc tree lost its build failure.

The gpio tree still has its build failure for which I reverted a commit.

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

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

You can see which trees have been included by looking in the Next/Trees
file in the source.  There are also quilt-import.log and merge.log files
in the Next directory.  Between each merge, the tree was built with
a ppc64_defconfig for powerpc and an allmodconfig for x86_64. After the
final fixups (if any), it is also built with powerpc allnoconfig (32 and
64 bit), ppc44x_defconfig and allyesconfig (minus
CONFIG_PROFILE_ALL_BRANCHES - this fails its final link) and i386, sparc
and sparc64 defconfig. These builds also have
CONFIG_ENABLE_WARN_DEPRECATED, CONFIG_ENABLE_MUST_CHECK and
CONFIG_DEBUG_INFO disabled when necessary.

Below is a summary of the state of the merge.

We are up to 180 trees (counting Linus' and 26 trees of patches pending
for Linus' tree), more are welcome (even if they are currently empty).
Thanks to those who have contributed, and to those who haven't, please do.

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

Thanks to Randy Dunlap for doing many randconfig builds.

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 (23783f8 Merge tag 'pm-fixes-for-3.3-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm)
Merging fixes/master (f8275f9 Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux)
Merging kbuild-current/rc-fixes (620c231 kbuild: do not check for ancient modutils tools)
Merging arm-current/fixes (5a97d0a ARM: 7314/1: kuser: consistently use usr_ret for returning from helpers)
Merging m68k-current/for-linus (2a35350 m68k: Fix assembler constraint to prevent overeager gcc optimisation)
Merging powerpc-merge/merge (3493c85 powerpc: Fix build on some non-freescale platforms)
Merging 52xx-and-virtex-current/powerpc/merge (c49f878 dtc/powerpc: remove obsolete .gitignore entries)
Merging sparc/master (e51e07e sparc32: forced setting of mode of sun4m per-cpu timers)
Merging scsi-rc-fixes/master (6f6c2aa [SCSI] fcoe: fix fcoe in a DCB environment by adding DCB notifiers to set skb priority)
Merging net/master (7e2eb99 mlx4: fix DMA mapping leak when allocation fails)
Merging sound-current/for-linus (b5bcc18 ALSA: hda - Disable dynamic-power control for VIA as default)
Merging pci-current/for-linus (acb42a3 Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux)
Merging wireless/master (2e6b411 bcma: don't fail for bad SPROM CRC)
Merging driver-core.current/driver-core-linus (26417d4 docbook: fix fatal errors in device-drivers docbook and add DMA Management section)
Merging tty.current/tty-linus (e7c9bba tty: fix a build failure on sparc)
Merging usb.current/usb-linus (90451e6 USB: usbserial: add new PID number (0xa951) to the ftdi driver)
Merging staging.current/staging-linus (3b578da Merge branch 'work-linus' into staging-linus)
Merging char-misc.current/char-misc-linus (b5266ea mmc: cb710 core: Add missing spin_lock_init for irq_lock of struct cb710_chip)
Merging cpufreq-current/fixes (5983fe2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging input-current/for-linus (82b982c Input: i8042 - add Lenovo Ideapad U455 to 'reset' blacklist)
Merging md-current/for-linus (307729c md/raid1: perform bad-block tests for WriteMostly devices too.)
Merging audit-current/for-linus (c158a35 audit: no leading space in audit_log_d_path prefix)
Merging crypto-current/master (3a92d68 crypto: sha512 - Avoid stack bloat on i386)
Merging ide/master (0ab3d8b cy82c693: fix PCI device selection)
Merging dwmw2/master (244dc4e Merge git://git.infradead.org/users/dwmw2/random-2.6)
Merging devicetree-current/devicetree/merge (810ae3d ARM: devicetree: Add .dtb files to arch/arm/boot/.gitignore)
Merging spi-current/spi/merge (c88db23 spi-topcliff-pch: rename pch_spi_pcidev to pch_spi_pcidev_driver)
Merging gpio-current/gpio/merge (7e3a70f gpio: Add missing spin_lock_init in gpio-ml-ioh driver)
Merging arm/for-next (fb8e29e Merge branch 'fixes' into for-next)
CONFLICT (content): Merge conflict in arch/arm/mach-at91/at91sam9g45.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/at91cap9.c
Merging arm-soc/for-next (f8d0078 Merge branch 'fixes' into for-next)
Merging arm-perf/for-next/perf (cdd2a5b Merge branches 'perf/updates' and 'perf/fixes' into for-next/perf)
CONFLICT (content): Merge conflict in arch/arm/kernel/perf_event_v7.c
Merging davinci/davinci-next (fe0d422 Linux 3.0-rc6)
Merging samsung/next-samsung (9edb240 ARM: H1940/RX1950: Change default LED triggers)
Merging s5p/for-next (a291ade Merge branch 'next/devel-samsung' into for-next)
Merging tegra/for-next (944a28c Merge branch 'for-3.4' into for-next)
Merging xilinx/arm-next (b85a3ef ARM: Xilinx: Adding Xilinx board support)
Merging blackfin/for-linus (0476b92 Blackfin: wire up new process_vm syscalls)
Merging c6x/for-linux-next (dcd6c92 Linux 3.3-rc1)
Merging cris/for-next (ea78f5b CRIS: Update documentation)
Merging quilt/hexagon (110b372 Remove unneeded include of version.h from arch/hexagon/include/asm/spinlock_types.h)
CONFLICT (content): Merge conflict in arch/hexagon/Kconfig
Merging ia64/next (65cc21b ia64: Add accept4() syscall)
Merging m68k/for-next (2a35350 m68k: Fix assembler constraint to prevent overeager gcc optimisation)
Merging m68knommu/for-next (bea0cac m68knommu: clean up linker script)
Merging microblaze/next (6c073a7 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client)
Merging mips/mips-for-linux-next (8551715 Merge branches 'fixes-for-linus' and 'next/lantiq' into mips-for-linux-next)
Merging openrisc/for-upstream (b6fd41e Linux 3.1-rc6)
Merging parisc/for-next (fc99a91 futex: Use same lock set as lws calls)
Merging powerpc/next (ef88e39 powerpc: fix compile error with 85xx/p1010rdb.c)
Merging 4xx/next (ef88e39 powerpc: fix compile error with 85xx/p1010rdb.c)
Merging 52xx-and-virtex/powerpc/next (c1395f4 dtc/powerpc: remove obsolete .gitignore entries)
Merging galak/next (ef88e39 powerpc: fix compile error with 85xx/p1010rdb.c)
Merging s390/features (a6cbda8 [S390] cleanup smp code)
Merging sparc-next/master (e4e1118 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
Merging tile/master (0c90547 arch/tile: use new generic {enable,disable}_percpu_irq() routines)
Merging unicore32/unicore32 (0994695 Merge branch 'akpm' (aka "Andrew's patch-bomb, take two"))
Merging ceph/for-next (83eb26a ceph: ensure prealloc_blob is in place when removing xattr)
Merging cifs/master (de47a41 cifs: Fix oops in session setup code for null user mounts)
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 (74217cb eCryptfs: Write optimization for non-uptodate page)
Merging ext3/for_next (46fe44c quota: Pass information that quota is stored in system file to userspace)
Merging ext4/dev (ad63466 ext4: ignore EXT4_INODE_JOURNAL_DATA flag with delalloc)
Merging fuse/for-next (03c9693 cuse: implement memory mapping)
Merging gfs2/master (a1b46f1 GFS2: glock statistics gathering)
Merging logfs/master (d125666 Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm)
Merging nfs/linux-next (a4980e7 NFSv4: ACCESS validation doesn't require a full attribute refresh)
Applying: iscsi: in_aton needs linux/inet.h
Merging nfsd/nfsd-next (7a6ef8c nfsd4: nfsd4_create_clid_dir return value is unused)
Merging ocfs2/linux-next (9392557 ocfs2: avoid unaligned access to dqc_bitmap)
Merging omfs/for-next (976d167 Linux 3.1-rc9)
Merging squashfs/master (3d4a1c8 Squashfs: fix i_blocks calculation with extended regular files)
Merging v9fs/for-next (f766619 fs/9p: iattr_valid flags are kernel internal flags map them to 9p values.)
Merging ubifs/linux-next (d193609 UBIFS: make the dbg_lock spinlock static)
Merging xfs/for-next (4177af3 Define new macro XFS_ALL_QUOTA_ACTIVE and simply some usage)
Merging vfs/for-next (dcd6c92 Linux 3.3-rc1)
Merging pci/linux-next (fa423b0 PCI: check for pci bar restore completion and retry)
Merging hid/for-next (2a495e4 Merge branch 'upstream' into for-next)
Merging quilt/i2c (4dd5804 i2c-i801: Use usleep_range to wait for command completion)
Merging bjdooks-i2c/next-i2c (fc84fe1 Merge branch 'for_3.3/i2c/misc' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into for-33/i2c/omap)
CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-omap.c
Merging quilt/jdelvare-hwmon (48a9dee hwmon: (mc13xxx-adc) Add support for the MC13892 PMIC)
Merging hwmon-staging/hwmon-next (0ef464c hwmon: (hwmon-vid) Fix checkpatch issues)
Merging quilt/kernel-doc (7e7b32a Update quilt tree location for Documentation/ patches.)
Merging docs/docs-move (5c24d8b Merge branch 'docs/docbook/drm' of git://github.com/mfwitten/linux into docs-move)
Merging v4l-dvb/master (1854438 Merge /home/v4l/v4l/patchwork)
Merging kbuild/for-next (d90898e Merge branch 'kbuild/misc' into kbuild/for-next)
Merging kconfig/for-next (eae1c36 Merge branch 'kconfig/for-linus-2' into kconfig/for-next)
Merging libata/NEXT (b73fa46 [libata] ata_piix: Add Toshiba Satellite Pro A120 to the quirks list due to broken suspend functionality.)
Merging infiniband/for-next (715252d IB/srpt: Don't return freed pointer from srpt_alloc_ioctx_ring())
Merging acpi/next (eb7004e Merge branches 'atomicio-apei', 'hotplug', 'sony-nvs-nosave' and 'thermal-netlink' into release)
Merging ieee1394/for-next (6e01490 Merge branch 'fixes' into for-next)
Merging ubi/linux-next (48a6da5 UBI: fix error handling in ubi_scan())
Merging dlm/next (60f98d1 dlm: add recovery callbacks)
Merging scsi/master (76ffe8a [SCSI] libfc: remove redundant timer init for fcp)
Merging target-updates/for-next (895f302 target: Set additional sense length field in sense data)
Merging target-merge/for-next-merge (a42d985 ib_srpt: Initial SRP Target merge for v3.3-rc1)
Merging ibft/linux-next (935a9fe ibft: Fix finding IBFT ACPI table on UEFI)
Merging slave-dma/next (b63fd6c i.MX SDMA: Fix burstsize settings)
Merging dmaengine/next (d07a74a dmaengine: fix missing 'cnt' in ?: in dmatest)
Merging net-next/master (59d7402 Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next)
CONFLICT (content): Merge conflict in drivers/infiniband/hw/nes/nes_cm.c
Merging wireless-next/master (e1936e9 mac80211: call rate control only after init)
Merging bluetooth/master (c5993de Bluetooth: Correct packet len calculation)
Merging mtd/master (3c3e51d Merge ../linux-2.6 to bring in 3.3-rc fixes already merged)
Merging l2-mtd/master (1e43e2c mtd: remove junk pmc551.h)
CONFLICT (content): Merge conflict in include/linux/mtd/mtd.h
CONFLICT (content): Merge conflict in drivers/mtd/nand/gpmi-nand/gpmi-lib.c
CONFLICT (content): Merge conflict in drivers/mtd/chips/cfi_cmdset_0002.c
$ git reset --hard HEAD^
Merging refs/next/20120203/l2-mtd
CONFLICT (content): Merge conflict in include/linux/mtd/mtd.h
CONFLICT (content): Merge conflict in drivers/mtd/nand/gpmi-nand/gpmi-lib.c
CONFLICT (content): Merge conflict in drivers/mtd/chips/cfi_cmdset_0002.c
[master 33ce3a2] Merge commit 'refs/next/20120203/l2-mtd'
Merging crypto/master (0cfdec7 crypto: In crypto_add_alg(), 'exact' wants to be initialized to 0)
CONFLICT (content): Merge conflict in arch/arm/mach-tegra/fuse.c
Merging sound/for-next (306946a Merge branch 'topic/hda' into for-next)
Merging sound-asoc/for-next (f93a4cf Merge branch 'for-3.4' into asoc-next)
CONFLICT (content): Merge conflict in sound/soc/codecs/wm5100.c
Merging cpufreq/next (6c523c6 [CPUFREQ] EXYNOS: Removed useless headers and codes)
Merging quilt/rr (c8b9155 module: Remove module size limit)
Merging input/next (023cea0 Input: tegra-kbc - allow skipping setting up some of GPIO pins)
Merging input-mt/for-next (b89529a Input: Use accessor for MT values)
Merging block/for-next (b3021da Merge branch 'for-3.3/core' into for-next)
Merging quilt/device-mapper (62aa2b5 Linux 3.3-rc2)
Merging embedded/master (4744b43 embedded: fix vc_translate operator precedence)
Merging firmware/master (6e03a20 firmware: speed up request_firmware(), v3)
Merging battery/master (913272b Merge git://git.infradead.org/users/cbou/battery-urgent)
Merging mmc/mmc-next (f7c8cdb mmc: sdhci-tegra: Explicitly support Tegra30)
Merging kgdb/kgdb-next (880ba69 lib: rename pack_hex_byte() to hex_byte_pack())
Merging slab/for-next (66c4c35 slub: Do not hold slub_lock when calling sysfs_slab_add())
Merging uclinux/for-next (5e442a4 Revert "proc: fix races against execve() of /proc/PID/fd**")
Merging md/for-next (34f8ac6 Prevent DM RAID from loading bitmap twice.)
Merging mfd/for-next (fa884b5 mfd: twl-core: Don't specify regulator consumers by struct device)
Merging drm/drm-next (83b316f drm exynos: use drm_fb_helper_set_par directly)
Merging fbdev/fbdev-next (c6d242a video: convert drivers/video/* to use module_spi_driver())
Merging viafb/viafb-next (4ce36bb viafb: replace strict_strtoul to kstrto* and check return value)
Merging omap_dss2/for-next (9a90168 OMAPDSS: HDMI: Disable DDC internal pull up)
Merging regulator/for-next (071dd81 Merge branch 'regulator-drivers' into regulator-next)
Merging security/next (7b7e591 ima: fix invalid memory reference)
Merging selinux/master (dc2e1ff Merge commit 'v3.2' into 20120130)
Merging lblnet/master (7e27d6e Linux 2.6.35-rc3)
Merging watchdog/linux-next (1776b7d watchdog: fix error in probe() of s3c2410_wdt (reset at booting))
Merging dwmw2-iommu/master (c3b92c8 Linux 3.1)
Merging iommu/next (48d2116 Merge branches 'iommu/fixes' and 'arm/tegra' into next)
Merging osd/linux-next (0aa436b exofs: Cap on the memcpy() size)
Merging jc_docs/docs-next (5c050fb docs: update the development process document)
Merging trivial/for-next (481e628 drm: Fix typo in rv515.c)
Merging audit/for-next (dcd6c92 Linux 3.3-rc1)
Merging pm/linux-next (3f9e444 PM / Hibernate: Refactor and simplify freezer_test_done)
Merging apm/for-next (b4a133d Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm)
Merging fsnotify/for-next (ef9bf3b fanotify: only destroy a mark if both its mask and its ignored_mask are cleared)
Merging edac/linux_next (4d096ca MAINTAINERS: add an entry for Edac Sandy Bridge driver)
Merging edac-amd/for-next (ed8ccfa Merge branch '3.3-edac-scrubrate' into edac-for-next)
Merging devicetree/devicetree/next (5411972 arm/dts: OMAP3: Add omap3evm and am335xevm support)
Merging spi/spi/next (14af60b spi/pl022: Add high priority message pump support)
Merging gpio/gpio/next (4e46cde of_gpio: add support of of_gpio_named_count to be able to count named gpio)
CONFLICT (content): Merge conflict in include/linux/mfd/tps65910.h
Merging tip/auto-latest (7620333 Merge branch 'perf/urgent' into auto-latest)
Merging rcu/rcu/next (710fbb1 cpuidle: Inform RCU of read-side critical sections)
Merging cputime/cputime (c3e0ef9 [S390] fix cputime overflow in uptime_proc_show)
Merging uprobes/for-next (766ec38 perf: perf interface for uprobes)
Merging cgroup/for-next (761b3ef cgroup: remove cgroup_subsys argument from callbacks)
Merging kmemleak/kmemleak (b370d29 kmemleak: Disable early logging when kmemleak is off by default)
Merging kvm/linux-next (5753785 KVM: do not #GP on perf MSR writes when vPMU is disabled)
Merging oprofile/for-next (42fcb11 Merge branch 'oprofile/perf-ibs-v4' into oprofile/for-next)
CONFLICT (content): Merge conflict in tools/perf/util/header.h
CONFLICT (content): Merge conflict in tools/perf/util/header.c
Merging xen/upstream/xen (59e9a6b Merge branch 'upstream/ticketlock-cleanup' into upstream/xen)
CONFLICT (content): Merge conflict in arch/x86/include/asm/cmpxchg.h
Merging xen-two/linux-next (5496167 Merge branch 'stable/for-linus-fixes-3.3' into linux-next)
Merging xen-pvhvm/linux-next (b056b6a xen: suspend: remove xen_hvm_suspend)
Merging percpu/for-next (26dd8e0 percpu: use bitmap_clear)
Merging workqueues/for-next (6b3da11 Merge branch 'for-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu)
Merging hwpoison/hwpoison (46e387b Merge branch 'hwpoison-hugepages' into hwpoison)
Merging sysctl/master (4e75732 sysctl: Don't call sysctl_follow_link unless we are a link.)
Merging regmap/for-next (c81797e Merge branch 'regmap-core' into regmap-next)
CONFLICT (content): Merge conflict in drivers/base/regmap/regmap.c
Merging hsi/for-next (43139a6 HSI: hsi_char: Update ioctl-number.txt)
Merging driver-core/driver-core-next (b3012e1 cpufreq/gx: Fix the compile error)
CONFLICT (content): Merge conflict in drivers/base/cpu.c
Merging tty/tty-next (d3bda52 TTY: get rid of BTM around devpts_*)
Merging usb/usb-next (0cb54a3 USB: debugging code shouldn't alter control flow)
CONFLICT (content): Merge conflict in drivers/usb/class/cdc-wdm.c
Merging staging/staging-next (e96045a staging: nvec: Fix Kconfig dependencies)
Merging char-misc/char-misc-next (a3dc3c9 MISC: convert drivers/misc/* to use module_spi_driver())
Merging tmem/linux-next (b05b561 Merge branch 'devel/frontswap.v13' into linux-next)
Merging writeback/writeback-for-next (977b7e3 writeback: fix dereferencing NULL bdi->dev on trace_writeback_queue)
Merging arm-dt/devicetree/arm-next (ede338f dt: add documentation of ARM dt boot interface)
Merging hwspinlock/linux-next (8b37fcf hwspinlock: add MAINTAINERS entries)
Merging pinctrl/for-next (f4e6698 pinctrl: enable pinmux for mmp series)
Merging moduleh/for-sfr (6aec187 drivers/media: video/a5k6aa is a module and so needs module.h)
Merging vhost/linux-next (1e05b62 sh: use the the PCI channels's io_map_base)
Merging kmap_atomic/kmap_atomic (2c2c817 feature-removal-schedule.txt: add the deprecated form of kmap_atomic())
CONFLICT (content): Merge conflict in fs/ecryptfs/read_write.c
CONFLICT (modify/delete): drivers/staging/gma500/mmu.c deleted in HEAD and modified in kmap_atomic/kmap_atomic. Version kmap_atomic/kmap_atomic of drivers/staging/gma500/mmu.c left in tree.
CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt
$ git rm -f drivers/staging/gma500/mmu.c
Merging modem-shm/for-next (3cff1cc caif_shm: Add CAIF driver for Shared memory for M7400)
Merging memblock/memblock-kill-early_node_map (7bd0b0f memblock: Reimplement memblock allocation using reverse free area iterator)
Merging remoteproc/for-next (238c1e1 rpmsg: depends on EXPERIMENTAL)
Applying: rpmsg: rename virtqueue_add_buf_gfp to virtqueue_add_buf
Applying: remoteproc: don't use virtio's weak barriers
Merging irqdomain/irqdomain/next (98ecf52 irq_domain/microblaze: Convert microblaze to use irq_domains)
Merging kvmtool/master (3e6efe0 kvm-tool: Don't try to cleanup ioeventfd if we never initialised it)
Merging ktest/for-next (be405f9 ktest: Add INGORE_ERRORS to ignore warnings in boot up)
Merging scsi-post-merge/merge-base:master ()
$ git checkout akpm
Applying: net/netfilter/nf_conntrack_netlink.c: fix Oops on container destroy
Applying: pcmcia: fix socket refcount decrementing on each resume
Applying: vfs: fix panic in __d_lookup() with high dentry hashtable counts
Applying: acerhdf: add support for Aspire 1410 BIOS v1.3314
Applying: acerhdf: add support for new hardware
Applying: acerhdf: lowered default temp fanon/fanoff values
Applying: arch/x86/platform/iris/iris.c: register a platform device and a platform driver
Applying: x86, olpc-xo15-sci: enable lid close wakeup control through sysfs
Applying: geos: platform driver for Geos and Geos2 single-board computers
Applying: platform-drivers-x86: convert drivers/platform/x86/* to use module_platform_driver()
Applying: x86, olpc: add debugfs interface for EC commands
Applying: x86, mm: fix the size calculation of mapping tables
Applying: alix2: supplement driver to include GPIO button support
Applying: alix2-supplement-driver-to-include-gpio-button-support-fix
Applying: x86: net5501: platform driver for Soekris Engineering net5501 single-board computer
Applying: net5501-platform-driver-for-soekris-engineering-net5501-single-board-computer-fix
Applying: drivers/platform/x86/sony-laptop.c: fix scancodes
Applying: arch/arm/mach-ux500/mbox-db5500.c: world-writable sysfs fifo file
Applying: arm, exec: remove redundant set_fs(USER_DS)
Applying: fs/btrfs/inode-map.c: fix warnings
Applying: net: use this_cpu_xxx replace percpu_xxx funcs
Applying: x86: use this_cpu_xxx to replace percpu_xxx funcs
Applying: arch/x86/kernel/nmi_selftest.c needs percpu.h
Applying: x86-use-this_cpu_xxx-to-replace-percpu_xxx-funcs-fix-2
Applying: x86: change percpu_read_stable() to this_cpu_read_stable()
Applying: percpu: remove percpu_xxx() functions
Applying: Subject irqs: fix long-term regression in genirq irq_set_irq_type() handling
Applying: irqs: fix handling of pending IRQs at request time
Applying: hrtimers: Special-case zero length sleeps
Applying: hpet: factor timer allocate from open
Applying: drivers/thermal/thermal_sys.c: fix build warning
Applying: thermal-thermal_sys-fix-build-warning-fix
Applying: thermal_sys: remove unnecessary line continuations
Applying: thermal_sys: remove obfuscating used-once macros
Applying: thermal_sys: kernel style cleanups
Applying: thermal_sys: convert printks to pr_<level>
Applying: bluetooth: add support for BCM20702A0 [0a5c:21e6]
Applying: debugobjects: Fix selftest for static warnings
Applying: ocfs2: use find_last_bit()
Applying: ocfs2: use bitmap_weight()
Applying: drivers/scsi/aacraid/commctrl.c: fix mem leak in aac_send_raw_srb()
Applying: drivers/scsi/mpt2sas/mpt2sas_base.c: fix mismatch in mpt2sas_base_hard_reset_handler() mutex lock-unlock
Applying: drivers/scsi/mpt2sas/mpt2sas_scsih.c: spell "primitive" correctly
Applying: drivers/scsi/hpsa.c: use find_first_zero_bit()
Applying: bio: don't overflow in bio_get_nr_vecs()
Applying: loop: zero fill bio instead of return -EIO for partial read
Applying: MAINTAINERS: Staging: cx25821: Add L: linux-media
Applying: mm, oom: avoid looping when chosen thread detaches its mm
Applying: mm, oom: fold oom_kill_task() into oom_kill_process()
Applying: mm, oom: do not emit oom killer warning if chosen thread is already exiting
Applying: mm: add rss counters consistency check
Applying: mm/vmscan.c: cleanup with s/reclaim_mode/isolate_mode/
Applying: mm: make get_mm_counter static-inline
Applying: mm: vmscan: fix misused nr_reclaimed in shrink_mem_cgroup_zone()
Applying: mm: make swapin readahead skip over holes
Applying: make-swapin-readahead-skip-over-holes-fix
Applying: vmscan: reclaim at order 0 when compaction is enabled
Applying: vmscan: kswapd carefully call compaction
Applying: vmscan-kswapd-carefully-call-compaction-fix
Applying: vmscan: only defer compaction for failed order and higher
Applying: mm: fix page-faults detection in swap-token logic
Applying: mm: add extra free kbytes tunable
Applying: mm-add-extra-free-kbytes-tunable-update
Applying: mm-add-extra-free-kbytes-tunable-update-checkpatch-fixes
Applying: memcg: replace MEM_CONT by MEM_RES_CTLR
Applying: memcg: replace mem and mem_cont stragglers
Applying: memcg: lru_size instead of MEM_CGROUP_ZSTAT
Applying: memcg: enum lru_list lru
Applying: memcg: remove redundant returns
Applying: memcg: remove unnecessary thp check in page stat accounting
Applying: idr: make idr_get_next() good for rcu_read_lock()
Applying: cgroup: revert ss_id_lock to spinlock
Applying: memcg: let css_get_next() rely upon rcu_read_lock()
Applying: memcg: remove PCG_CACHE page_cgroup flag
Applying: memcg-remove-pcg_cache-page_cgroup-flag-checkpatch-fixes
Applying: magic.h: move some FS magic numbers into magic.h
Applying: ceph, cifs, nfs, fuse: boolean and / or confusion
Applying: prctl: add PR_{SET,GET}_CHILD_SUBREAPER to allow simple process supervision
Applying: prctl-add-pr_setget_child_subreaper-to-allow-simple-process-supervision-fix
Applying: prctl-add-pr_setget_child_subreaper-to-allow-simple-process-supervision-fix-fix
Applying: prctl-add-pr_setget_child_subreaper-to-allow-simple-process-supervision-fix-fix-fix
Applying: kernel/exit.c: if init dies, log a signal which killed it, if any
Applying: kernel-exitc-if-init-dies-log-a-signal-which-killed-it-if-any-fix
Applying: vfs: increment iversion when a file is truncated
Applying: brlocks/lglocks: cleanups
Applying: brlocks-lglocks-cleanups-checkpatch-fixes
Applying: vfs: correctly set the dir i_mutex lockdep class
Applying: seq_file: fix mishandling of consecutive pread() invocations.
Applying: MAINTAINERS: fix REMOTEPROC F: typo
Applying: backlight: convert backlight i2c drivers to module_i2c_driver
Applying: backlight: convert backlight spi drivers to module_spi_driver
Applying: drivers/video/backlight/wm831x_bl.c: use devm_ functions
Applying: drivers/video/backlight: use devm_ functions
Applying: drivers/video/backlight/adp5520_bl.c: use devm_ functions
Applying: backlight: new backlight driver for LP855x devices
Applying: video: support MIPI-DSI controller driver
Applying: video: backlight: support s6e8ax0 panel driver based on MIPI DSI
Applying: video-backlight-support-s6e8ax0-panel-driver-based-on-mipi-dsi-fix
Applying: WARNING: please write a paragraph that describes the config symbol fully
Applying: bitops: rename for_each_set_bit_cont() in favor of analogous list.h function
Applying: bitops: remove for_each_set_bit_cont()
Applying: bitops: introduce for_each_clear_bit()
Applying: mtd: use for_each_clear_bit()
Applying: s390/char: use for_each_clear_bit()
Applying: uwb: use for_each_clear_bit()
Applying: x86: use for_each_clear_bit_from()
Applying: drivers/leds/leds-lp5521.c: fix typo
Applying: drivers/leds/leds-tca6507.c: cleanup error handling in tca6507_probe()
Applying: drivers/leds/leds-lp5521.c: add 'name' in the lp5521_led_config
Applying: drivers/leds/leds-lp5521.c: add 'update_config' in the lp5521_platform_data
Applying: drivers/leds/leds-lp5521.c: support led pattern data
Applying: leds-lp5521-support-led-pattern-data-checkpatch-fixes
Applying: drivers/leds/leds-lp5521.c: redefinition of register bits
Applying: drivers/leds/leds-lp5523.c: constify some data
Applying: include/ and checkpatch: prefer __scanf to __attribute__((format(scanf,...)
Applying: crc32: remove two instances of trailing whitespaces
Applying: crc32: move long comment about crc32 fundamentals to Documentation/
Applying: crc32-move-long-comment-about-crc32-fundamentals-to-documentation-fix
Applying: crc32: simplify unit test code
Applying: crc32: miscellaneous cleanups
Applying: crc32: fix mixing of endian-specific types
Applying: crc32: make CRC_*_BITS definition correspond to actual bit counts
Applying: crc32: add slice-by-8 algorithm to existing code
Applying: crc32: optimize loop counter for x86
Applying: crc32: add note about this patchset to crc32.c
Applying: crc32: bolt on crc32c
Applying: crc32: Don't reference unnecessary crc32 tables in single-bit mode
Applying: crypto: crc32c should use library implementation
Applying: crc32: add self-test code for crc32c
Applying: crc32: select an algorithm via Kconfig
Applying: epoll: comment the funky #ifdef
Applying: init/do_mounts.c: create /root if it does not exist
Applying: rtc-spear: fix for balancing the enable_irq_wake in Power Mgmt
Applying: rtc/spear: fix for RTC_AIE_ON and RTC_AIE_OFF ioctl errors
Applying: rtc/rtc-spear: call platform_set_drvdata() before registering rtc device
Applying: rtc: convert rtc spi drivers to module_spi_driver
Applying: rtc: convert rtc i2c drivers to module_i2c_driver
Applying: MIPS: add RTC support for loongson1B
Applying: drivers/rtc/rtc-twl.c: optimize IRQ bit access
Applying: drivers/rtc/rtc-twl.c: enable RTC irrespective of its prior state
Applying: drivers/rtc/rtc-twl.c: simplify RTC interrupt clearing
Applying: drivers/rtc/rtc-twl.c: return correct RTC event from ISR
Applying: kmod: avoid deadlock from recursive kmod call
Applying: kmod-avoid-deadlock-by-recursive-kmod-call-fix
Applying: fs/proc/kcore.c: make get_sparsemem_vmemmap_info() static
Applying: proc: speedup /proc/stat handling
Applying: procfs: add num_to_str() to speed up /proc/stat
Applying: procfs-add-num_to_str-to-speed-up-proc-stat-fix
Applying: procfs: speed up /proc/pid/stat, statm
Applying: procfs-speed-up-proc-pid-stat-statm-checkpatch-fixes
Applying: proc: clean up /proc/<pid>/environ handling
Applying: smp: introduce a generic on_each_cpu_mask() function
Applying: arm: move arm over to generic on_each_cpu_mask
Applying: tile: move tile to use generic on_each_cpu_mask
Applying: smp: add func to IPI cpus based on parameter func
Applying: smp-add-func-to-ipi-cpus-based-on-parameter-func-fix
Applying: slub: only IPI CPUs that have per cpu obj to flush
Applying: fs: only send IPI to invalidate LRU BH when needed
Applying: mm: only IPI CPUs to drain local pages if they exist
Applying: ipc/sem.c: alternatives to preempt_disable()
Applying: ipc: provide generic compat versions of IPC syscalls
Applying: sysctl: use bitmap library functions
Applying: sysctl: make kernel.ns_last_pid control dependent on CHECKPOINT_RESTORE
Applying: ramoops: use pstore interface
Applying: notify_change(): check that i_mutex is held
Merging akpm (c034ffe notify_change(): check that i_mutex is held)
[master beb25da] Revert "gpio: Add a driver for Sodaville GPIO controller"

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

^ permalink raw reply	[flat|nested] 12+ messages in thread
* linux-next: Tree for Feb 7
@ 2013-02-07  6:37 Stephen Rothwell
  0 siblings, 0 replies; 12+ messages in thread
From: Stephen Rothwell @ 2013-02-07  6:37 UTC (permalink / raw)
  To: linux-next; +Cc: linux-kernel

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

Hi all,

Changes since 20130206:

Removed tree: kvmtool (still present via the tip tree)

The block tree lost its build failure.

The tip tree gained a conflict against the s390 tree.

The kvm tree gained a conflict against Linus' tree.

The tty tree lost its build failure.

The arm-soc tree gained conflicts against the iommu tree.

The signal tree gained a conflict against the s390 tree.

The akpm tree gained a conflict against the kvm tree and lost its build
failure.

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

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 215 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.  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 (6bacaa9 Merge tag 'sound-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound)
Merging fixes/master (d287b87 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
Merging kbuild-current/rc-fixes (02f3e53 Merge branch 'yem-kconfig-rc-fixes' of git://gitorious.org/linux-kconfig/linux-kconfig into kbuild/rc-fixes)
Merging arm-current/fixes (58b9f3b ARM: DMA mapping: fix bad atomic test)
Merging m68k-current/for-linus (91a420e xtensa: Provide dummy dma_mmap_coherent() and dma_get_sgtable())
Merging powerpc-merge/merge (eda8eeb powerpc/mm: Fix hash computation function)
Merging sparc/master (04cef49 sparc: kernel/sbus.c: fix memory leakage)
Merging net/master (e21b9d0 net: qmi_wwan: add more Huawei devices, including E320)
Merging ipsec/master (6642f91 dm9601: support dm9620 variant)
Merging sound-current/for-linus (602b3e0 Merge tag 'asoc-v3.8-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus)
Merging pci-current/for-linus (444ee9b PCI: remove depends on CONFIG_EXPERIMENTAL)
Merging wireless/master (7b2385b brcmsmac: rework of mac80211 .flush() callback operation)
Merging driver-core.current/driver-core-linus (949db15 Linux 3.8-rc5)
Merging tty.current/tty-linus (949db15 Linux 3.8-rc5)
Merging usb.current/usb-linus (1589a3e Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media)
Merging staging.current/staging-linus (949db15 Linux 3.8-rc5)
Merging char-misc.current/char-misc-linus (949db15 Linux 3.8-rc5)
Merging input-current/for-linus (9937c02 Input: wacom - fix wacom_set_report retry logic)
Merging md-current/for-linus (0ecfa11 md: protect against crash upon fsync on ro array)
Merging audit-current/for-linus (c158a35 audit: no leading space in audit_log_d_path prefix)
Merging crypto-current/master (a2c0911 crypto: caam - Updated SEC-4.0 device tree binding for ERA information.)
Merging ide/master (9974e43 ide: fix generic_ide_suspend/resume Oops)
Merging dwmw2/master (084a0ec x86: add CONFIG_X86_MOVBE option)
CONFLICT (content): Merge conflict in arch/x86/Kconfig
Merging sh-current/sh-fixes-for-linus (4403310 SH: Convert out[bwl] macros to inline functions)
Merging irqdomain-current/irqdomain/merge (a0d271c Linux 3.6)
Merging devicetree-current/devicetree/merge (ab28698 of: define struct device in of_platform.h if !OF_DEVICE and !OF_ADDRESS)
Merging spi-current/spi/merge (d3601e5 spi/sh-hspi: fix return value check in hspi_probe().)
Merging gpio-current/gpio/merge (bc1008c gpio/mvebu-gpio: Make mvebu-gpio depend on OF_CONFIG)
Merging rr-fixes/fixes (b26ada9 virtio_console: Don't access uninitialized data.)
Merging asm-generic/master (fb9de7e xtensa: Use generic asm/mmu.h for nommu)
Merging arc/arc-next (ea89eab ARC: 64bit RTSC timestamp hardware issue)
Merging arm/for-next (0dbc233 Merge branches 'devel-stable', 'fixes', 'misc' and 'mmci' into for-next)
Merging arm-perf/for-next/perf (5ef1240 Merge branches 'for-rmk/hw-breakpoint' and 'for-rmk/perf' into for-next/perf)
Merging davinci/davinci-next (fe0d422 Linux 3.0-rc6)
Merging xilinx/arm-next (42ead3a arm: zynq: timer: Set clock_event cpumask)
Merging arm64/upstream (b6f3598 arm64: Select ARCH_WANT_FRAME_POINTERS)
Merging blackfin/for-linus (86794b4 blackfin: SEC: clean up SEC interrupt initialization)
Merging c6x/for-linux-next (93bbd0c c6x: use generic kvm_para.h)
Merging cris/for-next (77c8006 UAPI: Fix up empty files in arch/cris/)
Merging hexagon/linux-next (e1858b2 Hexagon: Copyright marking changes)
Merging ia64/next (79b678e Merge branch 'pstore' into next)
CONFLICT (content): Merge conflict in init/Kconfig
Merging m68k/for-next (6f4855c swim: Add missing spinlock init)
Merging m68knommu/for-next (531012f m68k: fix conditional use of init_pointer_table)
Merging metag/for-next (ab097d4 metag: min_low_pfn is now exported by generic code)
CONFLICT (content): Merge conflict in tools/perf/perf.h
Merging microblaze/next (f54a407 microblaze: Do not use module.h in files which are not modules)
Merging mips/mips-for-linux-next (38ab365 MIPS: Cleanup break and trap codes.)
Applying: min_low_pfn is now exported by generic code
Merging openrisc/for-upstream (634bd40 openrisc: use kbuild.h instead of defining macros in asm-offset.c)
Merging parisc/for-next (6c700d7 [PARISC] hpux: Remove obsolete regs parameter from do_execve() in hpux_execve())
Merging powerpc/next (71cf1de pseries/iommu: Ensure TCEs are cleared with non-huge DDW)
Merging 4xx/next (2074b1d powerpc: Fix irq distribution)
Merging mpc5xxx/next (6e77d85 powerpc/mpc5xxx: fix sparse warning for non static symbol)
Merging galak/next (1723d90 powerpc/dma/raidengine: add raidengine device)
Merging s390/features (b4b9aba iucv: fix kernel panic at reboot)
Merging sh/sh-latest (035688d sh: ecovec: add sample amixer settings)
Merging sparc-next/master (c4271c6 NFS: Kill fscache warnings when mounting without -ofsc)
Merging tile/master (ecc46c5 tile: support atomic64_dec_if_positive())
Merging unicore32/unicore32 (c284464 arch/unicore32: remove CONFIG_EXPERIMENTAL)
Merging xtensa/for_next (0ed93fe xtensa: avoid mmap cache aliasing)
Merging btrfs/next (fb8ec37 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into linus-merge)
Merging ceph/master (0fa6ebc libceph: fix protocol feature mismatch failure path)
Merging cifs/for-next (0661732 cifs: ensure that cifs_get_root() only traverses directories)
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 (a07c48a eCryptfs: remove unneeded checks in virt_to_scatterlist())
Merging ext3/for_next (288be96 udf: Remove unused s_extLength from udf_bitmap)
Merging ext4/dev (a7bcf8d ext4: reclaim extents from extent status tree)
Merging f2fs/dev (1efc6d3 f2fs: add compat_ioctl to provide backward compatability)
Merging fuse/for-next (23c153e fuse: bump version for READDIRPLUS)
Merging gfs2/master (d2b47cf GFS2: Get a block reservation before resizing a file)
Merging jfs/jfs-next (9d48017 jfs: avoid undefined behavior from left-shifting by 32 bits)
Merging logfs/master (3394661 Fix the call to BUG() caused by no free segment found)
Merging nfs/linux-next (c5f5e9c SUNRPC: Add missing static declaration to _gss_mech_get_by_name)
Merging nfsd/nfsd-next (2d32b29 nfsd: Fix memleak)
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 (3d59eeb Merge tag 'balancenuma-v11' of git://git.kernel.org/pub/scm/linux/kernel/git/mel/linux-balancenuma)
Merging ubifs/linux-next (a28ad42 UBIFS: fix mounting problems after power cuts)
Merging xfs/for-next (a21cd50 xfs: refactor space log reservation for XFS_TRANS_ATTR_SET)
CONFLICT (content): Merge conflict in fs/xfs/xfs_buf_item.c
Merging vfs/for-next (3a142ed Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal)
Merging pci/next (f2dfcde Merge branch 'pci/misc' into next)
CONFLICT (content): Merge conflict in arch/ia64/pci/pci.c
Merging hid/for-next (9a5180e Merge branch 'for-3.9/multitouch' into for-next)
Merging i2c-embedded/i2c-embedded/for-next (faf93ff i2c: s3c2410: Add quirk to exclude GPIO config for exynos5440)
Merging jdelvare-hwmon/master (54e37b8 Merge tag 'vfio-for-v3.8-v2' of git://github.com/awilliam/linux-vfio)
Merging hwmon-staging/hwmon-next (2563506 hwmon: (ltc2978) Add support for LTC2974 and LTC3883)
Merging v4l-dvb/master (503f48b Merge /home/v4l/v4l/patchwork)
Merging kbuild/for-next (c129f9f Merge branches 'kbuild/misc' and 'kbuild/kconfig' into kbuild/for-next)
Merging kconfig/for-next (4eae518 localmodconfig: Fix localyesconfig to set to 'y' not 'm')
Merging libata/NEXT (44ec657 [SCSI] remove can_power_off flag from scsi_device)
Merging infiniband/for-next (cbdba97 Merge branches 'ipoib', 'mlx4' and 'qib' into for-next)
Merging pstore/master (ebacfd1 pstore/ftrace: Adjust for ftrace_ops->func prototype change)
Merging pm/linux-next (4a6e57c Merge branch 'pm-cpufreq-next' into linux-next)
CONFLICT (content): Merge conflict in drivers/acpi/internal.h
Merging acpi/next (5233234 Merge branch 'arm-idle' into release)
Merging apm/for-next (fb9d78a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm)
Merging cpuidle/cpuidle-next (d1c3ed6 Linux 3.8-rc2)
Merging cpupowerutils/master (f166033 cpupower tools: add install target to the debug tools' makefiles)
Merging thermal/next (176fa58 thermal: rcar: add Device Tree support)
CONFLICT (content): Merge conflict in drivers/thermal/exynos_thermal.c
Merging ieee1394/for-next (db2cad2 firewire: net: remove unused variable in fwnet_receive_broadcast())
Merging ubi/linux-next (eab7377 UBI: embed ubi_debug_info field in ubi_device struct)
Merging dlm/next (f117228 dlm: avoid scanning unchanged toss lists)
Merging swiotlb/linux-next (af51a9f swiotlb: Do not export swiotlb_bounce since there are no external consumers)
Merging scsi/for-next (52cb5cb [SCSI] fnic: Fnic Trace Utility)
Merging target-updates/for-next (4e58f5e target: Add device attribute to expose config_item_name for INQUIRY model)
Merging target-merge/for-next-merge (d1c3ed6 Linux 3.8-rc2)
Merging ibft/linux-next (935a9fe ibft: Fix finding IBFT ACPI table on UEFI)
Merging isci/all (6734092 isci: add a couple __iomem annotations)
Merging slave-dma/next (4702d52 dw_dmac: return proper residue value)
CONFLICT (content): Merge conflict in drivers/dma/tegra20-apb-dma.c
CONFLICT (content): Merge conflict in drivers/dma/ioat/dma_v3.c
Merging dmaengine/next (7f34986 dma: ipu: Drop unused spinlock)
CONFLICT (content): Merge conflict in drivers/dma/ioat/dma_v3.c
Merging net-next/master (c6edfe1 bgmac: add ndo_set_rx_mode netdev ops)
CONFLICT (content): Merge conflict in arch/mips/include/uapi/asm/socket.h
Merging ipsec-next/master (fa8599d xfrm: fix a unbalanced lock)
Merging wireless-next/master (b26f5f0 rtlwifi: rtl8723ae: Fix W=1 compile warnings)
Merging bluetooth/master (a3d0935 Bluetooth: Refactor mgmt_pending_foreach)
Merging mtd/master (0ce82b7 mtd: nand: onfi don't WARN if we are in 16 bits mode)
Merging l2-mtd/master (f1a7c9d mtd: bcm47xxsflash: adjust names of bus-specific functions)
Merging crypto/master (7eb9c5d crypto: caam - Added property fsl,sec-era in SEC4.0 device tree binding.)
CONFLICT (content): Merge conflict in crypto/ctr.c
Merging drm/drm-next (67c9640 drm/i915: fixup per-crtc locking in intel_release_load_detect_pipe)
Merging sound/for-next (f9afed1 ALSA: hda - Apply mic-mute LED fixup for new HP laptops)
Merging sound-asoc/for-next (81afb9e Merge remote-tracking branch 'asoc/topic/wm2200' into asoc-next)
Merging modules/modules-next (d9d8d7e MODSIGN: Add option to not sign modules during modules_install)
Merging pekey/devel-pekey (736c71b PEFILE: Load the contained key if we consider the container to be validly signed)
Merging virtio/virtio-next (0d34cc2 virtio-mmio: fix wrong comment about register offset)
Merging input/next (21fb9f0 Input: twl6040-vibra - use system workqueue)
Merging input-mt/for-next (6f0c058 Linux 3.7-rc2)
Merging cgroup/for-next (6503605 Merge branch 'for-3.8-fixes' into for-next)
Merging block/for-next (997af0a Merge branch 'for-3.9/drivers' into for-next)
Merging device-mapper/master (fc2164a Add a persistent bitset as a wrapper around dm-array.)
CONFLICT (content): Merge conflict in drivers/md/dm.c
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 (2a8e46f mmc: core: expose RPMB partition only for CMD23 capable hosts)
Merging kgdb/kgdb-next (58bcdf6 tty/console: fix warnings in drivers/tty/serial/kgdboc.c)
Merging slab/for-next (b1e0541 mm/sl[au]b: correct allocation type check in kmalloc_slab())
Merging uclinux/for-next (b69f085 Linux 3.7-rc8)
Merging md/for-next (1060071 raid5: create multiple threads to handle stripes)
Merging mfd/for-next (ee7e332 Merge branch 'for-mfd' of git://git.linaro.org/people/ljones/linux-3.0-ux500 into for-next)
CONFLICT (content): Merge conflict in drivers/md/dm.c
Merging battery/master (5dc3443 bq27x00_battery: Fix reporting battery temperature)
CONFLICT (content): Merge conflict in include/linux/mfd/abx500/ab8500.h
CONFLICT (content): Merge conflict in include/linux/mfd/abx500/ab8500-bm.h
CONFLICT (content): Merge conflict in drivers/power/ab8500_bmdata.c
Merging fbdev/fbdev-next (a49f0d1 Linux 3.8-rc1)
Merging viafb/viafb-next (838ac78 viafb: avoid refresh and mode lookup in set_par)
Merging omap_dss2/for-next (e7f5c9a Merge tag 'omapdss-for-3.8' of git://gitorious.org/linux-omap-dss2/linux into for-linus)
Merging regulator/for-next (97d12c5 Merge remote-tracking branch 'regulator/topic/ab8500' into regulator-next)
Merging security/next (6e38bfa tpm_tis: check pnp_acpi_device return code)
CONFLICT (content): Merge conflict in security/integrity/ima/ima_main.c
CONFLICT (content): Merge conflict in lib/digsig.c
Merging selinux/master (c2d7b24 Merge tag 'v3.4' into 20120409)
Merging lblnet/master (7e27d6e Linux 2.6.35-rc3)
Merging watchdog/master (e301baa watchdog: orion_wdt: Add platform alias)
Merging dwmw2-iommu/master (6491d4d intel-iommu: Free old page tables before creating superpage)
Merging iommu/next (23c3c63 Merge branches 'core', 'arm/omap', 'iommu/fixes', 'arm/tegra' and 'arm/shmobile' into next)
Merging vfio/next (e2279eb vfio-pci: Enable PCIe extended capabilities on v1)
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 (9baf64f ARM: at91/ide: remove unsused at91-ide Kconfig entry)
CONFLICT (content): Merge conflict in arch/mips/include/asm/octeon/cvmx-helper-util.h
CONFLICT (content): Merge conflict in arch/mips/cavium-octeon/executive/cvmx-helper-util.c
Merging audit/for-next (dcd6c92 Linux 3.3-rc1)
Merging fsnotify/for-next (1ca39ab inotify: automatically restart syscalls)
Merging edac/linux_next (1c06910 i7core_edac: fix kernel crash on unloading i7core_edac.)
Merging edac-amd/for-next (0f08669 EDAC, MCE, AMD: Remove unneeded exports)
Merging devicetree/devicetree/next (aac73f3 of: use platform_device_add)
Merging dt-rh/for-next (eb7ccb8 DT: add vendor prefixes for Renesas and Toshiba)
Merging spi/spi/next (7410e84 spi/ath79: add shutdown handler)
CONFLICT (content): Merge conflict in drivers/spi/spi-s3c64xx.c
Merging spi-mb/spi-next (d560040 spi: spi-gpio: fix compilation warning on 64 bits systems)
Merging tip/auto-latest (0d37b77 Merge branch 'perf/core')
CONFLICT (content): Merge conflict in arch/s390/Kconfig
CONFLICT (content): Merge conflict in arch/powerpc/configs/pasemi_defconfig
Merging ftrace/for-next (d840f71 tracing: Init current_trace to nop_trace and remove NULL checks)
Merging rcu/rcu/next (e4aa0da rcu: Allow rcutorture to be built at low optimization levels)
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 (b0da5be KVM: VMX: add missing exit names to VMX_EXIT_REASONS array)
CONFLICT (content): Merge conflict in include/uapi/linux/kvm.h
CONFLICT (content): Merge conflict in arch/x86/include/asm/vmx.h
CONFLICT (content): Merge conflict in arch/s390/kernel/irq.c
CONFLICT (content): Merge conflict in arch/s390/include/asm/irq.h
Applying: KVM: s390: fix for IOINT_VIR name change
Applying: x86, apicv: merge fixup for uapi include file split
Merging kvm-ppc/kvm-ppc-next (b9e3e20 KVM: PPC: E500: Remove kvmppc_e500_tlbil_all usage from guest TLB code)
Merging oprofile/for-next (4400910 oprofile, x86: Fix wrapping bug in op_x86_get_ctrl())
Merging fw-nohz/nohz/next (74876a9 printk: Wake up klogd using irq_work)
Merging xen/upstream/xen (af3a3ab Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes)
Merging xen-two/linux-next (3f49cb3 Merge branch 'stable/pvh.v7' into linux-next)
Applying: xen: fix bad merge of arch/x86/xen/mmu.c
Merging xen-pvhvm/linux-next (b056b6a xen: suspend: remove xen_hvm_suspend)
Merging percpu/for-next (5479c78 mm, percpu: Make sure percpu_alloc early parameter has an argument)
Merging workqueues/for-next (26c3d00 Merge branch 'for-3.9-cleanups' into for-next)
Merging drivers-x86/linux-next (6710c61 asus-laptop: Fix potential invalid pointer dereference)
CONFLICT (content): Merge conflict in drivers/platform/x86/toshiba_acpi.c
CONFLICT (content): Merge conflict in drivers/platform/x86/intel_oaktrail.c
CONFLICT (content): Merge conflict in drivers/platform/x86/ideapad-laptop.c
CONFLICT (content): Merge conflict in drivers/platform/x86/fujitsu-tablet.c
CONFLICT (content): Merge conflict in drivers/platform/x86/compal-laptop.c
CONFLICT (content): Merge conflict in drivers/platform/x86/apple-gmux.c
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 (00882b9 Merge remote-tracking branch 'regmap/topic/async' into regmap-next)
Merging hsi/for-next (43139a6 HSI: hsi_char: Update ioctl-number.txt)
Merging leds/for-next (338d635 leds: 88pm860x: Add missing of_node_put())
Merging driver-core/driver-core-next (807be03 firmware: Ignore abort check when no user-helper is used)
CONFLICT (modify/delete): net/wanrouter/Kconfig deleted in HEAD and modified in driver-core/driver-core-next. Version driver-core/driver-core-next of net/wanrouter/Kconfig left in tree.
CONFLICT (content): Merge conflict in drivers/spi/spi-s3c64xx.c
CONFLICT (content): Merge conflict in drivers/spi/Kconfig
CONFLICT (content): Merge conflict in drivers/net/wan/Kconfig
CONFLICT (content): Merge conflict in drivers/net/ethernet/seeq/Kconfig
CONFLICT (modify/delete): drivers/net/ethernet/racal/Kconfig deleted in HEAD and modified in driver-core/driver-core-next. Version driver-core/driver-core-next of drivers/net/ethernet/racal/Kconfig left in tree.
CONFLICT (content): Merge conflict in drivers/net/ethernet/intel/Kconfig
CONFLICT (content): Merge conflict in drivers/net/ethernet/i825xx/Kconfig
CONFLICT (content): Merge conflict in drivers/net/ethernet/fujitsu/Kconfig
CONFLICT (content): Merge conflict in drivers/net/ethernet/8390/Kconfig
CONFLICT (content): Merge conflict in drivers/iommu/tegra-smmu.c
CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-s3c2410.c
CONFLICT (content): Merge conflict in drivers/dma/dw_dmac.c
$ git rm -f net/wanrouter/Kconfig
$ git rm -f drivers/net/ethernet/racal/Kconfig
Merging tty/tty-next (44a7541 Revert "serial: imx: Move imx_port_ucrs_save/restore under CONFIG_CONSOLE_POLL")
CONFLICT (content): Merge conflict in drivers/net/wan/Kconfig
CONFLICT (content): Merge conflict in drivers/net/can/Kconfig
CONFLICT (content): Merge conflict in drivers/lguest/Kconfig
CONFLICT (content): Merge conflict in drivers/i2c/busses/Kconfig
Merging usb/usb-next (9662ced usb: gadget: imx_udc: make it depend on BROKEN)
CONFLICT (content): Merge conflict in drivers/usb/phy/omap-usb2.c
CONFLICT (content): Merge conflict in drivers/usb/musb/omap2430.c
CONFLICT (content): Merge conflict in drivers/usb/gadget/Kconfig
Merging staging/staging-next (a9d5094 staging: comedi: quatech_daqp_cs: fix build error)
CONFLICT (content): Merge conflict in drivers/staging/et131x/et131x.c
Merging char-misc/char-misc-next (074b4c0 mei: move clients cleanup code from init.c to client.c)
CONFLICT (content): Merge conflict in include/linux/mfd/arizona/pdata.h
CONFLICT (content): Merge conflict in drivers/mfd/wm5102-tables.c
CONFLICT (content): Merge conflict in drivers/ipack/devices/ipoctal.c
Merging tmem/linux-next (8f0d816 Linux 3.7-rc3)
Merging writeback/writeback-for-next (ed84825 Negative (setpoint-dirty) in bdi_position_ratio())
Merging arm-dt/devicetree/arm-next (ede338f dt: add documentation of ARM dt boot interface)
Merging hwspinlock/linux-next (8b37fcf hwspinlock: add MAINTAINERS entries)
Merging pinctrl/for-next (0ca1e4b Merge branch 'allwinner-sunxi' into for-next)
CONFLICT (content): Merge conflict in include/linux/mfd/abx500/ab8500.h
CONFLICT (content): Merge conflict in drivers/pinctrl/pinctrl-nomadik.c
CONFLICT (content): Merge conflict in drivers/gpio/Kconfig
Merging vhost/linux-next (0e9ff68 vhost-blk: add eventfd dependency)
Merging memblock/memblock-kill-early_node_map (7bd0b0f memblock: Reimplement memblock allocation using reverse free area iterator)
Merging remoteproc/for-next (6f0c058 Linux 3.7-rc2)
Merging irqdomain/irqdomain/next (560aa53 irqdomain: document the simple domain first_irq)
Merging gpio/gpio/next (0fa2fd9 Merge branch 'linusw/devel' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git into gpio/next)
Merging gpio-lw/for-next (a0d75dd Merge branch 'devel' into for-next)
Merging arm-soc/for-next (1d2c57a Merge branch 'fixes' into for-next)
CONFLICT (content): Merge conflict in drivers/pinctrl/pinctrl-nomadik.c
CONFLICT (content): Merge conflict in drivers/mfd/db8500-prcmu.c
CONFLICT (content): Merge conflict in drivers/crypto/omap-sham.c
CONFLICT (content): Merge conflict in drivers/clk/Makefile
CONFLICT (content): Merge conflict in arch/arm/mach-zynq/common.c
CONFLICT (content): Merge conflict in arch/arm/mach-spear6xx/spear6xx.c
CONFLICT (content): Merge conflict in arch/arm/mach-spear3xx/spear3xx.c
CONFLICT (content): Merge conflict in arch/arm/mach-spear13xx/spear1340.c
CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/setup-sh73a0.c
CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/setup-r8a7740.c
CONFLICT (content): Merge conflict in arch/arm/mach-s3c64xx/dma.c
Merging bcm2835/for-next (f9b4142 Merge branch 'for-3.9/defconfig' into for-next)
Merging cortex/for-next (6ebd4d0 ARM: stub out read_cpuid and read_cpuid_ext for CPU_CP15=n)
CONFLICT (content): Merge conflict in arch/arm/include/asm/cputype.h
Merging ep93xx/ep93xx-for-next (cf92d86 Merge branch 'ep93xx-fixes' into ep93xx-for-next)
Merging ixp4xx/next (b94740b IXP4xx: use __iomem for MMIO)
Merging msm/for-next (a0d271c Linux 3.6)
Merging renesas/next (20e70df Merge branches 'heads/soc4', 'heads/defconfig', 'heads/boards', 'boards-kzm9g-reference' and 'heads/pfc' into next)
Merging samsung/for-next (d324d59 Merge branch 'next/secure-exynos' into for-next)
CONFLICT (content): Merge conflict in arch/arm/mach-exynos/platsmp.c
CONFLICT (content): Merge conflict in arch/arm/mach-exynos/mach-exynos4-dt.c
CONFLICT (content): Merge conflict in arch/arm/common/Makefile
CONFLICT (content): Merge conflict in arch/arm/Kconfig
Merging tegra/for-next (a164849 Merge branch 'for-3.9/defconfig' into for-next)
Merging dma-mapping/dma-mapping-next (3008c87 ARM: dma-mapping: Fix non-MMU builds)
Merging pwm/for-next (83cfd72 pwm_backlight: Validate dft_brightness in main probe function)
Merging dma-buf/for-next (90b6e90 dma-buf: implement vmap refcounting in the interface logic)
Merging userns/for-next (bc1b69e userns: Allow the unprivileged users to mount mqueue fs)
Merging ktest/for-next (4283b16 ktest: Add make_warnings_file and process full warnings)
Merging signal/for-next (3241b8f x86: convert to ksignal)
CONFLICT (content): Merge conflict in arch/x86/Kconfig
CONFLICT (content): Merge conflict in arch/s390/Kconfig
CONFLICT (content): Merge conflict in arch/powerpc/Kconfig
CONFLICT (content): Merge conflict in arch/mips/kernel/syscall.c
CONFLICT (content): Merge conflict in arch/mips/kernel/signal_n32.c
CONFLICT (content): Merge conflict in arch/mips/kernel/signal32.c
CONFLICT (content): Merge conflict in arch/mips/kernel/signal.c
CONFLICT (content): Merge conflict in arch/mips/kernel/scall64-o32.S
CONFLICT (content): Merge conflict in arch/mips/kernel/process.c
CONFLICT (content): Merge conflict in arch/mips/kernel/linux32.c
Merging clk/clk-next (8ae5ac5 clk: vexpress: Use common of_clk_init() function)
CONFLICT (content): Merge conflict in include/asm-generic/vmlinux.lds.h
Merging random/dev (6133705 random: Mix cputime from each thread that exits to the pool)
Merging lzo-update/lzo-update (ba32bf9 lib/lzo: Do not leak implementation details in lzo1x_1_compress())
Merging scsi-post-merge/merge-base:master (65112dc Merge git://git.samba.org/sfrench/cifs-2.6)
Merging akpm-current/current (4d91892 fb: Yet another band-aid for fixing lockdep mess)
$ git checkout -b akpm remotes/origin/akpm/master
Applying: compiler-gcc4.h: Reorder macros based upon gcc ver
Applying: compiler-gcc.h: Add gcc-recommended GCC_VERSION macro
Applying: compiler-gcc{3,4}.h: Use GCC_VERSION macro
Applying: compiler{,-gcc4}.h, bug.h: Remove duplicate macros
Applying: bug.h: Fix BUILD_BUG_ON macro in __CHECKER__
Applying: bug.h: Prevent double evaulation of in BUILD_BUG_ON
Applying: bugh-prevent-double-evaulation-of-in-build_bug_on-fix
Applying: bug.h: Make BUILD_BUG_ON generate compile-time error
Applying: compiler.h, bug.h: Prevent double error messages with BUILD_BUG{,_ON}
Applying: bug.h, compiler.h: Introduce compiletime_assert & BUILD_BUG_ON_MSG
Applying: bugh-compilerh-introduce-compiletime_assert-build_bug_on_msg-checkpatch-fixes
Applying: proc: avoid extra pde_put() in proc_fill_super()
Applying: compat: return -EFAULT on error in waitid()
Applying: inotify: remove broken mask checks causing unmount to be EINVAL
Applying: fs/block_dev.c: page cache wrongly left invalidated after revalidate_disk()
Applying: x86 numa: don't check if node is NUMA_NO_NODE
Applying: Revert "x86, mm: Make spurious_fault check explicitly check the PRESENT bit"
Applying: pageattr: prevent PSE and GLOABL leftovers to confuse pmd/pte_present and pmd_huge
Applying: x86: make 'mem=' option to work for efi platform
Applying: drivers/md/persistent-data/dm-transaction-manager.c: rename HASH_SIZE
Applying: cris: Use "int" for ssize_t to match size_t
Applying: pcmcia: move unbind/rebind into dev_pm_ops.complete
Applying: mm: remove free_area_cache use in powerpc architecture
Applying: mm: use vm_unmapped_area() on powerpc architecture
Applying: drm/fb-helper: don't sleep for screen unblank when an oopps is in progress
Applying: fbcon: clear the logo bitmap from the margin area
Applying: goldfish: framebuffer driver
Applying: video: mmp display subsystem
Applying: video: mmp fb support
Applying: video: mmp display controller support
Applying: video: mmp: add tpo hvga panel supported
Applying: video: mmpdisp: add spi port in display controller
Applying: ARM: mmp: added device for display controller
Applying: ARM: mmp: enable display in ttc_dkb
Applying: ARM: mmp: add display and fb support in pxa910 defconfig
Applying: drivers/video/Kconfig: specify the SoCs that make use of FB_IMX
Applying: cyber2000fb: avoid palette corruption at higher clocks
Applying: timeconst.pl: remove deprecated defined(@array)
Applying: time: don't inline EXPORT_SYMBOL functions
Applying: timer_list: split timer_list_show_tickdevices()
Applying: timer_list: convert timer list to be a proper seq_file
Applying: timer_list-convert-timer-list-to-be-a-proper-seq_file-fix
Applying: timer_list-convert-timer-list-to-be-a-proper-seq_file-v2
Applying: timer_list-convert-timer-list-to-be-a-proper-seq_file-v2-fix
Applying: timer_list-convert-timer-list-to-be-a-proper-seq_file-fix-fix
Applying: ia64/mm: fix a bad_page bug when crash kernel booting
Applying: mm: use vm_unmapped_area() on ia64 architecture
Applying: mm: use vm_unmapped_area() in hugetlbfs on ia64 architecture
Applying: scripts/tags.sh: add ctags magic for declarations of popular kernel type
Applying: mm: use vm_unmapped_area() on parisc architecture
Applying: sched: /proc/sched_stat fails on very very large machines
Applying: sched-proc-sched_stat-fails-on-very-very-large-machines-fix
Applying: sched-proc-sched_stat-fails-on-very-very-large-machines-v2
Applying: sched-proc-sched_stat-fails-on-very-very-large-machines-v2-fix
Applying: sched-proc-sched_stat-fails-on-very-very-large-machines-v2-fix-fix
Applying: sched: /proc/sched_debug fails on very very large machines
Applying: sched-proc-sched_debug-fails-on-very-very-large-machines-fix
Applying: sched-proc-sched_debug-fails-on-very-very-large-machines-v2
Applying: sched-proc-sched_debug-fails-on-very-very-large-machines-v2-fix
Applying: lockdep: make lockdep_assert_held() not have a return value
Applying: block: don't select PERCPU_RWSEM
Applying: drivers/block/swim3.c: fix null pointer dereference
Applying: cfq: fix lock imbalance with failed allocations
Applying: block: use i_size_write() in bd_set_size()
Applying: block: remove redundant check to bd_openers()
Applying: loopdev: fix a deadlock
Applying: loopdev: update block device size in loop_set_status()
Applying: loopdev: move common code into loop_figure_size()
Applying: loopdev: remove an user triggerable oops
Applying: loopdev: ignore negative offset when calculate loop device size
Applying: block: restore /proc/partitions to not display non-partitionable removable devices
Applying: fs: change return values from -EACCES to -EPERM
Applying: fs/block_dev.c: no need to check inode->i_bdev in bd_forget()
Applying: watchdog: trigger all-cpu backtrace when locked up and going to panic
Applying: memcg, oom: provide more precise dump info while memcg oom happening
Applying: mm/memcontrol.c: convert printk(KERN_FOO) to pr_foo()
Applying: mm/hugetlb.c: convert to pr_foo()
Applying: CMA: make putback_lru_pages() call conditional
Applying: mm/page_alloc.c:__alloc_contig_migrate_range(): cleanup
Applying: mm: memcg: only evict file pages when we have plenty
Applying: mm: vmscan: save work scanning (almost) empty LRU lists
Applying: mm: vmscan: clarify how swappiness, highest priority, memcg interact
Applying: mm: vmscan: improve comment on low-page cache handling
Applying: mm: vmscan: clean up get_scan_count()
Applying: mm-vmscan-clean-up-get_scan_count-fix
Applying: mm: vmscan: compaction works against zones, not lruvecs
Applying: mm-vmscan-compaction-works-against-zones-not-lruvecs-fix
Applying: mm: reduce rmap overhead for ex-KSM page copies created on swap faults
Applying: mm/page_alloc.c:__setup_per_zone_wmarks: make min_pages unsigned long
Applying: mm/vmscan.c:__zone_reclaim(): replace max_t() with max()
Applying: mm: compaction: do not accidentally skip pageblocks in the migrate scanner
Applying: mm/huge_memory.c: use new hashtable implementation
Applying: mm/ksm.c: use new hashtable implementation
Applying: memcg,vmscan: do not break out targeted reclaim without reclaimed pages
Applying: mmotm: memcgvmscan-do-not-break-out-targeted-reclaim-without-reclaimed-pages.patch fix
Applying: mmotm-memcgvmscan-do-not-break-out-targeted-reclaim-without-reclaimed-pagespatch-fix-fix
Applying: mm: make madvise(MADV_WILLNEED) support swap file prefetch
Applying: mm-make-madvisemadv_willneed-support-swap-file-prefetch-fix
Applying: mm: fix BUG on madvise early failure
Applying: mm: compaction: make __compact_pgdat() and compact_pgdat() return void
Applying: mm: avoid calling pgdat_balanced() needlessly
Applying: mm: remap_file_pages() fixes
Applying: mm: introduce mm_populate() for populating new vmas
Applying: mm: use mm_populate() for blocking remap_file_pages()
Applying: mm: use mm_populate() when adjusting brk with MCL_FUTURE in effect
Applying: mm: use mm_populate() for mremap() of VM_LOCKED vmas
Applying: mm: remove flags argument to mmap_region
Applying: mm-remove-flags-argument-to-mmap_region-fix
Applying: mm: directly use __mlock_vma_pages_range() in find_extend_vma()
Applying: mm: introduce VM_POPULATE flag to better deal with racy userspace programs
Applying: mm: make do_mmap_pgoff return populate as a size in bytes, not as a bool
Applying: mm: memory_hotplug: no need to check res twice in add_memory
Applying: memory-hotplug: try to offline the memory twice to avoid dependence
Applying: memory-hotplug: check whether all memory blocks are offlined or not when removing memory
Applying: memory-hotplug: remove redundant codes
Applying: memory-hotplug: remove /sys/firmware/memmap/X sysfs
Applying: Bug fix: Hold spinlock across find|remove /sys/firmware/memmap/X operation.
Applying: Bug fix: Fix the wrong comments of map_entries.
Applying: Bug fix: Reuse the storage of /sys/firmware/memmap/X/ allocated by bootmem.
Applying: Bug fix: Fix section mismatch problem of release_firmware_map_entry().
Applying: Bug fix: Fix the doc format in drivers/firmware/memmap.c
Applying: memory-hotplug: introduce new arch_remove_memory() for removing page table
Applying: memory-hotplug: implement register_page_bootmem_info_section of sparse-vmemmap
Applying: memory-hotplug-implement-register_page_bootmem_info_section-of-sparse-vmemmap-fix
Applying: memory-hotplug: introduce CONFIG_HAVE_BOOTMEM_INFO_NODE and revert register_page_bootmem_info_node() when platform not support
Applying: memory-hotplug: cleanup: removing the arch specific functions without any implementation
Applying: memory-hotplug: mm/Kconfig: move auto selects from MEMORY_HOTPLUG to MEMORY_HOTREMOVE as needed
Applying: memory-hotplug: move pgdat_resize_lock into sparse_remove_one_section()
Applying: memory-hotplug: common APIs to support page tables hot-remove
Applying: memory-hotplug-common-apis-to-support-page-tables-hot-remove-fix
Applying: Bug fix: Do not calculate direct mapping pages when freeing vmemmap pagetables.
Applying: Bug fix: Do not free direct mapping pages twice.
Applying: Bug fix: Do not free page split from hugepage one by one.
Applying: Bug fix: Do not split pages when freeing pagetable pages.
Applying: memory-hotplug-common-apis-to-support-page-tables-hot-remove-fix-fix-fix-fix-fix-fix
Applying: memory-hotplug-common-apis-to-support-page-tables-hot-remove-fix-fix-fix-fix-fix-fix-fix
Applying: memory-hotplug: remove page table of x86_64 architecture
Applying: memory-hotplug-remove-page-table-of-x86_64-architecture-fix
Applying: memory-hotplug: remove memmap of sparse-vmemmap
Applying: memory-hotplug-remove-memmap-of-sparse-vmemmap-fix
Applying: memory-hotplug: integrated __remove_section() of CONFIG_SPARSEMEM_VMEMMAP.
Applying: memory_hotplug: clear zone when removing the memory
Applying: memory-hotplug: remove sysfs file of node
Applying: memory-hotplug: free node_data when a node is offlined
Applying: memory-hotplug: do not allocate pgdat if it was not freed when offline.
Applying: memory-hotplug-do-not-allocate-pdgat-if-it-was-not-freed-when-offline-fix
Applying: memory-hotplug-do-not-allocate-pdgat-if-it-was-not-freed-when-offline-fix-fix
Applying: memory-hotplug: consider compound pages when free memmap
Applying: mempolicy: fix is_valid_nodemask()
Applying: cpu_hotplug: clear apicid to node when the cpu is hotremoved
Applying: cpu_hotplug-clear-apicid-to-node-when-the-cpu-is-hotremoved-fix
Applying: memory-hotplug: export the function try_offline_node()
Applying: memory-hotplug: export the function try_offline_node() fix
Applying: cpu-hotplug, memory-hotplug: try offlining the node when hotremoving a cpu
Applying: cpu-hotplug,memory-hotplug: clear cpu_to_node() when offlining the node
Applying: cpu-hotplugmemory-hotplug-clear-cpu_to_node-when-offlining-the-node-fix
Applying: sched: do not use cpu_to_node() to find an offlined cpu's node.
Applying: x86: get pg_data_t's memory from other node
Applying: page_alloc: add movable_memmap kernel parameter
Applying: page_alloc-add-movable_memmap-kernel-parameter-fix
Applying: Bug fix: Fix the doc format.
Applying: page_alloc-add-movable_memmap-kernel-parameter-fix-fix-checkpatch-fixes
Applying: page_alloc-add-movable_memmap-kernel-parameter-fix-fix-fix
Applying: Rename movablecore_map to movablemem_map.
Applying: page_alloc: introduce zone_movable_limit[] to keep movable limit for nodes
Applying: Bug fix: Remove the unused sanitize_zone_movable_limit() definition.
Applying: page_alloc: make movablemem_map have higher priority
Applying: page_alloc: bootmem limit with movablecore_map
Applying: acpi, memory-hotplug: parse SRAT before memblock is ready
Applying: acpi, memory-hotplug: parse SRAT before memblock is ready fix
Applying: acpi, memory-hotplug: extend movablemem_map ranges to the end of node
Applying: acpi-memory-hotplug-extend-movablemem_map-ranges-to-the-end-of-node-fix
Applying: acpi, memory-hotplug: support getting hotplug info from SRAT
Applying: acpi-memory-hotplug-support-getting-hotplug-info-from-srat-fix
Applying: acpi-memory-hotplug-support-getting-hotplug-info-from-srat-fix-fix
Applying: mm/memblock.c: use CONFIG_HAVE_MEMBLOCK_NODE_MAP to protect movablecore_map in memblock_overlaps_region().
Applying: mm: use zone->present_pages instead of zone->managed_pages where appropriate
Applying: mm: set zone->present_pages to number of existing pages in the zone
Applying: mm: increase totalram_pages when free pages allocated by bootmem allocator
Applying: mm: remove MIGRATE_ISOLATE check in hotpath
Applying: memory-failure: fix an error of mce_bad_pages statistics
Applying: memory-failure: do code refactor of soft_offline_page()
Applying: memory-failure: use num_poisoned_pages instead of mce_bad_pages
Applying: memory-failure-use-num_poisoned_pages-instead-of-mce_bad_pages-fix
Applying: mm/memory-failure.c: clean up soft_offline_page()
Applying: mm/memory-failure.c: fix wrong num_poisoned_pages in handling memory error on thp
Applying: mm-memory-failurec-fix-wrong-num_poisoned_pages-in-handling-memory-error-on-thp-fix
Applying: mm: don't wait on congested zones in balance_pgdat()
Applying: mm: teach mm by current context info to not do I/O during memory allocation
Applying: pm / runtime: introduce pm_runtime_set_memalloc_noio()
Applying: block/genhd.c: apply pm_runtime_set_memalloc_noio on block devices
Applying: net/core: apply pm_runtime_set_memalloc_noio on network devices
Applying: pm / runtime: force memory allocation with no I/O during Runtime PM callbcack
Applying: usb: forbid memory allocation with I/O during bus reset
Applying: mm: remove unused memclear_highpage_flush()
Applying: mm: numa: fix minor typo in numa_next_scan
Applying: mm: numa: take THP into account when migrating pages for NUMA balancing
Applying: mm: numa: handle side-effects in count_vm_numa_events() for !CONFIG_NUMA_BALANCING
Applying: mm: move page flags layout to separate header
Applying: mm: Fold page->_last_nid into page->flags where possible
Applying: mm: numa: Cleanup flow of transhuge page migration
Applying: mm: don't inline page_mapping()
Applying: swap: make each swap partition have one address_space
Applying: swap-make-each-swap-partition-have-one-address_space-fix
Applying: swap-make-each-swap-partition-have-one-address_space-fix-fix
Applying: swap: add per-partition lock for swapfile
Applying: swap-add-per-partition-lock-for-swapfile-fix-fix
Applying: swap: fix "add per-partition lock for swapfile" for nommu
Applying: swap: add per-partition lock for swapfile fix
Applying: swap-add-per-partition-lock-for-swapfile-fix-fix-fix-fix
Applying: mm: Get rid of lockdep whinge on sys_swapon
Applying: mm/rmap: rename anon_vma_unlock() => anon_vma_unlock_write()
Applying: page-writeback.c: subtract min_free_kbytes from dirtyable memory
Applying: page-writebackc-subtract-min_free_kbytes-from-dirtyable-memory-fix
Applying: page-writebackc-subtract-min_free_kbytes-from-dirtyable-memory-fix-fix
Applying: memcg: do not create memsw files if swap accounting is disabled
Applying: memcg: clean up swap accounting initialization code
Applying: mm: uninline page_xchg_last_nid()
Applying: mm: init: report on last-nid information stored in page->flags
Applying: memcg: reduce the size of struct memcg 244-fold.
Applying: memcg-reduce-the-size-of-struct-memcg-244-fold-fix
Applying: memcg-reduce-the-size-of-struct-memcg-244-fold-fix-fix
Applying: memcg: prevent changes to move_charge_at_immigrate during task attach
Applying: memcg: split part of memcg creation to css_online
Applying: memcg: fast hierarchy-aware child test
Applying: memcg-fast-hierarchy-aware-child-test-fix
Applying: memcg: replace cgroup_lock with memcg specific memcg_lock
Applying: memcg: increment static branch right after limit set
Applying: memcg: avoid dangling reference count in creation failure.
Applying: mm: memmap_init_zone() performance improvement
Applying: mm: rename page struct field helpers
Applying: mm-rename-page-struct-field-helpers-fix
Applying: ksm: allow trees per NUMA node
Applying: ksm: add sysfs ABI Documentation
Applying: ksm: trivial tidyups
Applying: ksm-trivial-tidyups-fix
Applying: ksm: reorganize ksm_check_stable_tree
Applying: ksm: get_ksm_page locked
Applying: ksm: remove old stable nodes more thoroughly
Applying: ksm: make KSM page migration possible
Applying: ksm: make !merge_across_nodes migration safe
Applying: ksm: enable KSM page migration
Applying: mm: remove offlining arg to migrate_pages
Applying: ksm: stop hotremove lockdep warning
Applying: mm: shmem: use new radix tree iterator
Applying: mm: refactor inactive_file_is_low() to use get_lru_size()
Applying: mm/mlock.c: document scary-looking stack expansion mlock chain
Applying: mm: add SECTION_IN_PAGE_FLAGS
Applying: mm: add & use zone_end_pfn() and zone_spans_pfn()
Applying: mm: add zone_is_empty() and zone_is_initialized()
Applying: mm/page_alloc: add a VM_BUG in __free_one_page() if the zone is uninitialized.
Applying: mmzone: add pgdat_{end_pfn,is_empty}() helpers & consolidate.
Applying: mm/page_alloc: add informative debugging message in page_outside_zone_boundaries()
Applying: mm-page_alloc-add-informative-debugging-message-in-page_outside_zone_boundaries-fix
Applying: mm: add helper ensure_zone_is_initialized()
Applying: mm/memory_hotplug: use ensure_zone_is_initialized()
Applying: mm/memory_hotplug: use pgdat_end_pfn() instead of open coding the same.
Applying: mmu_notifier_unregister NULL Pointer deref and multiple ->release() callouts
Applying: mm: use NUMA_NO_NODE
Applying: mm: remove free_area_cache
Applying: include/linux/mmzone.h: cleanups
Applying: include-linux-mmzoneh-cleanups-fix
Applying: mm: use up free swap space before reaching OOM kill
Applying: memcg: move mem_cgroup_soft_limit_tree_init to mem_cgroup_init
Applying: memcg: move memcg_stock initialization to mem_cgroup_init
Applying: memcg: cleanup mem_cgroup_init comment
Applying: mm: fix return type for functions nr_free_*_pages
Applying: ia64: use %ld to print pages calculated in nr_free_buffer_pages
Applying: fs/buffer.c: change type of max_buffer_heads to unsigned long
Applying: fs/nfsd: change type of max_delegations, nfsd_drc_max_mem and nfsd_drc_mem_used
Applying: vmscan: change type of vm_total_pages to unsigned long
Applying: net: change type of netns_ipvs->sysctl_sync_qlen_max
Applying: net: change type of virtio_chan->p9_max_pages
Applying: drop_caches: add some documentation and info message
Applying: drivers/usb/gadget/amd5536udc.c: avoid calling dma_pool_create() with NULL dev
Applying: mm/dmapool.c: fix null dev in dma_pool_create()
Applying: memcg: debugging facility to access dangling memcgs
Applying: memcg-debugging-facility-to-access-dangling-memcgs-fix
Applying: mm: add vm event counters for balloon pages compaction
Applying: mm: use vm_unmapped_area() on frv architecture
Applying: bdi: allow block devices to say that they require stable page writes
Applying: mm: only enforce stable page writes if the backing device requires it
Applying: 9pfs: fix filesystem to wait for stable page writeback
Applying: block: optionally snapshot page contents to provide stable pages during write
Applying: ocfs2: wait for page writeback to provide stable pages
Applying: ubifs: wait for page writeback to provide stable pages
Applying: mm: use vm_unmapped_area() on alpha architecture
Applying: scripts-pnmtologo-fix-for-plain-pbm-checkpatch-fixes
Applying: smp: make smp_call_function_many() use logic similar to smp_call_function_single()
Applying: lib/Kconfig.debug: unhide CONFIG_PANIC_ON_OOPS
Applying: include/linux/fs.h: disable preempt when acquire i_size_seqcount write lock
Applying: kernel/smp.c: cleanups
Applying: lib/vsprintf.c: add %pa format specifier for phys_addr_t types
Applying: get_maintainer.pl: find maintainers for removed files
Applying: MAINTAINERS: mm: add additional include files to listing
Applying: backlight: add lms501kf03 LCD driver
Applying: backlight-add-lms501kf03-lcd-driver-fix
Applying: backlight-add-lms501kf03-lcd-driver-fix-fix
Applying: backlight: ld9040: use sleep instead of delay
Applying: backlight: ld9040: remove unnecessary NULL deference check
Applying: backlight: ld9040: replace EFAULT with EINVAL
Applying: backlight: ld9040: remove redundant return variables
Applying: backlight: ld9040: reorder inclusions of <linux/xxx.h>
Applying: backlight: s6e63m0: use lowercase names of structs
Applying: backlight: s6e63m0: use sleep instead of delay
Applying: backlight: s6e63m0: remove unnecessary NULL deference check
Applying: backlight: s6e63m0: replace EFAULT with EINVAL
Applying: backlight: s6e63m0: remove redundant variable 'before_power'
Applying: backlight: s6e63m0: reorder inclusions of <linux/xxx.h>
Applying: backlight: ams369fg06: use sleep instead of delay
Applying: backlight: ams369fg06: remove unnecessary NULL deference check
Applying: backlight: ams369fg06: replace EFAULT with EINVAL
Applying: backlight: ams369fg06: remove redundant variable 'before_power'
Applying: backlight: ams369fg06: reorder inclusions of <linux/xxx.h>
Applying: backlight: add new lp8788 backlight driver
Applying: backlight-add-new-lp8788-backlight-driver-checkpatch-fixes
Applying: backlight: l4f00242t03: use spi_get_drvdata and spi_set_drvdata
Applying: backlight: ld9040: use spi_get_drvdata and spi_set_drvdata
Applying: backlight: s6e63m0: use spi_get_drvdata and spi_set_drvdata
Applying: backlight: ltv350qv: use spi_get_drvdata and spi_set_drvdata
Applying: backlight: tdo24m: use spi_get_drvdata and spi_set_drvdata
Applying: backlight: lms283gf05: use spi_get_drvdata and spi_set_drvdata
Applying: backlight: ams369fg06: use spi_get_drvdata and spi_set_drvdata
Applying: backlight: vgg2432a4: use spi_get_drvdata and spi_set_drvdata
Applying: backlight: tosa: use spi_get_drvdata and spi_set_drvdata
Applying: backlight: corgi_lcd: use spi_get_drvdata and spi_set_drvdata
Applying: backlight: lms501kf03: use spi_get_drvdata and spi_set_drvdata
Applying: backlight: aat2870: use bl_get_data instead of dev_get_drvdata
Applying: pwm_backlight: use bl_get_data instead of dev_get_drvdata
Applying: backlight: ams369fg06: use bl_get_data instead of dev_get_drvdata
Applying: backlight: corgi_lcd: use bl_get_data instead of dev_get_drvdata
Applying: backlight: tosa: use bl_get_data instead of dev_get_drvdata
Applying: backlight: omap1: use bl_get_data instead of dev_get_drvdata
Applying: backlight: corgi_lcd: use lcd_get_data instead of dev_get_drvdata
Applying: drivers/video/backlight/lm3639_bl.c: remove ret = -EIO at error paths of probe
Applying: drivers/video/backlight/l4f00242t03.c: convert to devm_regulator_get()
Applying: drivers/video/backlight/ld9040.c: use devm_regulator_bulk_get() API
Applying: fb: backlight: add the Himax HX-8357B LCD controller
Applying: drivers/video/backlight/Makefile: cleanup
Applying: backlight: add an AS3711 PMIC backlight driver
Applying: backlight: as3711: fix compilation breakage
Applying: drivers/video/backlight/88pm860x_bl.c: add missing of_node_put()
Applying: drivers/video/backlight/s6e63m0.c: report ->gamma_table_count correctly
Applying: drivers/video/backlight/lm3630_bl.c: remove ret = -EIO of lm3630_backlight_register()
Applying: drivers/leds/leds-ot200.c: fix error caused by shifted mask
Applying: lib/parser.c: fix up comments for valid return values from match_number
Applying: decompressors: group XZ_DEC_* symbols under an if XZ_BCJ / endif
Applying: decompressors: drop dependency on CONFIG_EXPERT
Applying: decompressors: make the default XZ_DEC_* config match the selected architecture
Applying: checkpatch: prefer dev_<level>( to dev_printk(KERN_<LEVEL>
Applying: checkpatch: warn on unnecessary __dev<foo> section markings
Applying: checkpatch: add Joe to MAINTAINERS
Applying: checkpatch: don't emit the CamelCase warning for PageFoo
Applying: checkpatch: Add check for kcalloc argument order
Applying: checkpatch: fix USLEEP_RANGE test
Applying: epoll: support for disabling items, and a self-test app
Applying: epoll: stop comparing pointers with 0 in self-test app
Applying: binfmt_elf: remove unused argument in fill_elf_header
Applying: binfmt_elf.c: use get_random_int() to fix entropy depleting
Applying: kernel/nsproxy.c: remove duplicate task_cred_xxx for user_ns
Applying: drivers/rtc: dump small buffers via %*ph
Applying: drivers/rtc/rtc-pxa.c: fix alarm not match issue
Applying: drivers/rtc/rtc-pxa.c: fix alarm can't wake up system issue
Applying: drivers/rtc/rtc-pxa.c: fix set time sync time issue
Applying: drivers-rtc-rtc-pxac-fix-set-time-sync-time-issue-fix
Applying: drivers/rtc/rtc-ds1307.c: long block operations bugfix
Applying: rtc-ds1307-long-block-operations-bugfix-fix
Applying: rtc: max77686: add Maxim 77686 driver
Applying: rtc-max77686-add-maxim-77686-driver-fix
Applying: rtc-pcf8523: add low battery voltage support
Applying: rtc-pcf8523-add-low-battery-voltage-support-fix
Applying: drivers/rtc: use of_match_ptr() macro
Applying: drivers/rtc/rtc-twl: use of_match_ptr() macro
Applying: drivers/rtc/rtc-pxa.c: avoid cpuid checking
Applying: drivers/rtc: remove unnecessary semicolons
Applying: drivers/rtc/rtc-ds2404.c: use module_platform_driver macro
Applying: rtc: add new lp8788 rtc driver
Applying: rtc: add RTC driver for TPS80031/TPS80032
Applying: rtc-add-rtc-driver-for-tps80031-tps80032-v2
Applying: rtc-add-rtc-driver-for-tps80031-tps80032-v2-fix
Applying: drivers/rtc/rtc-tps65910.c: enable/disable wake in suspend/resume
Applying: drivers/rtc/rtc-tps65910.c: remove unnecessary irq stat save and restore
Applying: drivers/rtc/rtc-tps65910.c: use sleep_pm_ops macro for initialising suspend/resume callbacks
Applying: drivers/rtc/rtc-tps65910.c: set irq flag to IRQF_EARLY_RESUME during irq request
Applying: rtc: add support for spi rtc rx4581
Applying: rtc-add-support-for-spi-rtc-rx4581-checkpatch-fixes
Applying: rtc rx4581: change err type from unsigned char to int in get_datetime()
Applying: drivers/rtc/rtc-pl031.c: add wakeup support
Applying: arm: mvebu: add RTC support for Armada 370 and Armada XP
Applying: arm: mvebu: update defconfig with Marvell RTC support
Applying: drivers/rtc/rtc-s3c.c: use dev_dbg() instaed of pr_debug()
Applying: hfsplus: add osx.* prefix for handling namespace of Mac OS X extended attributes
Applying: hfsplus: add on-disk layout declarations related to attributes tree
Applying: hfsplus: add functionality of manipulating by records in attributes tree
Applying: hfsplus: rework functionality of getting, setting and deleting of extended attributes
Applying: hfsplus: add support of manipulation by attributes file
Applying: fat: add extended fileds to struct fat_boot_sector
Applying: fat: mark fs as dirty on mount and clean on umount
Applying: fat: eliminate iterations in fat_search_long and __fat_readdir in case of EOD
Applying: Documentation/DMA-API-HOWTO.txt: minor grammar corrections
Applying: Documentation/cgroups/blkio-controller.txt: fix typo
Applying: signal: allow to send any siginfo to itself
Applying: signal-allow-to-send-any-siginfo-to-itself-fix
Applying: signalfd: add ability to return siginfo in a raw format
Applying: signalfd-add-ability-to-return-siginfo-in-a-raw-format-v2-fix
Applying: coredump: remove redundant defines for dumpable states
Applying: fs/proc: clean up printks
Applying: fs-proc-clean-up-printks-fix
Applying: seq-file: use SEEK_ macros instead of hardcoded numbers
Applying: fs/seq_file.c:seq_lseek(): fix switch statement indenting
Applying: fs-seq_filec-seq_lseek-fix-switch-statement-indenting-checkpatch-fixes
Applying: fork: unshare: remove dead code
Applying: fs/exec.c: make bprm_mm_init() static
Applying: kexec: add the values related to buddy system for filtering free pages.
Applying: kexec: get rid of duplicate check for hole_end
Applying: block: fix ext_devt_idr handling
Applying: idr: fix a subtle bug in idr_get_next()
Applying: idr: make idr_destroy() imply idr_remove_all()
Applying: atm/nicstar: don't use idr_remove_all()
Applying: block/loop: don't use idr_remove_all()
Applying: firewire: don't use idr_remove_all()
Applying: drm: don't use idr_remove_all()
Applying: dm: don't use idr_remove_all()
Applying: remoteproc: don't use idr_remove_all()
Applying: rpmsg: don't use idr_remove_all()
Applying: dlm: use idr_for_each_entry() in recover_idr_clear() error path
Applying: dlm: don't use idr_remove_all()
Applying: nfs: idr_destroy() no longer needs idr_remove_all()
Applying: inotify: don't use idr_remove_all()
Applying: cgroup: don't use idr_remove_all()
Applying: nfsd: idr_destroy() no longer needs idr_remove_all()
Applying: idr: deprecate idr_remove_all()
Applying: idr: cosmetic updates to struct / initializer definitions
Applying: idr: relocate idr_for_each_entry() and reorganize id[r|a]_get_new()
Applying: idr: remove _idr_rc_to_errno() hack
Applying: idr: refactor idr_get_new_above()
Applying: idr: implement idr_preload[_end]() and idr_alloc()
Applying: block: fix synchronization and limit check in blk_alloc_devt()
Applying: block: convert to idr_alloc()
Applying: block/loop: convert to idr_alloc()
Applying: atm/nicstar: convert to idr_alloc()
Applying: drbd: convert to idr_alloc()
Applying: dca: convert to idr_alloc()
Applying: dmaengine: convert to idr_alloc()
Applying: firewire: add minor number range check to fw_device_init()
Applying: firewire: convert to idr_alloc()
Applying: gpio: convert to idr_alloc()
Applying: drm: convert to idr_alloc()
Applying: drm/exynos: convert to idr_alloc()
Applying: drm/i915: convert to idr_alloc()
Applying: drm/sis: convert to idr_alloc()
Applying: drm/via: convert to idr_alloc()
Applying: drm/vmwgfx: convert to idr_alloc()
Applying: i2c: convert to idr_alloc()
Applying: IB/core: convert to idr_alloc()
Applying: IB/amso1100: convert to idr_alloc()
Applying: IB/cxgb3: convert to idr_alloc()
Applying: IB/cxgb4: convert to idr_alloc()
Applying: IB/ehca: convert to idr_alloc()
Applying: IB/ipath: convert to idr_alloc()
Applying: IB/mlx4: convert to idr_alloc()
Applying: IB/ocrdma: convert to idr_alloc()
Applying: IB/qib: convert to idr_alloc()
Applying: dm: convert to idr_alloc()
Applying: memstick: convert to idr_alloc()
Applying: mfd: convert to idr_alloc()
Applying: misc/c2port: convert to idr_alloc()
Applying: misc/tifm_core: convert to idr_alloc()
Applying: mmc: convert to idr_alloc()
Applying: mtd: convert to idr_alloc()
Applying: macvtap: convert to idr_alloc()
Applying: ppp: convert to idr_alloc()
Applying: power: convert to idr_alloc()
Applying: pps: convert to idr_alloc()
Applying: remoteproc: convert to idr_alloc()
Applying: rpmsg: convert to idr_alloc()
Applying: scsi/bfa: convert to idr_alloc()
Applying: scsi: convert to idr_alloc()
Applying: target/iscsi: convert to idr_alloc()
Applying: scsi/lpfc: convert to idr_alloc()
Applying: thermal: convert to idr_alloc()
Applying: uio: convert to idr_alloc()
Applying: vfio: convert to idr_alloc()
Applying: dlm: convert to idr_alloc()
Applying: inotify: convert to idr_alloc()
Applying: ocfs2: convert to idr_alloc()
Applying: ipc: convert to idr_alloc()
Applying: cgroup: convert to idr_alloc()
Applying: events: convert to idr_alloc()
Applying: posix-timers: convert to idr_alloc()
Applying: net/9p: convert to idr_alloc()
Applying: mac80211: convert to idr_alloc()
Applying: sctp: convert to idr_alloc()
Applying: nfs4client: convert to idr_alloc()
Applying: ipc/sem.c: alternatives to preempt_disable()
Applying: ipmi: remove superfluous kernel/userspace explanation
Applying: ipmi: add new kernel options to prevent automatic ipmi init
Applying: ipmi: add options to disable openfirmware and PCI scanning
Applying: drivers/char/misc.c:misc_register(): do not loop on misc_list unconditionally
Applying: drivers-char-miscc-misc_register-do-not-loop-on-misc_list-unconditionally-fix
Applying: block/partition/msdos: detect AIX formatted disks even without 55aa
Applying: sysctl: fix null checking in bin_dn_node_address()
Applying: kernel/utsname_sysctl.c: put get/get_uts() into CONFIG_PROC_SYSCTL code block
Applying: kernel/utsname.c: fix wrong comment about clone_uts_ns()
Applying: mtd: mtd_nandecctest: use prandom_bytes instead of get_random_bytes()
Applying: mtd: mtd_oobtest: convert to use prandom library
Applying: mtd: mtd_pagetest: convert to use prandom library
Applying: mtd: mtd_speedtest: use prandom_bytes
Applying: mtd: mtd_subpagetest: convert to use prandom library
Applying: mtd: mtd_stresstest: use prandom_bytes()
Applying: include/linux/eventfd.h: fix incorrect filename is a comment
Applying: Documentation/DMA-API-HOWTO.txt: fix typo
Applying: w1: add support for DS2413 Dual Channel Addressable Switch
Applying: ocfs2: fix possible use-after-free with AIO
Applying: fs/direct-io.c: fix possible use-after-free with AIO
Applying: mm: remove old aio use_mm() comment
Applying: aio: remove dead code from aio.h
Applying: gadget: remove only user of aio retry
Applying: aio: remove retry-based AIO
Applying: char: add aio_{read,write} to /dev/{null,zero}
Applying: aio: kill return value of aio_complete()
Applying: aio: add kiocb_cancel()
Applying: aio-kiocb_cancel-fix
Applying: aio: move private stuff out of aio.h
Applying: aio: dprintk() -> pr_debug()
Applying: aio: do fget() after aio_get_req()
Applying: aio: make aio_put_req() lockless
Applying: aio: refcounting cleanup
Applying: wait: add wait_event_hrtimeout()
Applying: wait-add-wait_event_hrtimeout-fix
Applying: aio: make aio_read_evt() more efficient, convert to hrtimers
Applying: aio: use flush_dcache_page()
Applying: aio: use cancellation list lazily
Applying: aio-use-cancellation-list-lazily-fix
Applying: aio-use-cancellation-list-lazily-fix-fix
Applying: aio: change reqs_active to include unreaped completions
Applying: aio: kill batch allocation
Applying: aio: kill struct aio_ring_info
Applying: aio: give shared kioctx fields their own cachelines
Applying: aio-give-shared-kioctx-fields-their-own-cachelines-fix
Applying: aio: reqs_active -> reqs_available
Applying: aio: percpu reqs_available
Applying: generic dynamic per cpu refcounting
Applying: generic-dynamic-per-cpu-refcounting-fix
Applying: percpu-refcount: sparse fixes
Applying: generic-dynamic-per-cpu-refcounting-sparse-fixes-fix
Applying: generic-dynamic-per-cpu-refcounting-doc
Applying: generic-dynamic-per-cpu-refcounting-doc-fix
Applying: aio: percpu ioctx refcount
Applying: aio: use xchg() instead of completion_lock
Applying: aio: don't include aio.h in sched.h
Applying: aio-dont-include-aioh-in-schedh-fix
Applying: aio-dont-include-aioh-in-schedh-fix-fix
Applying: aio-dont-include-aioh-in-schedh-fix-3
Applying: aio-dont-include-aioh-in-schedh-fix-3-fix
Applying: aio-dont-include-aioh-in-schedh-fix-3-fix-fix
Applying: aio: kill ki_key
Applying: aio: kill ki_retry
Applying: aio-kill-ki_retry-fix
Applying: aio-kill-ki_retry-fix-fix
Applying: block, aio: batch completion for bios/kiocbs
Applying: block-aio-batch-completion-for-bios-kiocbs-fix
Applying: block-aio-batch-completion-for-bios-kiocbs-fix-fix
Applying: block-aio-batch-completion-for-bios-kiocbs-fix-fix-fix
Applying: block-aio-batch-completion-for-bios-kiocbs-fix-fix-fix-fix
Applying: Fix build error due to bio_endio_batch
Applying: block-aio-batch-completion-for-bios-kiocbs-fix-fix-fix-fix-fix-fix
Applying: aio: Fix a null pointer deref in batch_complete_aio
Applying: virtio-blk: convert to batch completion
Applying: mtip32xx: convert to batch completion
Applying: aio: fix aio_read_events_ring() types
Applying: aio: document, clarify aio_read_events() and shadow_tail
Applying: kfifo: move kfifo.c from kernel/ to lib/
Applying: kfifo: fix kfifo_alloc() and kfifo_init()
Applying: hlist: drop the node parameter from iterators
CONFLICT (content): Merge conflict in arch/x86/kvm/mmu.c
Applying: hlist-drop-the-node-parameter-from-iterators-fix
Applying: hlist-drop-the-node-parameter-from-iterators-fix-fix
Applying: hlist-drop-the-node-parameter-from-iterators-fix-fix-fix
Merging akpm/master (f66cce2 hlist-drop-the-node-parameter-from-iterators-fix-fix-fix)

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

^ permalink raw reply	[flat|nested] 12+ messages in thread
* linux-next: Tree for Feb 7
@ 2014-02-07  2:59 Stephen Rothwell
  0 siblings, 0 replies; 12+ messages in thread
From: Stephen Rothwell @ 2014-02-07  2:59 UTC (permalink / raw)
  To: linux-next; +Cc: linux-kernel

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

Hi all,

This tree fails (more than usual) the powerpc allyesconfig build.

Changes since 20140206:

The powerpc tree still had its build failure.

The fscache tree lost its build failure.

Non-merge commits (relative to Linus' tree): 1282
 1074 files changed, 39290 insertions(+), 14175 deletions(-)

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

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

You can see which trees have been included by looking in the Next/Trees
file in the source.  There are also quilt-import.log and merge.log files
in the Next directory.  Between each merge, the tree was built with
a ppc64_defconfig for powerpc and an allmodconfig for x86_64 and a
multi_v7_defconfig for arm. After the final fixups (if any), it is also
built with powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig and
allyesconfig (minus CONFIG_PROFILE_ALL_BRANCHES - this fails its final
link) and i386, sparc, sparc64 and arm defconfig. These builds also have
CONFIG_ENABLE_WARN_DEPRECATED, CONFIG_ENABLE_MUST_CHECK and
CONFIG_DEBUG_INFO disabled when necessary.

Below is a summary of the state of the merge.

I am currently merging 208 trees (counting Linus' and 28 trees of patches
pending for Linus' tree).

Stats about the size of the tree over time can be seen at
http://neuling.org/linux-next-size.html .

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

Thanks to Randy Dunlap for doing many randconfig builds.  And to Paul
Gortmaker for triage and bug fixes.

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

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

$ git checkout master
$ git reset --hard stable
Merging origin/master (9343224bfd4b Merge branch 'akpm' (patches from Andrew Morton))
Merging fixes/master (b0031f227e47 Merge tag 's2mps11-build' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator)
Merging kbuild-current/rc-fixes (38dbfb59d117 Linus 3.14-rc1)
Merging arc-current/for-curr (7e22e91102c6 Linux 3.13-rc8)
Merging arm-current/fixes (d326b65c57d6 ARM: fix building with gcc 4.6.4)
Merging m68k-current/for-linus (56931d73697c m68k/mac: Make SCC reset work more reliably)
Merging metag-fixes/fixes (3b2f64d00c46 Linux 3.11-rc2)
Merging powerpc-merge/merge (b3084f4db3ae powerpc/thp: Fix crash on mremap)
Merging sparc/master (9b0cd304f26b Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux)
Merging net/master (028b86b7671d Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jesse/openvswitch)
Merging ipsec/master (965cdea82569 dccp: catch failed request_module call in dccp_probe init)
Merging sound-current/for-linus (276ab336b4c6 ALSA: hda - Improve loopback path lookups for AD1983)
Merging pci-current/for-linus (38dbfb59d117 Linus 3.14-rc1)
Merging wireless/master (348f7d4adee9 rtl8180: Add error check for pci_map_single return value in TX path)
Merging driver-core.current/driver-core-linus (da9846ae1518 kernfs: make kernfs_deactivate() honor KERNFS_LOCKDEP flag)
Merging tty.current/tty-linus (38dbfb59d117 Linus 3.14-rc1)
Merging usb.current/usb-linus (7f196caffbf2 usb: core: Fix potential memory leak adding dyn USBdevice IDs)
Merging staging.current/staging-linus (5a819ed6d4bb staging: imx-drm: Fix build error)
Merging char-misc.current/char-misc-linus (38dbfb59d117 Linus 3.14-rc1)
Merging input-current/for-linus (55df811f2066 Merge branch 'next' into for-linus)
Merging md-current/for-linus (d47648fcf061 raid5: avoid finding "discard" stripe)
Merging crypto-current/master (ee97dc7db4cb crypto: s390 - fix des and des3_ede ctr concurrency issue)
Merging ide/master (9b0cd304f26b Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux)
Merging dwmw2/master (5950f0803ca9 pcmcia: remove RPX board stuff)
Merging devicetree-current/devicetree/merge (6f041e99fc7b of: Fix NULL dereference in unflatten_and_copy())
Merging rr-fixes/fixes (7122c3e9154b scripts/link-vmlinux.sh: only filter kernel symbols for arm)
Merging mfd-fixes/master (73beb63d290f mfd: rtsx_pcr: Disable interrupts before cancelling delayed works)
Merging vfio-fixes/for-linus (239a87020b26 Merge branch 'for-joerg/arm-smmu/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into for-linus)
Merging drm-intel-fixes/for-linux-next-fixes (bdde5c6a258a drm/i915: demote opregion excessive timeout WARN_ONCE to DRM_INFO_ONCE)
Merging asm-generic/master (fb9de7ebc3a2 xtensa: Use generic asm/mmu.h for nommu)
Merging arc/for-next (36dd18037119 ARC: add uImage to .gitignore)
Merging arm/for-next (58b9ef24dc72 Merge branch 'cubox-i-init' into for-next)
Merging arm-perf/for-next/perf (38dbfb59d117 Linus 3.14-rc1)
Merging arm-soc/for-next (034b5c9ffc37 Merge branch 'fixes' into for-next)
Merging bcm2835/for-next (413541dd66d5 Linux 3.13-rc5)
Merging cortex-m/for-next (f41bfc9423aa Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4)
Merging ep93xx/ep93xx-for-next (bfb0709fd17b Merge branch 'ep93xx-fixes' into ep93xx-for-next)
Merging imx-mxs/for-next (059c95a47b13 Merge branch 'imx/dt' into for-next)
Merging ixp4xx/next (19f949f52599 Linux 3.8)
Merging msm/for-next (81cf1e061d00 ARM: msm: Rename msm devicetrees to have standard 'qcom' prefix)
Merging mvebu/for-next (bc25862ad270 Merge branch 'old/mvebu/irqchip' into for-next)
Merging renesas/next (0bd47d940e3d Merge branches 'heads/defconfig-for-v3.15', 'heads/soc-for-v3.15', 'heads/boards-for-v3.15' and 'heads/dt-for-v3.15' into devel)
Merging samsung/for-next (8109c477487a Merge branch 'v3.14-next/dt-exynos-3' into for-next)
Merging tegra/for-next (02a2aa6f9a90 Merge branch for-3.15/defconfig into for-next)
Merging arm64/for-next/core (38dbfb59d117 Linus 3.14-rc1)
Merging blackfin/for-linus (58095fdaaf1c From: Eunbong Song <eunb.song@samsung.com>)
Merging c6x/for-linux-next (546153d75a48 c6x: fix build failure caused by cache.h)
Merging cris/for-next (cd065a010a97 CRISv10: Readd missing header)
Merging hexagon/linux-next (44eb66c228fe Hexagon: update CR year for elf.h)
Merging ia64/next (d52eefb47d4e ia64/xen: Remove Xen support for ia64)
Merging m68k/for-next (56931d73697c m68k/mac: Make SCC reset work more reliably)
Merging m68knommu/for-next (72a8ab3cb2a5 m68knommu: fix arg types for outs* functions)
Merging metag/for-next (e9a1d0165bbd metag/smp: Make boot_secondary() static)
Merging microblaze/next (2984128fc4f5 microblaze: Define readq and writeq IO helper function)
Merging mips/mips-for-linux-next (22146fb03c00 Merge branch '3.14-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 (38dbfb59d117 Linus 3.14-rc1)
Merging powerpc/next (f878f84373ae powerpc: Wire up sched_setattr and sched_getattr syscalls)
Merging mpc5xxx/next (bc7505942233 powerpc/512x: dts: add MPC5125 clock specs)
Merging galak/next (9e2ecdbba3b0 powerpc/fsl-booke: add the reg prop for pci bridge device node for T4/B4)
Merging s390/features (05bb2956f28f s390/kvm: set guest page states to stable on re-ipl)
Merging sparc-next/master (049ffa8ab33a Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux)
Merging tile/master (5e01dc7b26d9 Linux 3.12)
Merging uml/next (989e59fa41c5 um: Include generic barrier.h)
CONFLICT (content): Merge conflict in arch/um/include/asm/Kbuild
Merging unicore32/unicore32 (c284464658ac arch/unicore32: remove CONFIG_EXPERIMENTAL)
Merging xtensa/for_next (c0e50d41126e xtensa: fix fast_syscall_spill_registers)
Merging btrfs/next (cf93da7bcf45 Btrfs: fix spin_unlock in check_ref_cleanup)
Merging ceph/master (125d725c9235 ceph: cast PAGE_SIZE to size_t in ceph_sync_write())
Merging cifs/for-next (04a50c7a79ab [CIFS] retrieving CIFS ACLs when mounted with SMB2 fails  dropping session)
Merging configfs/linux-next (b930c26416c4 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs)
Merging ecryptfs/next (9e78d14a9f64 Use %pd in eCryptFS)
Merging ext3/for_next (4ea7772f828a udf: Fix lockdep warning from udf_symlink())
Merging ext4/dev (d7092ae2973f ext4: delete "set but not used" variables)
Merging f2fs/dev (e964751c67f1 f2fs: fix f2fs_write_meta_page at no checkpoint status)
Merging fscache/fscache (fe02fb3ec109 FS-Cache: Handle removal of unadded object to the fscache_object_list rb tree)
Merging fuse/for-next (b2ec2778df9d fuse: Turn writeback cache on)
Merging gfs2/master (a0846a534c5f GFS2: Lock i_mutex and use a local gfs2_holder for fallocate)
Merging jfs/jfs-next (0439e091e3b1 jfs: fix xattr value size overflow in __jfs_setxattr)
Merging logfs/master (339466142b3f Fix the call to BUG() caused by no free segment found)
Merging nfs/linux-next (ef42c58a5b4b Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip)
Merging nfsd/nfsd-next (ed47b062ce95 nfsd: consider CLAIM_FH when handing out delegation)
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 (38dbfb59d117 Linus 3.14-rc1)
Merging ubifs/linux-next (5547fec74a56 UBI: fix some use after free bugs)
Merging xfs/for-next (7c71ee78031c xfs: allow logical-sector sized O_DIRECT)
Merging file-private-locks/linux-next (1ed1950c412f locks: add new fcntl cmd values for handling file private locks)
Merging vfs/for-next (527d1511310a Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc)
Merging pci/next (17f2d86f5d53 Merge branch 'pci/numa-cleanup' into next)
Merging hid/for-next (f1523dbb7e90 Merge branch 'for-3.15/sony' into for-next)
Merging i2c/i2c/for-next (9b0cd304f26b Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux)
Merging jdelvare-hwmon/master (4fada9bfd39d hwmon: (lm80) Convert to use devm_hwmon_device_register_with_groups)
Merging hwmon-staging/hwmon-next (c9e6f67cddae hwmon: Driver for Linear Technologies LTC2945)
Merging v4l-dvb/master (b215621049bd Merge branch 'v4l_for_linus' into to_next)
Merging kbuild/for-next (ff6b9bdb6263 Merge branch 'kbuild/misc' into kbuild/for-next)
Merging kconfig/for-next (95edca5c523c localmodconfig: Add config depends by default settings)
Merging libata/for-next (efb9e0f4f437 ata: enable quirk from jmicron JMB350 for JMB394)
Merging pm/linux-next (642a859e8c2e Merge branch 'acpi-pci-hotplug-next' into linux-next)
Merging idle/next (2d6e532279dd tools/power turbostat: simplify output, add Avg_MHz)
Merging apm/for-next (158204397034 apm-emulation: add hibernation APM events to support suspend2disk)
Merging cpupowerutils/master (f16603386b38 cpupower tools: add install target to the debug tools' makefiles)
Merging thermal/next (262afa97587b Merge branches 'soc-eduardo', 'soc', 'misc' and 'int3404-thermal' of .git into next)
CONFLICT (content): Merge conflict in drivers/thermal/Kconfig
Merging ieee1394/for-next (fcd46b34425d firewire: Enable remote DMA above 4 GB)
Merging dlm/next (ece35848c184 dlm: set zero linger time on sctp socket)
Merging swiotlb/linux-next (0cb637bff80d swiotlb: Don't DoS us with 'swiotlb buffer is full' (v2))
Merging slave-dma/next (38dbfb59d117 Linus 3.14-rc1)
Merging dmaengine/next (77873803363c net_dma: mark broken)
Merging net-next/master (77d143de7581 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml)
Merging ipsec-next/master (abfce3ef58b6 sctp: remove the unnecessary assignment)
Merging wireless-next/master (38dbfb59d117 Linus 3.14-rc1)
Merging bluetooth/master (e3719086ff57 Bluetooth: Use connection parameters if any)
Merging infiniband/for-next (fb1b5034e498 Merge branch 'ip-roce' into for-next)
Merging mtd/master (0e47c969c65e Merge tag 'for-linus-20140127' of git://git.infradead.org/linux-mtd)
Merging l2-mtd/master (87a8b7ea1e3f mtd: nand: don't use read_buf for 8-bit ONFI transfers)
Merging crypto/master (79ba451d66ca crypto: aesni - fix build on x86 (32bit))
Merging drm/drm-next (ef64cf9d0604 Merge branch 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-next)
Merging drm-intel/for-linux-next (1f70999f9052 drm/i915: Prevent recursion by retiring requests when the ring is full)
Merging drm-tegra/drm/for-next (13411ddd3190 drm/tegra: Obtain head number from DT)
Merging sound/for-next (3e887f379d8a ALSA: hda - Add mute LED support to Lenovo Ideapad)
Merging sound-asoc/for-next (cd0409a8d21e Merge remote-tracking branches 'asoc/topic/rcar', 'asoc/topic/samsung', 'asoc/topic/simple', 'asoc/topic/tlv320aic32x4' and 'asoc/topic/wm8962' into asoc-next)
Merging modules/modules-next (22e669568d51 module: Add missing newline in printk call.)
Merging virtio/virtio-next (05c54de8c88c drivers: virtio: Mark function virtballoon_migratepage() as static in virtio_balloon.c)
Merging input/next (50fe03da82b4 Input: uinput - add UI_GET_SYSNAME ioctl to retrieve the sysfs path)
Merging input-mt/for-next (5e01dc7b26d9 Linux 3.12)
Merging cgroup/for-next (0a6be6555302 nfs: include xattr.h from fs/nfs/nfs3proc.c)
Merging block/for-next (2a53fee6859b Merge branch 'for-3.14/core' into for-next)
Merging device-mapper/for-next (d3cd022521ed dm thin: avoid metadata commit if a pool's thin devices haven't changed)
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 (38dbfb59d117 Linus 3.14-rc1)
Merging kgdb/kgdb-next (6bedf31c25dd kdb: Remove unhandled ssb command)
Merging slab/for-next (26e4f2057516 slub: Fix possible format string bug.)
Merging uclinux/for-next (6dbe51c251a3 Linux 3.9-rc1)
Merging md/for-next (1877db75589a md/raid1: restore ability for check and repair to fix read errors.)
Merging mfd/master (90b128ed1557 Merge tag 'mfd-lee-3.13-3' of git://git.linaro.org/people/ljones/mfd)
Merging mfd-lj/for-mfd-next (4d0621451ff2 mfd: wm5110: Make additional DSP registers available to the user)
Merging battery/master (ac323d8d8070 power: max17040: Fix NULL pointer dereference when there is no platform_data)
Merging fbdev/for-next (718b90ac4c21 video: xilinxfb: Simplify error path)
Merging viafb/viafb-next (838ac785d521 viafb: avoid refresh and mode lookup in set_par)
Merging omap_dss2/for-next (cb1fbad7ec25 Merge branches '3.14/fbdev', '3.14/dss-misc' and '3.14/dss-fclk' into for-next)
Merging regulator/for-next (6a7c3c7acac9 Merge remote-tracking branches 'regulator/topic/gpio', 'regulator/topic/max14577', 'regulator/topic/ti-abb' and 'regulator/topic/tps6507x' into regulator-next)
Merging security/next (29707b206c51 security: replace strict_strto*() with kstrto*())
Merging selinux/next (81c94e76ce8e selinux: fix the output of ./scripts/get_maintainer.pl for SELinux)
Merging lblnet/master (07bc9dc1b01b Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc)
Merging watchdog/master (135d65c3b5d3 watchdog: dw_wdt: Add dependency on HAS_IOMEM)
Merging dwmw2-iommu/master (e5d0c874391a Merge tag 'iommu-updates-v3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu)
Merging iommu/next (dd1a175695ed Merge branches 'arm/smmu', 'core', 'x86/vt-d', 'arm/shmobile', 'x86/amd', 'ppc/pamu', 'iommu/fixes' and 'arm/msm' into next)
Merging vfio/next (3be3a074cf5b vfio-pci: Don't use device_lock around AER interrupt setup)
Merging osd/linux-next (19350e7627a6 exofs: Print less in r4w)
Merging jc_docs/docs-next (5c050fb96380 docs: update the development process document)
Merging trivial/for-next (8cc7212a0361 idr: remove unused prototype of idr_free())
Merging audit/master (f3411cb2b2e3 audit: whitespace fix in kernel-parameters.txt)
Merging fsnotify/for-next (1ca39ab9d21a inotify: automatically restart syscalls)
Merging devicetree/devicetree/next (b66548e2a9ba of: Increase MAX_PHANDLE_ARGS)
Merging dt-rh/for-next (860a445c25aa DT: Add vendor prefix for Spansion Inc.)
Merging spi/for-next (fb1295f7c9f3 Merge remote-tracking branches 'spi/topic/pl022', 'spi/topic/rspi', 'spi/topic/samsung', 'spi/topic/sc18is602', 'spi/topic/sirf', 'spi/topic/sunxi', 'spi/topic/tegra114' and 'spi/topic/xfer' into spi-next)
Merging tip/auto-latest (96c7b29d3cf6 Merge branch 'x86/x32')
Merging clockevents/clockevents/next (00e2bcd6d35f clocksource: Timer-sun5i: Switch to sched_clock_register())
Merging edac/linux_next (3e45588825c1 cell_edac: fix missing of_node_put)
Merging edac-amd/for-next (881f0fcef999 EDAC: Don't try to cancel workqueue when it's never setup)
Merging ftrace/for-next (3132e107d608 tracing: Check if tracing is enabled in trace_puts())
Merging rcu/rcu/next (98cbc61863d3 Merge commit '0d3c55bc9fd58393bd3bd9974991ec1f815e1326' into HEAD)
Merging uprobes/for-next (0326f5a94dde uprobes/core: Handle breakpoint and singlestep exceptions)
Merging kvm/linux-next (b73117c49364 Merge branch 'kvm-ppc-next' of git://github.com/agraf/linux-2.6 into kvm-queue)
Merging kvm-arm/kvm-arm-next (b73117c49364 Merge branch 'kvm-ppc-next' of git://github.com/agraf/linux-2.6 into kvm-queue)
Merging kvm-ppc/kvm-ppc-next (b73117c49364 Merge branch 'kvm-ppc-next' of git://github.com/agraf/linux-2.6 into kvm-queue)
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 (afca50132cfa xen/pvh: set CR4 flags for APs)
Merging percpu/for-next (d5f2deed588b Merge branch 'for-3.14' into for-next)
Merging workqueues/for-next (9af16df84f0c Merge branch 'for-3.14' into for-next)
Merging drivers-x86/linux-next (b4b0b4a9e039 ipc: add intel-mid's pci id macros)
Merging chrome-platform/for-next (2b8454a75b90 platform/chrome: unregister platform driver/device when module exit)
Merging sysctl/master (4e474a00d7ff sysctl: protect poll() in entries that may go away)
Merging regmap/for-next (f37d0b3b106a Merge remote-tracking branch 'regmap/topic/irq' into regmap-next)
Merging hsi/for-next (43139a61fc68 HSI: hsi_char: Update ioctl-number.txt)
Merging leds/for-next (59e35a9e5315 drivers/leds: delete non-required instances of include <linux/init.h>)
Merging driver-core/driver-core-next (38dbfb59d117 Linus 3.14-rc1)
Merging tty/tty-next (38dbfb59d117 Linus 3.14-rc1)
Merging usb/usb-next (823d12c95c66 usb-storage: enable multi-LUN scanning when needed)
Merging usb-gadget/next (836a2164491b usb: phy: keystone: remove redundant return value check of platform_get_resource())
Merging staging/staging-next (38dbfb59d117 Linus 3.14-rc1)
Merging char-misc/char-misc-next (38dbfb59d117 Linus 3.14-rc1)
Merging scsi/for-next (3ce438df1068 [SCSI] hpsa: allow SCSI mid layer to handle unit attention)
Merging target-updates/for-next (5259a06ef970 target: Fix percpu_ref_put race in transport_lun_remove_cmd)
Merging target-merge/for-next-merge (374b105797c3 Linux 3.13-rc3)
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 (5b232c5addc0 pinctrl: tegra: return correct error type)
Merging vhost/linux-next (d3d665a654a3 vhost-scsi: whitespace tweak)
Merging remoteproc/for-next (b9777859ec01 remoteproc: fix kconfig dependencies for VIRTIO)
Merging rpmsg/for-next (397944df3290 rpmsg: fix kconfig dependencies for VIRTIO)
Merging gpio/for-next (a3485d088516 gpio: consumer.h: Move forward declarations outside #ifdef)
Merging dma-mapping/dma-mapping-next (5e01dc7b26d9 Linux 3.12)
Merging pwm/for-next (6691a19966f0 pwm: tiecap: Remove duplicate put_sync call)
Merging dma-buf/for-next (f546ca46faa1 dma-buf: update debugfs output)
Merging userns/for-next (f58437f1f916 MIPS: VPE: Remove vpe_getuid and vpe_getgid)
Merging ktest/for-next (961d9caceea2 ktest: Add BISECT_TRIES to bisect test)
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 (fd3fdaf09f26 clk: sort Makefile)
Merging random/dev (a9f069e38cc3 random: use the architectural HWRNG for the SHA's IV in extract_buf())
Merging lzo-update/lzo-update (42b775abafaf lib/lzo: huge LZO decompression speedup on ARM by using unaligned access)
Merging arm64-hugepages/for-next/hugepages (af07484863e0 ARM64: mm: THP support.)
Merging aio/master (8e321fefb0e6 aio/migratepages: make aio migrate pages sane)
Merging akpm-current/current (1fc69fa0b91f drivers/misc/sgi-gru/grukdump.c: cleanup gru_dump_context() a little)
$ git checkout -b akpm remotes/origin/akpm/master
Applying: fs/udf/super.c: add __init to init_inodecache()
Applying: drivers/w1/w1_int.c: call put_device if device_register fails
Applying: arm: move arm_dma_limit to setup_dma_zone
Applying: mm: add strictlimit knob
Merging akpm/master (04bf9c82343f mm: add strictlimit knob)

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

^ permalink raw reply	[flat|nested] 12+ messages in thread
* linux-next: Tree for Feb 7
@ 2017-02-07  5:50 Stephen Rothwell
  0 siblings, 0 replies; 12+ messages in thread
From: Stephen Rothwell @ 2017-02-07  5:50 UTC (permalink / raw)
  To: linux-next; +Cc: linux-kernel

Hi all,

Changes since 20170206:

The tty tree lost its build failure.

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

Non-merge commits (relative to Linus' tree): 7711
 8737 files changed, 327880 insertions(+), 163014 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.

Below is a summary of the state of the merge.

I am currently merging 256 trees (counting Linus' and 37 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 (d5adbfcd5f7b Linux 4.10-rc7)
Merging fixes/master (30066ce675d3 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6)
Merging kbuild-current/rc-fixes (c7858bf16c0b asm-prototypes: Clear any CPP defines before declaring the functions)
Merging arc-current/for-curr (8ba605b607b7 ARC: [plat-*] ARC_HAS_COH_CACHES no longer relevant)
Merging arm-current/fixes (228dbbfb5d77 ARM: 8643/3: arm/ptrace: Preserve previous registers for short regset write)
Merging m68k-current/for-linus (ad595b77c4a8 m68k/atari: Use seq_puts() in atari_get_hardware_list())
Merging metag-fixes/fixes (35d04077ad96 metag: Only define atomic_dec_if_positive conditionally)
Merging powerpc-fixes/fixes (a0615a16f7d0 powerpc/mm: Use the correct pointer when setting a 2MB pte)
Merging sparc/master (f9a42e0d58cf Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc)
Merging fscrypt-current/for-stable (42d97eb0ade3 fscrypt: fix renaming and linking special files)
Merging net/master (b3f2d07f4649 hns: avoid stack overflow with CONFIG_KASAN)
Merging ipsec/master (4e5da369df64 Documentation/networking: fix typo in mpls-sysctl)
Merging netfilter/master (f95d7a46bc57 netfilter: ctnetlink: Fix regression in CTA_HELP processing)
Merging ipvs/master (045169816b31 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6)
Merging wireless-drivers/master (52f5631a4c05 rtlwifi: rtl8192ce: Fix loading of incorrect firmware)
Merging mac80211/master (fd551bac4795 nl80211: Fix mesh HT operation check)
Merging sound-current/for-linus (37a7ea4a9b81 ALSA: seq: Don't handle loop timeout at snd_seq_pool_done())
Merging pci-current/for-linus (77fbffc2aa09 Revert "PCI: pciehp: Add runtime PM support for PCIe hotplug ports")
Merging driver-core.current/driver-core-linus (49def1853334 Linux 4.10-rc4)
Merging tty.current/tty-linus (49def1853334 Linux 4.10-rc4)
Merging usb.current/usb-linus (d5adbfcd5f7b Linux 4.10-rc7)
Merging usb-gadget-fixes/fixes (efe357f4633a usb: dwc2: host: fix Wmaybe-uninitialized warning)
Merging usb-serial-fixes/usb-linus (d07830db1bdb USB: serial: pl2303: add ATEN device ID)
Merging usb-chipidea-fixes/ci-for-usb-stable (c7fbb09b2ea1 usb: chipidea: move the lock initialization to core file)
Merging phy/fixes (7ce7d89f4883 Linux 4.10-rc1)
Merging staging.current/staging-linus (d5adbfcd5f7b Linux 4.10-rc7)
Merging char-misc.current/char-misc-linus (d5adbfcd5f7b Linux 4.10-rc7)
Merging input-current/for-linus (601bbbe05173 Input: uinput - fix crash when mixing old and new init style)
Merging crypto-current/master (7c2cf1c4615c crypto: chcr - Fix key length for RFC4106)
Merging ide/master (da095587e6be Revert "ide: Fix interface autodetection in legacy IDE driver (trial #2)")
Merging vfio-fixes/for-linus (2da64d20a0b2 vfio/spapr: Fix missing mutex unlock when creating a window)
Merging kselftest-fixes/fixes (7738789fba09 selftests: x86/pkeys: fix spelling mistake: "itertation" -> "iteration")
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 (1a41741fd60b mfd: wm8994-core: Don't use managed regulator bulk get API)
Merging v4l-dvb-fixes/fixes (f9f96fc10c09 [media] cec: fix wrong last_la determination)
Merging drm-intel-fixes/for-linux-next-fixes (d5adbfcd5f7b Linux 4.10-rc7)
Merging drm-misc-fixes/for-linux-next-fixes (d5adbfcd5f7b Linux 4.10-rc7)
Merging kbuild/for-next (fde42bfcd232 genksyms: Regenerate parser)
Merging asm-generic/master (de4be6b87b6b asm-generic: page.h: fix comment typo)
CONFLICT (content): Merge conflict in include/asm-generic/percpu.h
Merging arc/for-next (d5adbfcd5f7b Linux 4.10-rc7)
Merging arm/for-next (1ba318e23204 Merge branches 'fixes' and 'misc' into for-next)
Merging arm-perf/for-next/perf (0c744ea4f77d Linux 4.10-rc2)
Merging arm-soc/for-next (bda50db88b8c Merge branch 'fixes' into for-next)
CONFLICT (content): Merge conflict in arch/arm/mach-ux500/platsmp.c
Merging amlogic/for-next (700501d48123 Merge v4.11/dt64)
Merging aspeed/for-next (ab15e12960f1 Merge branches 'defconfig-for-v4.11', 'soc-for-v4.11' and 'dt-for-v4.11' into for-next)
Merging at91/at91-next (e514f82c67c1 Merge tag 'at91-ab-4.11-dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into at91-next)
Merging bcm2835/for-next (8d6e1b09237b Merge branch anholt/bcm2835-dt-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 (57aba12f97c2 Merge branch 'zte/pm-domains' into for-next)
Merging keystone/next (9e07c85a01ec Merge branch 'for_4.11/keystone_dts' into next)
Merging mvebu/for-next (f8e8eda32b4a Merge branch 'mvebu/dt64' into mvebu/for-next)
Merging omap/for-next (bfdc40158227 Merge branch 'omap-for-v4.11/dt' into for-next)
Merging omap-pending/for-next (c20c8f750d9f ARM: OMAP2+: hwmod: fix _idle() hwmod state sanity check sequence)
Merging qcom/for-next (a844f941617c Merge tag 'qcom-arm64-for-4.11-2' into final-for-4.11)
Merging renesas/next (59fd3e06b3d7 Merge branches 'arm64-dt-for-v4.11', 'dt-for-v4.11' and 'soc-for-v4.11' into next)
Merging rockchip/for-next (0aab64671deb Merge branch 'v4.11-clk/next' into for-next)
Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2)
Merging samsung/for-next (1001354ca341 Linux 4.9-rc1)
Merging samsung-krzk/for-next (9689628ec120 Merge branch 'for-v4.11/drivers-soc-exynos-pmu-the-joy-never-ends' into for-next)
Merging tegra/for-next (6ef2dbf97439 Merge branch for-4.11/i2c into for-next)
Merging arm64/for-next/core (c0bfc549e962 perf: xgene: Include module.h)
Merging clk/clk-next (5775a4c76fbc Merge tag 'v4.11-rockchip-clk2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into clk-next)
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 (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 (ad595b77c4a8 m68k/atari: Use seq_puts() in atari_get_hardware_list())
Merging m68knommu/for-next (dd51779bf9a6 m68k/defconfig: amcore board defconfig tuning)
Merging metag/for-next (f5d163aad31e metag: perf: fix build on Meta1)
Merging microblaze/next (3400606d8ffd microblaze: Add new fpga families)
Merging mips/mips-for-linux-next (26eb4aa9a48a Merge branch '4.10-fixes' into mips-for-linux-next)
Merging nios2/for-next (744606c76c4a nios2: add screen_info)
Merging openrisc/for-next (07d7c4560b7a openrisc: head: Init r0 to 0 on start)
Merging parisc-hd/for-next (69973b830859 Linux 4.9)
Merging powerpc/next (98a5f361b862 powerpc: Add new cache geometry aux vectors)
CONFLICT (content): Merge conflict in arch/powerpc/Kconfig
Merging fsl/next (75b824727680 powerpc/8xx: Perf events on PPC 8xx)
Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc)
Merging s390/features (f83435c42ee6 s390/qdio: improve some debug prints)
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 (e61c10e468a4 sh: add device tree source for J2 FPGA on Mimas v2 board)
Merging tile/master (14e73e78ee98 tile: use __ro_after_init instead of tile-specific __write_once)
Merging uml/linux-next (f88f0bdfc32f um: UBD Improvements)
Merging unicore32/unicore32 (bc27113620ca unicore32-oldabi: add oldabi syscall interface)
Merging xtensa/xtensa-for-next (6e72293ab0e9 xtensa: fix noMMU build on cores with MMU)
Merging fscrypt/master (a5d431eff2e0 fscrypt: make fscrypt_operations.key_prefix a string)
Merging befs/for-next (f7b75aaed5ef befs: add NFS export support)
Merging btrfs/next (8b8b08cbfb90 Btrfs: fix delalloc accounting after copy_from_user faults)
Merging btrfs-kdave/for-next (be449cc159bc Merge branch 'for-next-current-v4.10-20170203' into for-next-20170203)
Merging ceph/master (6df8c9d80a27 ceph: fix bad endianness handling in parse_reply_info_extra)
Merging cifs/for-next (ae6f8dd4d0c8 CIFS: Allow to switch on encryption with seal mount option)
Merging configfs/for-next (e16769d4bca6 fs: configfs: don't return anything from drop_link)
Merging ecryptfs/next (be280b25c328 ecryptfs: remove private bin2hex implementation)
Merging ext3/for_next (a074faad5126 udf: simplify udf_ioctl())
Merging ext4/dev (49a02bea2ca6 ext4: add EXT4_IOC_GOINGDOWN ioctl)
Merging f2fs/dev (71686e7197bf f2fs: call internal __write_data_page directly)
Merging freevxfs/for-next (bf1bb4b460c8 freevxfs: update Kconfig information)
Merging fscache/fscache (d52bd54db8be Merge branch 'akpm' (patches from Andrew))
Merging fuse/for-next (210675270caa fuse: fix time_to_jiffies nsec sanity check)
Merging gfs2/for-next (c548a1c17560 gfs2: Make gfs2_write_full_page static)
Merging jfs/jfs-next (362ad5d58e9a fs: jfs: Replace CURRENT_TIME_SEC by current_time())
Merging nfs/linux-next (d5adbfcd5f7b Linux 4.10-rc7)
Merging nfsd/nfsd-next (b88009210932 NFSDv4: use export cache flushtime for changeid on V4ROOT objects.)
Merging orangefs/for-next (9a2f47943781 orangefs: Dan Carpenter influenced cleanups...)
Merging overlayfs/overlayfs-next (97e147358bea vfs: wrap write f_ops with file_{start,end}_write())
Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock)
Merging ubifs/linux-next (1cb51a15b576 ubifs: Fix journal replay wrt. xattr nodes)
Merging xfs/for-next (e0d76fa4475e xfs: prevent quotacheck from overloading inode lru)
Merging file-locks/linux-next (07d9a380680d Linux 4.9-rc2)
Merging vfs/for-next (59479ae85e43 Merge branches 'work.sendmsg' and 'work.splice-net' into for-next)
CONFLICT (content): Merge conflict in drivers/block/nbd.c
Merging vfs-jk/vfs (030b533c4fd4 fs: Avoid premature clearing of capabilities)
Merging vfs-miklos/next (69973b830859 Linux 4.9)
Merging printk/for-next (0e91b7706038 printk: drop call_console_drivers() unused param)
Merging pci/next (83a96ebd0efa Merge branch 'pci/host-thunder' into next)
Merging pstore/for-next/pstore (0c744ea4f77d Linux 4.10-rc2)
Merging hid/for-next (88128caee0fc Merge branch 'for-4.10/upstream-fixes' into for-next)
Merging i2c/i2c/for-next (f4d9f6fbbf57 Merge branch 'i2c/for-current' 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 (0c744ea4f77d Linux 4.10-rc2)
Merging hwmon-staging/hwmon-next (646933284e46 DT: add binding documentation for STTS751)
Merging jc_docs/docs-next (dc36143fba93 docs: Remove the copyright year from conf.py)
Merging v4l-dvb/master (47b037a0512d [media] v4l2-async: failing functions shouldn't have side effects)
Merging v4l-dvb-next/master (2437eec568ae Merge branch 'patchwork' into to_next)
Merging fbdev/fbdev-for-next (561eb9d09a93 fbdev: omap/lcd: Make callbacks optional)
Merging pm/linux-next (fd4c9e3a71b4 Merge branch 'pm-core-fixes' into linux-next)
CONFLICT (content): Merge conflict in arch/mips/configs/lemote2f_defconfig
Merging idle/next (306899f94804 x86 tsc: Add the Intel Denverton Processor to native_calibrate_tsc())
Merging thermal/next (7b09ae6042cd Merge branches 'ida-conversion' and 'for-rc' into next)
Merging thermal-soc/next (4f47aff5201c Merge branch 'work-linus' into work-next)
Merging ieee1394/for-next (72f3c27aa646 firewire: net: max MTU off by one)
Merging dlm/next (aa9f1012858b dlm: don't specify WQ_UNBOUND for the ast callback workqueue)
Merging swiotlb/linux-next (f1225ee4c8fc swiotlb-xen: update dev_addr after swapping pages)
Merging net-next/master (9172d2a026f9 Merge branch 'dsa-add-fabric-notifier')
CONFLICT (content): Merge conflict in drivers/net/hyperv/netvsc.c
Applying: smc: merge fix for "switch socket ->splice_read() to struct file *"
Merging ipsec-next/master (62e13097c46c net: phy: broadcom: rehook BCM54612E specific init)
Merging netfilter-next/master (6e7bc478c9a0 net: skb_needs_check() accepts CHECKSUM_NONE for tx)
Merging ipvs-next/master (8d8e20e2d7bb ipvs: Decrement ttl)
Merging wireless-drivers-next/master (36401cb7ffae brcmfmac: be more verbose when PSM's watchdog fires)
Merging bluetooth/master (264e6777f958 Merge branch 'netvsc-enhancements')
Merging mac80211-next/master (228c8c6b1f43 wireless: define cipher/AKM suites using a macro)
Merging rdma/for-next (24dc831b77ec IB/core: Add inline function to validate port)
Merging rdma-leon/rdma-next (69e8baab7757 Merge branch 'topic/core-for-4.11' into rdma-next)
Merging rdma-leon-test/testing/rdma-next (a909d3e63699 Linux 4.9-rc3)
Merging mtd/master (5bdee5496978 Merge tag 'nand/fixes-for-4.10-rc3' of github.com:linux-nand/linux)
Merging l2-mtd/master (5bdee5496978 Merge tag 'nand/fixes-for-4.10-rc3' of github.com:linux-nand/linux)
Merging nand/nand/next (a4077ce58713 mtd: nand: Add Winbond manufacturer id)
Merging spi-nor/next (dc12bcccadaf mtd: spi-nor: cqspi: remove redundant dead code on error return check)
Merging crypto/master (1a20b9661265 crypto: arm/aes - don't use IV buffer to return final keystream block)
Merging drm/drm-next (99743ae4c5f5 Merge branch 'drm-etnaviv-next' of https://git.pengutronix.de/git/lst/linux into drm-next)
CONFLICT (content): Merge conflict in lib/Kconfig
CONFLICT (content): Merge conflict in include/drm/drm_connector.h
CONFLICT (content): Merge conflict in include/drm/drm_atomic.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_sprite.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_fbc.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_display.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_drv.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_connector.c
Merging drm-panel/drm/panel/for-next (eaeebffa90f3 drm/panel: simple: Specify bus width and flags for EDT displays)
Merging drm-intel/for-linux-next (18566acac18f Merge branch 'exynos-drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into drm-next)
Merging drm-tegra/drm/tegra/for-next (7b1d4185050d gpu: host1x: Set OF node for new host1x devices)
Merging drm-misc/for-linux-next (bb18dfcc640d drm: kselftest for drm_mm and bottom-up allocation)
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 (21c42da18ef1 drm/msm: return -EFAULT if copy_from_user() fails)
Merging hdlcd/for-upstream/hdlcd (747e5a5ff2a2 drm: hdlcd: Fix cleanup order)
Merging mali-dp/for-upstream/mali-dp (83d642ee6dbe drm: mali-dp: fix stride setting for multi-plane formats)
Merging sunxi/sunxi/for-next (e24f5ead1d61 Merge branch 'sunxi/dt64-for-4.11' into sunxi/for-next)
CONFLICT (content): Merge conflict in arch/arm/boot/dts/sun7i-a20-olinuxino-lime2-emmc.dts
Merging kspp/for-next/kspp (ffa3140e4264 initify: Mark functions with the __unverified_nocapture attribute)
Merging kconfig/for-next (5bcba792bb30 localmodconfig: Fix whitespace repeat count after "tristate")
Merging regmap/for-next (bbbed1951704 Merge remote-tracking branches 'regmap/topic/doc' and 'regmap/topic/rbtree' into regmap-next)
Merging sound/for-next (e1b239f371c0 ALSA: x86: Refactor PCM process engine)
Merging sound-asoc/for-next (dd687adea61b Merge remote-tracking branches 'asoc/topic/wm0010', 'asoc/topic/wm8731', 'asoc/topic/wm8741', 'asoc/topic/wm8753' and 'asoc/topic/zte' into asoc-next)
Merging modules/modules-next (1f318a8bafcf modules: mark __inittest/__exittest as __maybe_unused)
Merging input/next (d5e6e0fa442a Merge branch 'synaptics-rmi4' into next)
Merging block/for-next (d8be8b7ee23a Merge branch 'master' into for-next)
CONFLICT (content): Merge conflict in drivers/block/nbd.c
Merging lightnvm/for-next (e57ef816cf77 Merge branch 'for-4.11/block' into for-next)
Merging device-mapper/for-next (f5b0cba8f239 dm crypt: replace RCU read-side section with rwsem)
Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards)
Merging mmc/next (0c3630150c9a mmc: core: start to break apart mmc_start_areq())
Merging kgdb/kgdb-next (7a6653fca500 kdb: Fix handling of kallsyms_symbol_next() return value)
Merging md/for-next (670a4a570c0c md: ensure md devices are freed before module is unloaded.)
Merging mfd/for-mfd-next (197ac6d28fce MAINTAINERS: Add include/dt-bindings/mfd to MFD entry)
Merging backlight/for-backlight-next (0c9501f823a4 backlight: pwm_bl: Handle gpio that can sleep)
Merging battery/for-next (744cc304a18f power: supply: add AC power supply driver for AXP20X and AXP22X PMICs)
Merging omap_dss2/for-next (c456a2f30de5 video: smscufx: remove unused variable)
Merging regulator/for-next (a7f1a67a2919 Merge remote-tracking branches 'regulator/topic/s2mpa01', 'regulator/topic/supplies' and 'regulator/topic/tps65217' into regulator-next)
Merging security/next (70ea163699b6 tpm: silence an array overflow warning)
Merging integrity/next (20f482ab9e0f ima: allow to check MAY_APPEND)
Merging keys/keys-next (ed51e44e914c Merge branch 'keys-asym-keyctl' into keys-next)
Merging selinux/next (3a2f5a59a695 security,selinux,smack: kill security_task_wait hook)
Applying: selinux: merge fix for "smc: establish new socket family"
Merging tpmdd/next (70ea163699b6 tpm: silence an array overflow warning)
Merging watchdog/master (7ce7d89f4883 Linux 4.10-rc1)
Merging iommu/next (0e4b8ec58c3d Merge branches 'iommu/fixes', 'arm/exynos', 'arm/renesas', 'arm/smmu', 'arm/mediatek', 'arm/core', 'x86/vt-d' and 'core' into next)
Merging dwmw2-iommu/master (910170442944 iommu/vt-d: Fix PASID table allocation)
Merging vfio/next (2b8bb1d771f7 vfio iommu type1: Fix size argument to vfio_find_dma() in pin_pages/unpin_pages)
Merging trivial/for-next (74dcba3589fc NTB: correct ntb_spad_count comment typo)
Merging audit/next (62bc306e2083 audit: log 32-bit socketcalls)
CONFLICT (content): Merge conflict in include/uapi/linux/audit.h
Merging devicetree/for-next (8cf4664332d3 dt-bindings: power: reset: qnap-poweroff: Drop reference to pm_power_off)
Merging mailbox/mailbox-for-next (db4d22c07e3e mailbox: mailbox-test: allow reserved areas in SRAM)
Merging spi/for-next (3f87493930a0 Merge remote-tracking branches 'spi/topic/s3c64xx', 'spi/topic/sh-msiof', 'spi/topic/slave' and 'spi/topic/topcliff-pch' into spi-next)
Merging tip/auto-latest (5bf728f02218 Merge branch 'x86/platform')
CONFLICT (content): Merge conflict in security/apparmor/include/apparmor.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/ttm/ttm_bo.c
Applying: locking/atomic, kref: merge fixup for code movement
Merging clockevents/clockevents/next (f947ee147e08 clocksource/drivers/arm_arch_timer: Map frame with of_io_request_and_map())
Merging edac/linux_next (9cae24b7b113 Merge commit 'daf34710a9e8849e04867d206692dc42d6d22263' into next)
CONFLICT (content): Merge conflict in drivers/edac/edac_pci.c
CONFLICT (content): Merge conflict in drivers/edac/edac_device.c
CONFLICT (content): Merge conflict in Documentation/00-INDEX
Merging edac-amd/for-next (321d17c19bf5 EDAC, mpc85xx: Add T2080 l2-cache support)
Merging irqchip/irqchip/for-next (88e20c74ee02 irqchip/mxs: Enable SKIP_SET_WAKE and MASK_ON_SUSPEND)
Merging ftrace/for-next (e704eff3ff51 ftrace: Have set_graph_function handle multiple functions in one write)
Merging rcu/rcu/next (40b1f8f7b57f rcu: Default RCU_FANOUT_LEAF to 16 unless explicitly changed)
CONFLICT (content): Merge conflict in net/netfilter/nf_conntrack_core.c
CONFLICT (content): Merge conflict in arch/powerpc/Kconfig
Applying: smc: merge fix for "mm: Rename SLAB_DESTROY_BY_RCU to SLAB_TYPESAFE_BY_RCU"
Merging kvm/linux-next (0b4c208d443b Revert "KVM: nested VMX: disable perf cpuid reporting")
Merging kvm-arm/next (49a81ab0e8c7 KVM: arm/arm64: Emulate the EL1 phys timer registers)
Merging kvm-mips/next (12ed1faece3f KVM: MIPS: Allow multiple VCPUs to be created)
Merging kvm-ppc/kvm-ppc-next (050f23390f6b KVM: PPC: Book3S HV: Advertise availablity of HPT resizing on KVM HV)
Merging kvms390/next (fb7dc1d4ddce KVM: s390: detect some program check loops)
Merging xen-tip/linux-next (4fed1b125eb6 xen/manage: correct return value check on xenbus_scanf())
Merging percpu/for-next (966d2b04e070 percpu-refcount: fix reference leak during percpu-atomic transition)
Merging workqueues/for-next (a45463cbf3f9 workqueue: avoid clang warning)
Merging drivers-x86/for-next (e3c1763c26c0 platform/x86: intel_mid_powerbtn: Unify IRQ acknowledegment)
Merging chrome-platform/for-next (31b764171cb5 Revert "platform/chrome: chromeos_laptop: Add Leon Touch")
Merging hsi/for-next (7ac5d7b1a125 HSI: hsi_char.h: use __u32 from linux/types.h)
Merging leds/for-next (8bb1de680dac tools/leds: Add led_hw_brightness_mon program)
Merging ipmi/for-next (c5afee1b0dfc acpi:ipmi: Make IPMI user handler const)
Merging driver-core/driver-core-next (64e90a8acb85 Introduce STATIC_USERMODEHELPER to mediate call_usermodehelper())
Merging usb/usb-next (7bddba775026 Merge 4.10-rc7 into usb-next)
Merging usb-gadget/next (e42a5dbb8a3d usb: dwc3: host: pass quirk-broken-port-ped property for known broken revisions)
Merging usb-serial/usb-next (16620b483eaf USB: serial: sierra: fix bogus alternate-setting assumption)
Merging usb-chipidea-next/ci-for-usb-next (753dfd23612d usb: chipidea: msm: Fix return value check in ci_hdrc_msm_probe())
Merging phy-next/next (0b10f64dbe60 phy: qcom-ufs: Fix misplaced jump label)
Merging tty/tty-next (8ee3fde04758 tty_port: register tty ports with serdev bus)
Merging char-misc/char-misc-next (17fa87fe5a51 Merge 4.10-rc7 into char-misc-next)
CONFLICT (content): Merge conflict in Documentation/driver-api/index.rst
Merging extcon/extcon-next (8ea227886002 extcon: arizona: Wait for any running HPDETs to complete on jack removal)
Merging staging/staging-next (a769f30c7bd7 Merge 4.10-rc7 into staging-next)
CONFLICT (modify/delete): drivers/staging/media/lirc/lirc_parallel.c deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/lirc/lirc_parallel.c left in tree.
$ git rm -f drivers/staging/media/lirc/lirc_parallel.c
Merging slave-dma/next (bd98fba52645 Merge branch 'for-linus' into next)
Merging cgroup/for-next (63f1ca59453a Merge branch 'cgroup/for-4.11-rdmacg' into cgroup/for-4.11)
Merging scsi/for-next (66043a3bcbce Merge branch 'misc' into for-next)
Applying: scsi: mpt3sas: fix up for "block: fold cmd_type into the REQ_OP_ space"
Merging scsi-mkp/for-next (a76037ff3479 scsi: pm8001: switch to pci_irq_alloc_vectors)
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 target-bva/for-next (d5443f08f8d2 target: Avoid that XCOPY commands trigger a deadlock)
Merging libata/for-next (428d57c1683a Merge branch 'for-4.11' into for-next)
Merging binfmt_misc/for-next (4af75df6a410 binfmt_misc: add F option description to documentation)
Merging vhost/linux-next (80363894995b virtio_mmio: expose header to userspace)
Merging rpmsg/for-next (5029eb953682 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
Merging gpio/for-next (e4df1ebdfeb4 Merge branch 'ib-gpiod-flags' into devel)
CONFLICT (content): Merge conflict in drivers/staging/greybus/gpio.c
Merging pinctrl/for-next (2039834c86f3 Merge branch 'devel' into for-next)
CONFLICT (content): Merge conflict in arch/arm/mach-exynos/suspend.c
Merging dma-mapping/dma-mapping-next (1001354ca341 Linux 4.9-rc1)
Merging pwm/for-next (4651209c75d1 Merge branch 'for-4.11/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 (1064f874abc0 mnt: Tuck mounts under others instead of creating shadow/side mounts.)
CONFLICT (content): Merge conflict in security/selinux/hooks.c
Merging ktest/for-next (2dcd0af568b0 Linux 4.6)
Merging random/dev (db61ffe3a71c random: move random_min_urandom_seed into CONFIG_SYSCTL ifdef block)
Merging aio/master (b562e44f507e Linux 4.5)
Merging kselftest/next (1e4c2830c369 selftest: cpufreq: Add special tests)
CONFLICT (content): Merge conflict in tools/testing/selftests/bpf/Makefile
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 (372e2db7210d livepatch: doc: remove the limitation for schedule() patching)
Merging coresight/next (7f12a0d4a674 coresight: STM: Balance enable/disable)
Merging rtc/rtc-next (4c6106406eb1 rtc: sun6i: Fix compatibility with old DT binding)
Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field)
Merging nvdimm/libnvdimm-for-next (bfb34527a32a libnvdimm, pfn: fix memmap reservation size versus 4K alignment)
Merging dax-misc/dax-misc (4d9a2c874667 dax: Remove i_mmap_lock protection)
Merging extable/extable (24bf9bdef929 module.h: remove extable.h include now users have migrated)
Merging idr/idr-4.11 (39272ecab724 radix-tree: Store a pointer to the root in each node)
Merging akpm-current/current (96ae48eba50d ipc/mqueue: add missing sparse annotation)
CONFLICT (content): Merge conflict in tools/testing/selftests/vm/Makefile
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_drv.h
$ git checkout -b akpm remotes/origin/akpm/master
Applying: fs: add i_blocksize()
Applying: truncate: use i_blocksize()
Applying: nilfs2: use nilfs_btree_node_size()
Applying: nilfs2: use i_blocksize()
Applying: scripts/spelling.txt: add "swith" pattern and fix typo instances
Applying: scripts/spelling.txt: add "swithc" pattern and fix typo instances
Applying: scripts/spelling.txt: add "an user" pattern and fix typo instances
Applying: scripts/spelling.txt: add "an union" pattern and fix typo instances
Applying: scripts/spelling.txt: add "an one" pattern and fix typo instances
Applying: scripts/spelling.txt: add "partiton" pattern and fix typo instances
Applying: scripts/spelling.txt: add "aligment" pattern and fix typo instances
Applying: scripts/spelling.txt: add "algined" pattern and fix typo instances
Applying: scripts/spelling.txt: add "efective" pattern and fix typo instances
Applying: scripts/spelling.txt: add "varible" pattern and fix typo instances
Applying: scripts/spelling.txt: add "embeded" pattern and fix typo instances
Applying: scripts/spelling.txt: add "againt" pattern and fix typo instances
Applying: scripts/spelling.txt: add "neded" pattern and fix typo instances
Applying: scripts/spelling.txt: add "unneded" pattern and fix typo instances
Applying: scripts/spelling.txt: add "intialization" pattern and fix typo instances
Applying: scripts/spelling.txt: add "initialiazation" pattern and fix typo instances
Applying: scripts/spelling.txt: add "intialise(d)" pattern and fix typo instances
Applying: scripts/spelling.txt: add "comsume(r)" pattern and fix typo instances
Applying: scripts/spelling.txt: add "disble(d)" pattern and fix typo instances
CONFLICT (content): Merge conflict in drivers/net/can/flexcan.c
Applying: scripts/spelling.txt: add "overide" pattern and fix typo instances
Applying: scripts/spelling.txt: add "overrided" pattern and fix typo instances
Applying: scripts/spelling.txt: add "configuartion" pattern and fix typo instances
Applying: scripts/spelling.txt: add "applys" pattern and fix typo instances
Applying: scripts/spelling.txt: add "explictely" pattern and fix typo instances
Applying: scripts/spelling.txt: add "omited" pattern and fix typo instances
Applying: scripts/spelling.txt: add "disassocation" pattern and fix typo instances
Applying: scripts/spelling.txt: add "deintialize(d)" pattern and fix typo instances
Applying: scripts/spelling.txt: add "overwritting" pattern and fix typo instances
Applying: scripts/spelling.txt: add "overwriten" pattern and fix typo instances
Applying: scripts/spelling.txt: add "therfore" pattern and fix typo instances
Applying: scripts/spelling.txt: add "followings" pattern and fix typo instances
Applying: scripts/spelling.txt: add some typo-words
Applying: lib/vsprintf.c: remove %Z support
Applying: checkpatch: warn when formats use %Z and suggest %z
Applying: checkpatchpl-warn-against-using-%z-fix
Applying: mm: add new mmgrab() helper
Applying: mm: add new mmget() helper
Applying: mm: use mmget_not_zero() helper
Applying: mm: clarify mm_struct.mm_{users,count} documentation
Merging akpm/master (fa37acc7426c mm: clarify mm_struct.mm_{users,count} documentation)

^ permalink raw reply	[flat|nested] 12+ messages in thread
* linux-next: Tree for Feb 7
@ 2018-02-07  4:12 Stephen Rothwell
  0 siblings, 0 replies; 12+ messages in thread
From: Stephen Rothwell @ 2018-02-07  4:12 UTC (permalink / raw)
  To: Linux-Next Mailing List; +Cc: Linux Kernel Mailing List

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

Hi all,

Please do not add any v4.17 material to your linux-next included branches
until after v4.16-rc1 has been released.

Changes since 20180206:

The btrfs-kdave tree gained conflicts against Linus' tree and a build
failure so I used the version from next-20180206.

The kvm tree gained a conflict against the arm64 tree.

The vhost tree gained a build failure so I used the version from
next-20180206.

Non-merge commits (relative to Linus' tree): 1216
 1208 files changed, 39489 insertions(+), 13744 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 256 trees (counting Linus' and 44 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 (b46dc8ae17a4 media: videobuf2: fix up for "media: annotate ->poll() instances")
Merging fixes/master (b46dc8ae17a4 media: videobuf2: fix up for "media: annotate ->poll() instances")
Merging kbuild-current/fixes (36c1681678b5 genksyms: drop *.hash.c from .gitignore)
Merging arc-current/for-curr (053823335956 arc: dts: use 'atmel' as manufacturer for at24 in axs10x_mb)
Merging arm-current/fixes (091f02483df7 ARM: net: bpf: clarify tail_call index)
Merging m68k-current/for-linus (2334b1ac1235 MAINTAINERS: Add NuBus subsystem entry)
Merging metag-fixes/fixes (b884a190afce metag/usercopy: Add missing fixups)
Merging powerpc-fixes/fixes (1b689a95ce74 powerpc/pseries: include linux/types.h in asm/hvcall.h)
Merging sparc/master (aebb48f5e465 sparc64: fix typo in CONFIG_CRYPTO_DES_SPARC64 => CONFIG_CRYPTO_CAMELLIA_SPARC64)
Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2)
Merging net/master (176bfb406d73 Merge branch 'be2net-patch-set')
Merging bpf/master (41b0530eca69 Merge branch 'bpf-sockmap-fixes')
Merging ipsec/master (545d8ae7afff xfrm: fix boolean assignment in xfrm_get_type_offload)
Merging netfilter/master (992cfc7c5d10 netfilter: nft_flow_offload: no need to flush entries on module removal)
Merging ipvs/master (f7fb77fc1235 netfilter: nft_compat: check extension hook mask only if set)
Merging wireless-drivers/master (a9e6d44ddecc ssb: Do not disable PCI host on non-Mips)
Merging mac80211/master (c4de37ee2b55 mac80211: mesh: fix wrong mesh TTL offset calculation)
Merging rdma-fixes/for-rc (ae59c3f0b6cf RDMA/mlx5: Fix out-of-bound access while querying AH)
Merging sound-current/for-linus (f87a5843cc10 ALSA: hda - Fix headset mic detection problem for two Dell machines)
Merging pci-current/for-linus (838cda369707 x86/PCI: Enable AMD 64-bit window on resume)
Merging driver-core.current/driver-core-linus (35277995e179 Merge branch 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip)
Merging tty.current/tty-linus (4bf772b14675 Merge tag 'drm-for-v4.16' of git://people.freedesktop.org/~airlied/linux)
Merging usb.current/usb-linus (4bf772b14675 Merge tag 'drm-for-v4.16' of git://people.freedesktop.org/~airlied/linux)
Merging usb-gadget-fixes/fixes (b2cd1df66037 Linux 4.15-rc7)
Merging usb-serial-fixes/usb-linus (d14ac576d10f USB: serial: cp210x: add new device ID ELV ALC 8xxx)
Merging usb-chipidea-fixes/ci-for-usb-stable (964728f9f407 USB: chipidea: msm: fix ulpi-node lookup)
Merging phy/fixes (2b88212c4cc6 phy: rcar-gen3-usb2: select USB_COMMON)
Merging staging.current/staging-linus (35277995e179 Merge branch 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip)
Merging char-misc.current/char-misc-linus (35277995e179 Merge branch 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip)
Merging input-current/for-linus (0004520af32f Input: mms114 - add SPDX identifier)
Merging crypto-current/master (2d55807b7f7b crypto: picoxcell - Fix error handling in spacc_probe())
Merging ide/master (8e44e6600caa Merge branch 'KASAN-read_word_at_a_time')
Merging vfio-fixes/for-linus (563b5cbe334e iommu/arm-smmu-v3: Cope with duplicated Stream IDs)
Merging kselftest-fixes/fixes (ae64f9bd1d36 Linux 4.15-rc2)
Merging backlight-fixes/for-backlight-fixes (8ff5cbc6e3c5 backlight: as3711_bl: fix device-tree node leaks)
Merging nand-fixes/nand/fixes (ee02f73e04c0 mtd: nand: atmel: Fix EDO mode check)
Merging spi-nor-fixes/spi-nor/fixes (10a6a6975691 Revert "dt-bindings: mtd: add sst25wf040b and en25s64 to sip-nor list")
Merging mfd-fixes/for-mfd-fixes (107b7d9fa94c mfd: rtsx: Release IRQ during shutdown)
Merging v4l-dvb-fixes/fixes (781b045baefd media: imx274: Fix error handling, add MAINTAINERS entry)
Merging reset-fixes/reset/fixes (f450f28e70a2 reset: socfpga: fix for 64-bit compilation)
Merging mips-fixes/mips-fixes (0cde5b44a30f MIPS: TXx9: use IS_BUILTIN() for CONFIG_LEDS_CLASS)
Merging kvm-fixes/master (d8a5b80568a9 Linux 4.15)
Merging kvms390-fixes/master (1de1ea7efeb9 KVM: s390: add proper locking for CMMA migration bitmap)
Merging drm-intel-fixes/for-linux-next-fixes (d8a5b80568a9 Linux 4.15)
Merging drm-misc-fixes/for-linux-next-fixes (54f809cfbd6b drm/atomic: Fix memleak on ERESTARTSYS during non-blocking commits)
Merging kbuild/for-next (1b9eda2e4892 kconfig: Warn if help text is blank)
Merging uuid/for-next (c0020756315e efi: switch to use new generic UUID API)
Merging dma-mapping/for-next (04f56534786c MAINTAINERS: add the iommu list for swiotlb and xen-swiotlb)
Merging asm-generic/master (a351e9b9fc24 Linux 4.11)
Merging arc/for-next (4fbd8d194f06 Linux 4.15-rc1)
Merging arm/for-next (3a175cdf4392 Merge branches 'fixes', 'misc', 'sa1111' and 'sa1100-for-next' into for-next)
Merging arm-perf/for-next/perf (7520fa99246d perf: ARM DynamIQ Shared Unit PMU support)
Merging arm-soc/for-next (2aa127e4d579 Merge branches 'next/dt' and 'next/drivers' into for-next)
Merging actions/for-next (61862a89e6ac Merge branch 'v4.16/drivers' into next)
Merging alpine/alpine/for-next (a1144b2b1ec4 ARM: dts: alpine: add valid clock-frequency values)
Merging amlogic/for-next (ea879b13a92b Merge branch 'v4.16/dt64' into tmp/aml-rebuild)
Merging aspeed/for-next (8203ca9789bc Merge branch 'dt-for-v4.16' into for-next)
Merging at91/at91-next (fa4cf68ab4b1 Merge tag 'at91-ab-4.16-dt' into at91-next)
Merging bcm2835/for-next (a6189bcc0012 Merge branch anholt/bcm2835-drivers-next into for-next)
Merging imx-mxs/for-next (824162aa1454 Merge branch 'imx/defconfig' into for-next)
Merging keystone/next (a29b8b93e158 Merge branch 'for_4.16/keystone-config' into next)
Merging mvebu/for-next (91cbd0893d7d Merge branch 'mvebu/dt64' into mvebu/for-next)
Merging omap/for-next (e38c38728951 Merge branch 'omap-for-v4.16/ti-sysc' into for-next)
CONFLICT (content): Merge conflict in arch/arm/boot/dts/dra7.dtsi
Merging reset/reset/next (70d2f16a6289 reset: meson: enable level reset support on Meson8b)
Merging qcom/for-next (f5788d2f2929 Merge tag 'qcom-arm64-defconfig-for-4.16' into tagged-for-4.16)
Merging realtek/for-next (2b6286eb7ab8 Merge branch 'v4.15/dt64' into next)
Merging renesas/next (b214f9f550fd Merge branches 'fixes-for-v4.15' and 'dt-for-v4.16' into next)
Merging rockchip/for-next (5432915256e7 Merge branch 'v4.16-armsoc/dts64fixes' into for-next)
Merging samsung/for-next (bebc6082da0a Linux 4.14)
Merging samsung-krzk/for-next (3b6327365aba Merge branch 'next/dt' into for-next)
Merging sunxi/sunxi/for-next (d7ec2c507677 Merge branch 'sunxi/fixes-for-4.15' into sunxi/for-next)
Merging tegra/for-next (983371acdeda Merge branch for-4.16/arm64/dt into for-next)
Merging arm64/for-next/core (3a0a397ff5ff arm64: Kill PSCI_GET_VERSION as a variant-2 workaround)
CONFLICT (content): Merge conflict in arch/arm64/kvm/handle_exit.c
CONFLICT (content): Merge conflict in arch/arm64/include/asm/assembler.h
Merging clk/clk-next (c43a52cfd27b Merge branches 'clk-aspeed', 'clk-lock-UP', 'clk-mediatek' and 'clk-allwinner' into clk-next)
Merging clk-samsung/for-next (7685570f2ae2 clk: samsung: s3c: Remove unneeded enumeration)
Merging c6x/for-linux-next (9d440f7a2824 c6x: fix platforms/plldata.c get_coreid build error)
Merging cris/for-next (fd989db807a0 cris: Fix conflicting types for _etext, _edata, _end)
Merging m68k/for-next (2334b1ac1235 MAINTAINERS: Add NuBus subsystem entry)
Merging m68knommu/for-next (0d665e7b109d mm, page_vma_mapped: Drop faulty pointer arithmetics in check_pte())
Merging metag/for-next (e3cd7f013bac metag/mm: Drop pointless increment)
Merging microblaze/next (7b6ce52be3f8 microblaze: Setup proper dependency for optimized lib functions)
Merging mips/mips-next (ea4d340cbea4 Merge branches '4.15-fixes', '4.16-features' and 'octeon-3-net-mips-bits' into mips-next)
Merging mips-james/mips-next (8f2256d8eaf5 MIPS: Malta: Sanitize mouse and keyboard configuration.)
Merging nios2/for-next (65d1e3ddeae1 nios2: time: Read timer in get_cycles only if initialized)
Merging openrisc/for-next (0fedb7653af7 openrisc: remove unused __ARCH_HAVE_MMU define)
Merging parisc-hd/for-next (bebc6082da0a Linux 4.14)
Merging powerpc/next (015eb1b89e95 powerpc/mm/radix: Fix build error when RADIX_MMU=n)
Merging fsl/next (c095ff93f901 powerpc/sysdev: change CPM GPIO to platform_device)
Merging risc-v/for-next (4889dec6c87d riscv: inline set_pgdir into its only caller)
Merging s390/features (e2dd833389cc s390: add optimized array_index_mask_nospec)
Merging sparc-next/master (8e44e6600caa Merge branch 'KASAN-read_word_at_a_time')
Merging sh/for-next (6e2fbfdd585f sh: fix futex FUTEX_OP_SET op on userspace addresses)
Merging uml/linux-next (02eb0b11eab5 um: Add missing EXPORT for free_irq_by_fd())
Merging xtensa/xtensa-for-next (73b37067623c xtensa: fix futex_atomic_cmpxchg_inatomic)
Merging fscrypt/master (0b1dfa4cc6c6 fscrypt: fix build with pre-4.6 gcc versions)
Merging befs/for-next (55d945e2e4aa fs: befs: btree: Fixed some coding standard issues)
Merging btrfs/next (7c9a09f56a91 btrfs: don't use async helpers for crcs when under IO limits)
Applying: f2fs: fixup for cgroup/writeback change
Merging btrfs-kdave/for-next (4fe231871443 Merge branch 'for-next-next-v4.16-20180206' into for-next-20180206)
CONFLICT (content): Merge conflict in fs/btrfs/tree-log.c
CONFLICT (content): Merge conflict in fs/btrfs/disk-io.c
$ git reset --hard HEAD^
Merging next-20180206 version of btrfs-kdave
Merging ceph/master (16515a6d5418 ceph: improving efficiency of syncfs)
Merging cifs/for-next (022bdb0c463e [SMB3] Add missing structs and defines from recent SMB3.1.1 documentation)
Merging configfs/for-next (6ace4f6bbcfd RDMA/cma: make config_item_type const)
Merging ecryptfs/next (4670269faba7 eCryptfs: constify attribute_group structures.)
Merging ext3/for_next (f463589a7cd2 ext2: drop unneeded newline)
Merging ext4/dev (5dc397113d19 ext4: create ext4_kset dynamically)
Merging f2fs/dev (1c1d35df7110 f2fs: support inode creation time)
Merging fuse/for-next (c6cdd51404b7 fuse: fix READDIRPLUS skipping an entry)
Merging jfs/jfs-next (86313903430d MAINTAINERS: fix jfs tree location)
Merging nfs/linux-next (e231c6879cfd NFS: Fix a race between mmap() and O_DIRECT)
Merging nfs-anna/linux-next (c54c14ba000d xprtrdma: Spread reply processing over more CPUs)
CONFLICT (content): Merge conflict in net/sunrpc/xprtrdma/transport.c
CONFLICT (content): Merge conflict in net/sunrpc/xprt.c
Merging nfsd/nfsd-next (3ac71a649c3d nfsd: store stat times in fill_pre_wcc() instead of inode times)
CONFLICT (content): Merge conflict in fs/nfsd/nfsfh.h
Merging orangefs/for-next (74e938c22705 orangefs: reverse sense of is-inode-stale test in d_revalidate)
Merging overlayfs/overlayfs-next (9b6faee07470 ovl: check ERR_PTR() return value from ovl_encode_fh())
Merging ubifs/linux-next (7f29ae9f977b ubi: block: Fix locking for idr_alloc/idr_remove)
Merging xfs/for-next (76883f7988e6 xfs: remove experimental tag for reverse mapping)
Merging file-locks/locks-next (1deab8ce2c91 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc)
Merging vfs/for-next (27f005e635c6 Merge branch 'misc.netdrv' into for-next)
Merging vfs-miklos/next (0eb8af4916a5 vfs: use helper for calling f_op->fsync())
Merging iversion/iversion-next (bec5a1426bb8 Rename make inode_cmp_iversion{+raw} to inode_eq_iversion{+raw})
Merging printk/for-next (bb4f552a598d Merge branch 'for-4.16-console-waiter-logic' into for-4.16)
Merging pci/next (ab8c609356fb Merge branch 'pci/spdx' into next)
Merging pstore/for-next/pstore (a99f41a1b441 fs: pstore: remove unused hardirq.h)
Merging hid/for-next (494622678bc9 Merge branch 'for-4.16/hid-quirks-cleanup/toshiba' into for-next)
Merging i2c/i2c/for-next (a2cdd4be7a2c Merge branch 'i2c/for-4.16' into i2c/for-next)
CONFLICT (content): Merge conflict in drivers/i2c/i2c-core-smbus.c
Merging dmi/master (36a840c73dc6 firmware: dmi: handle missing DMI data gracefully)
Merging hwmon-staging/hwmon-next (6fbc4232a5ac hwmon: (dell-smm) Disable fan support for Dell Vostro 3360)
Merging jc_docs/docs-next (54e36a2dc554 Documentation/admin-guide: fixes for thunderbolt.rst)
Merging v4l-dvb/master (273caa260035 media: v4l2-compat-ioctl32.c: make ctrl_is_pointer work for subdevs)
Merging v4l-dvb-next/master (a1dfb4c48cc1 media: v4l2-compat-ioctl32.c: refactor compat ioctl32 logic)
Merging fbdev/fbdev-for-next (5865889fe431 video: udlfb: Switch from the pr_*() to the dev_*() logging functions)
Merging pm/linux-next (5ddc28ac7f3b Merge branches 'acpi-processor' and 'acpi-battery' into linux-next)
Merging cpupower/cpupower (0e96a0c83f08 cpupower: Remove FSF address)
Merging idle/next (8a5776a5f498 Linux 4.14-rc4)
Merging opp/opp/linux-next (e856f078bcf1 OPP: Introduce "required-opp" property)
Merging thermal/next (134f4010799a Merge branches 'thermal-core', 'thermal-intel' and 'thermal-soc' into next)
Merging thermal-soc/next (d0ecbbbe518e thermal/drivers/hisi: Remove bogus const from function return type)
Merging ieee1394/for-next (188775181bc0 firewire-ohci: work around oversized DMA reads on JMicron controllers)
Merging dlm/next (9250e523592a dlm: remove dlm_send_rcom_lookup_dump)
Merging swiotlb/linux-next (69369f52d28a swiotlb-xen: implement xen_swiotlb_get_sgtable callback)
Merging net-next/master (617aebe6a97e Merge tag 'usercopy-v4.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux)
Merging bpf-next/master (617aebe6a97e Merge tag 'usercopy-v4.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux)
Merging ipsec-next/master (255442c93843 Merge tag 'docs-4.16' of git://git.lwn.net/linux)
Merging netfilter-next/master (c746fc0e8b2d cxgb4: add geneve offload support for T6)
Merging nfc-next/master (4d63adfe12dd NFC: Add NFC_CMD_DEACTIVATE_TARGET support)
Merging ipvs-next/master (a910d20aa007 netfilter: ipvs: Fix space before '[' error.)
Merging wireless-drivers-next/master (cbbde7e8d985 mt76: do not set status->aggr for NULL data frames)
Merging bluetooth/master (617aebe6a97e Merge tag 'usercopy-v4.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux)
Merging mac80211-next/master (ff84e7bfe176 mac80211: Add support to notify ht/vht opmode modification.)
Merging rdma/for-next (03ecdd2dcf39 net/mlx5: increase async EQ to avoid EQ overrun)
Merging gfs2/for-next (35277995e179 Merge branch 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip)
Merging mtd/master (fee4380f368e mtd: nand: pxa3xx: Fix READOOB implementation)
Merging l2-mtd/mtd/next (571cb17b23ec Merge tag 'nand/for-4.16' of git://git.infradead.org/linux-mtd into mtd/next)
Merging nand/nand/next (f4c6cd1a7f22 mtd: nand: sunxi: Fix ECC strength choice)
Merging spi-nor/spi-nor/next (23bae78e8a57 mtd: mtk-nor: modify functions' name more generally)
Merging crypto/master (2d55807b7f7b crypto: picoxcell - Fix error handling in spacc_probe())
Merging drm/drm-next (b8a89f530f56 Merge branch 'linux-4.16' of git://github.com/skeggsb/linux into drm-next)
Merging drm-panel/drm/panel/for-next (e4bac408b084 drm/panel: simple: Add support for Winstar WF35LTIACD)
Merging drm-intel/for-linux-next (751b01cb07eb drm/i915/ppgtt: Pin page directories before allocation)
Merging drm-tegra/drm/tegra/for-next (8f62142e490d drm/tegra: dc: Properly cleanup overlay planes)
Merging drm-misc/for-linux-next (761e05a702f5 drm: Check for lessee in DROP_MASTER ioctl)
Merging drm-msm/msm-next (51f55992d13b drm/msm/adreno: Use generic function to load firmware to a buffer object)
Merging hdlcd/for-upstream/hdlcd (f73e8b825315 drm/arm: Replace instances of drm_dev_unref with drm_dev_put.)
Merging mali-dp/for-upstream/mali-dp (54243016ae35 drm: mali-dp: Disable planes when their CRTC gets disabled.)
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 (4cfea3c1f271 gpu: ipu-v3: allow to build with COMPILE_TEST)
Merging etnaviv/etnaviv/next (a181196c86e1 drm/etnaviv: remove the need for a gpu-subsystem DT node)
Merging kconfig/for-next (bebc6082da0a Linux 4.14)
Merging regmap/for-next (a75de7721184 Merge remote-tracking branches 'regmap/topic/soundwire' and 'regmap/topic/zero' into regmap-next)
Merging sound/for-next (f87a5843cc10 ALSA: hda - Fix headset mic detection problem for two Dell machines)
Merging sound-asoc/for-next (8639e3c49869 Merge tag 'asoc-v4.16-3' into asoc-next)
Merging modules/modules-next (0cad61d7a3d5 modpost: Remove trailing semicolon)
Merging input/next (10a558374f37 Merge tag 'v4.15' into next)
Merging block/for-next (0ccfb3c0032b Merge branch 'for-4.16/block' into for-next)
Merging lightnvm/for-next (1c6286f26301 lightnvm: fix some error code in pblk-init.c)
Merging device-mapper/for-next (de6ff5c58656 Merge branch 'dm-4.16' into block-4.16_dm-4.16)
CONFLICT (content): Merge conflict in include/linux/blk_types.h
CONFLICT (content): Merge conflict in block/blk-mq.c
CONFLICT (content): Merge conflict in block/blk-core.c
Merging mmc/next (56174d9a2149 mmc: MMC_SDHI_{SYS,INTERNAL}_DMAC should depend on HAS_DMA)
Merging kgdb/kgdb-next (2cf2f0d5b91f kdb: use memmove instead of overlapping memcpy)
Merging md/for-next (1532d9e87e8b raid5-ppl: PPL support for disks with write-back cache enabled)
Merging mfd/for-mfd-next (0f89ffefa4e1 mfd: lpc_ich: Do not touch SPI-NOR write protection bit on Apollo Lake)
Merging backlight/for-backlight-next (2023b0524a63 backlight: tdo24m: Fix the SPI CS between transfers)
Merging battery/for-next (8be4c3667cf1 MAINTAINERS: Add AXP288 PMIC entry)
Merging regulator/for-next (c8f64f281824 Merge remote-tracking branch 'regulator/fix/suspend' into regulator-linus)
Merging security/next-testing (400f428062af Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity into next-testing)
Merging integrity/next-integrity (d56f30ac85c0 ima: force re-appraisal on filesystems with FS_IMA_NO_CACHE)
CONFLICT (content): Merge conflict in security/integrity/ima/ima_main.c
Merging keys/keys-next (1e684d3820d8 pkcs7: Set the module licence to prevent tainting)
Merging selinux/next (4b14752ec4e0 selinux: skip bounded transition processing if the policy isn't loaded)
Merging tpmdd/next (68021bf4734d tpm: remove unused variables)
Merging watchdog/master (592a547adf68 documentation: watchdog: remove documentation of w83697hf_wdt/w83697ug_wdt)
Merging iommu/next (fedbd940d1c2 Merge branches 'arm/renesas', 'arm/omap', 'arm/exynos', 'x86/amd', 'x86/vt-d' and 'core' into next)
Merging dwmw2-iommu/master (910170442944 iommu/vt-d: Fix PASID table allocation)
Merging vfio/next (46ed90f157f4 vfio: mdev: make a couple of functions and structure vfio_mdev_driver static)
Merging trivial/for-next (1972d6c0c86d MAINTAINERS: relinquish kconfig)
Merging audit/next (d8a5b80568a9 Linux 4.15)
Merging devicetree/for-next (3a6fbcb2e2e4 xtensa: remove arch specific early DT functions)
Merging mailbox/mailbox-for-next (0ae7d327a64b dt-bindings: mailbox: qcom: Document the APCS clock binding)
Merging spi/for-next (d0cb047a0edb Merge tag 'spi-v4.16' into spi-next)
Merging tip/auto-latest (fb40672e4538 Merge branch 'sched/urgent')
Merging clockevents/clockevents/next (322fd24f5e67 clocksource/drivers/stm32: Start the timer's counter sooner)
CONFLICT (content): Merge conflict in drivers/clocksource/timer-stm32.c
CONFLICT (content): Merge conflict in drivers/clocksource/timer-of.c
CONFLICT (content): Merge conflict in drivers/clocksource/Kconfig
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 (68fa24f9121c EDAC, mv64x60: Fix an error handling path)
Merging irqchip/irqchip/for-next (c1ae3cfa0e89 Linux 4.11-rc1)
Merging ftrace/for-next (841a915d20c7 vsprintf: Do not have bprintf dereference pointers)
Merging rcu/rcu/next (1dfa55e01987 Merge branches 'cond_resched.2017.12.04a', 'dyntick.2017.11.28a', 'fixes.2017.12.11a', 'srbd.2017.12.05a' and 'torture.2017.12.11a' into HEAD)
Merging kvm/linux-next (8dbfb2bf1bb3 KVM: x86: don't forget vcpu_put() in kvm_arch_vcpu_ioctl_set_sregs())
CONFLICT (content): Merge conflict in arch/x86/kvm/vmx.c
CONFLICT (content): Merge conflict in arch/x86/kvm/svm.c
CONFLICT (content): Merge conflict in arch/arm64/include/asm/pgtable-prot.h
Merging kvm-arm/next (cd15d2050c04 KVM: arm/arm64: Fixup userspace irqchip static key optimization)
Merging kvm-mips/next (dc44abd6aad2 KVM: MIPS/Emulate: Properly implement TLBR for T&E)
Merging kvm-ppc/kvm-ppc-next (9b9b13a6d153 KVM: PPC: Book3S HV: Keep XIVE escalation interrupt masked unless ceded)
Merging kvms390/next (4b9f952577fb KVM: s390: introduce the format-1 GISA)
Merging xen-tip/linux-next (761191258839 pvcalls-back: do not return error on inet_accept EAGAIN)
Merging percpu/for-next (85dcbba3b8b1 percpu: percpu_counter_initialized can be boolean)
Merging workqueues/for-next (a10eb37ccf1d Merge branch 'for-4.15-fixes' into for-next)
Merging drivers-x86/for-next (8a0f5b6f3327 platform/x86: mlx-platform: Fix an ERR_PTR vs NULL issue)
CONFLICT (content): Merge conflict in drivers/platform/x86/dell-laptop.c
Merging chrome-platform/for-next (d48b8c58c57f platform/chrome: Use proper protocol transfer function)
Merging hsi/for-next (b6dc80dbe6cd HSI: cmt_speech: use timespec64 instead of timespec)
Merging leds/for-next (6a836631e303 leds: ledtrig-transient: Add SPDX license identifiers)
Merging ipmi/for-next (e45af3d372f1 ipmi_ssif: Remove duplicate NULL check)
Merging driver-core/driver-core-next (35277995e179 Merge branch 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip)
Merging usb/usb-next (4bf772b14675 Merge tag 'drm-for-v4.16' of git://people.freedesktop.org/~airlied/linux)
Merging usb-gadget/next (8ada211d0383 usb: renesas_usbhs: add extcon notifier to set mode for non-otg channel)
Merging usb-serial/usb-next (d1c48227d7c4 USB: serial: f81534: fix tx error on some baud rate)
Merging usb-chipidea-next/ci-for-usb-next (ce4c1b820c52 usb: chipidea: imx: Fix ULPI on imx53)
Merging phy-next/next (e4b227c1ca70 phy: phy-mtk-tphy: use of_device_get_match_data())
Merging tty/tty-next (4bf772b14675 Merge tag 'drm-for-v4.16' of git://people.freedesktop.org/~airlied/linux)
Merging char-misc/char-misc-next (35277995e179 Merge branch 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip)
Merging extcon/extcon-next (ca90a64dc671 extcon: axp288: Handle reserved charger-type values better)
Merging staging/staging-next (35277995e179 Merge branch 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip)
Merging mux/for-next (6cd361c99ef2 mux: add SPDX identifiers to all mux source files)
Merging slave-dma/next (6c773ba2c843 Merge branch 'for-linus' into next)
Merging cgroup/for-next (5ecf66c9dc2b Merge branch 'for-4.16' into for-next)
Merging scsi/for-next (f468cd2908f8 Merge branch 'postmerge' into for-next)
Merging scsi-mkp/for-next (a2390348c19d scsi: qla2xxx: Fix logo flag for qlt_free_session_done())
Merging target-updates/for-next (1c130ae00b76 iscsi-target: make sure to wake up sleeping login worker)
Merging target-bva/for-next (4fbd8d194f06 Linux 4.15-rc1)
Merging libata/for-next (83ab14e6cacc Merge branch 'for-4.16' into for-next)
Merging vhost/linux-next (96bcd04462b9 virtio-balloon: VIRTIO_BALLOON_F_FREE_PAGE_HINT)
$ git reset --hard HEAD^
Merging next-20180206 version of vhost
Merging rpmsg/for-next (163c558b84fe Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
Merging gpio/for-next (d58f2bf261fd gpio: Timestamp events in hardirq handler)
Merging pinctrl/for-next (02e389e63e35 pinctrl: mcp23s08: fix irq setup order)
Merging pinctrl-samsung/for-next (4fbd8d194f06 Linux 4.15-rc1)
Merging pwm/for-next (bccaa3f917c9 pwm: meson: Add clock source configuration for Meson-AXG)
Merging userns/for-next (9eba1cd4b565 24 Jan 2018 Merge of my siginfo and userns trees for testing in linux-next)
Merging ktest/for-next (f7c6401ff84a ktest: Make sure wait_for_input does honor the timeout)
Merging random/dev (9e66317d3c92 Linux 4.14-rc3)
Merging aio/master (2a8a98673c13 fs: aio: fix the increment of aio-nr and counting against aio-max-nr)
Merging kselftest/next (0e9e327d1622 selftests: vm: update .gitignore with missing generated file)
Merging y2038/y2038 (69973b830859 Linux 4.9)
Merging livepatching/for-next (d13f5d84ca27 Merge branch 'for-4.16/signal-sysfs-force-v2' into for-next)
Merging coresight/next (d8a5b80568a9 Linux 4.15)
Merging rtc/rtc-next (4402be2b4ca7 rtc: remove rtc-at32ap700x)
Merging nvdimm/libnvdimm-for-next (ee95f4059a83 Merge branch 'for-4.16/nfit' into libnvdimm-for-next)
Merging idr/idr-4.11 (f0f3f2d0a3e0 radix tree test suite: Specify -m32 in LDFLAGS too)
Merging at24/at24/for-next (0f30aca72c3b eeprom: at24: extend the list of chips supported in DT)
Merging ntb/ntb-next (3b28c987fb95 NTB: ntb_perf: fix cast to restricted __le32)
Merging kspp/for-next/kspp (531d5f7f5d13 socket: Provide put_cmsg_whitelist() for constant size copies)
Merging init_task/init_task (e1e871aff3de Expand INIT_STRUCT_PID and remove)
Merging akpm-current/current (4448e776d853 uapi: fix linux/sysctl.h userspace compilation errors)
CONFLICT (content): Merge conflict in kernel/fork.c
$ git checkout -b akpm remotes/origin/akpm/master
Applying: ipc/mqueue: add missing error code in init_mqueue_fs()
Applying: net/netfilter/x_tables.c: remove size check
Applying: drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow
Applying: sparc64: NG4 memset 32 bits overflow
Merging akpm/master (9df46ec25430 sparc64: NG4 memset 32 bits overflow)

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

^ permalink raw reply	[flat|nested] 12+ messages in thread
* linux-next: Tree for Feb 7
@ 2019-02-07  7:22 Stephen Rothwell
  0 siblings, 0 replies; 12+ messages in thread
From: Stephen Rothwell @ 2019-02-07  7:22 UTC (permalink / raw)
  To: Linux Next Mailing List; +Cc: Linux Kernel Mailing List

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

Hi all,

Changes since 20190206:

The compiler-attributes tree gained a build failure so I used the version
from next-20190206.

The tegra tree gained a conflict against the imx-mxs tree.

The opp tree gained a conflict against the cpufreq-arm tree.

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

The nand tree gained a conflict against the mvebu tree.

The scsi-mkp tree gained conflicts against Linus' and the fixes trees.

Non-merge commits (relative to Linus' tree): 6151
 6812 files changed, 260413 insertions(+), 172340 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 69 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 (8834f5600cf3 Linux 5.0-rc5)
Merging fixes/master (d8d0c3a7f601 x86/syscalls: Mark expected switch fall-throughs)
Merging kbuild-current/fixes (6db2983cd806 kallsyms: Handle too long symbols in kallsyms.c)
Merging arc-current/for-curr (3e45ea2a074f ARCv2: entry: exception prologue freeing up reg improvement)
Merging arm-current/fixes (1b5ba3507842 ARM: 8824/1: fix a migrating irq bug when hotplug cpu)
Merging arm64-fixes/for-next/fixes (f7daa9c8fd19 arm64: hibernate: Clean the __hyp_text to PoC after resume)
Merging m68k-current/for-linus (bed1369f5190 m68k: Fix memblock-related crashes)
Merging powerpc-fixes/fixes (5a3840a470c4 powerpc/papr_scm: Use the correct bind address)
Merging sparc/master (b71acb0e3721 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6)
Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2)
Merging net/master (2b1f86bf741a MAINTAINERS: add maintainer for SFF/SFP/SFP+ support)
Merging bpf/master (0429f237ce08 Merge branch 's390-qeth-fixes')
Merging ipsec/master (f75a2804da39 xfrm: destroy xfrm_state synchronously on net exit path)
Merging netfilter/master (bdcc5bc25548 mISDN: fix a race in dev_expire_timer())
Merging ipvs/master (b2e3d68d1251 netfilter: nft_compat: destroy function must not have side effects)
Merging wireless-drivers/master (8c22d81d5535 MAINTAINERS: add entry for redpine wireless driver)
Merging mac80211/master (73350424bec9 cfg80211: pmsr: fix abort locking)
Merging rdma-fixes/for-rc (48396e80fb65 RDMA/srp: Rework SCSI device reset handling)
Merging sound-current/for-linus (c97617a81a76 ALSA: hda/ca0132 - Fix build error without CONFIG_PCI)
Merging sound-asoc-fixes/for-linus (9cc17038ee1f Merge branch 'asoc-5.0' into asoc-linus)
Merging regmap-fixes/for-linus (f17b5f06cb92 Linux 5.0-rc4)
Merging regulator-fixes/for-linus (6e1e06b5f354 Merge branch 'regulator-5.0' into regulator-linus)
Merging spi-fixes/for-linus (89b331ebf161 Merge branch 'spi-5.0' into spi-linus)
Merging pci-current/for-linus (f14bcc0add3a Revert "PCI: armada8k: Add support for gpio controlled reset signal")
Merging driver-core.current/driver-core-linus (36991ca68db9 blk-mq: protect debugfs_create_files() from failures)
Merging tty.current/tty-linus (fedb5760648a serial: fix race between flush_to_ldisc and tty_open)
Merging usb.current/usb-linus (a07ddce4df80 usb: typec: tcpm: Correct the PPS out_volt calculation)
Merging usb-gadget-fixes/fixes (a53469a68eb8 usb: phy: am335x: fix race condition in _probe)
Merging usb-serial-fixes/usb-linus (f17b5f06cb92 Linux 5.0-rc4)
Merging usb-chipidea-fixes/ci-for-usb-stable (d6d768a0ec3c usb: chipidea: fix static checker warning for NULL pointer)
Merging phy/fixes (827cb0323928 phy: ath79-usb: Fix the main reset name to match the DT binding)
Merging staging.current/staging-linus (6d923f8fe821 Merge tag 'iio-fixes-5.0a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus)
Merging char-misc.current/char-misc-linus (4bf13fdbc356 mic: vop: Fix crash on remove)
Merging soundwire-fixes/fixes (bfeffd155283 Linux 5.0-rc1)
Merging thunderbolt-fixes/fixes (8834f5600cf3 Linux 5.0-rc5)
Merging input-current/for-linus (90cc55f067f6 Input: bma150 - register input device after setting private data)
Merging crypto-current/master (356690d029e1 crypto: cavium/nitrox - Invoke callback after DMA unmap)
Merging ide/master (adf040ddd001 ide: Use of_node_name_eq for node name comparisons)
Merging vfio-fixes/for-linus (9a71ac7e15a7 vfio-pci/nvlink2: Fix ancient gcc warnings)
Merging kselftest-fixes/fixes (7d4e591bc051 selftests: timers: use LDLIBS instead of LDFLAGS)
Merging modules-fixes/modules-linus (be71eda5383f module: Fix display of wrong module .text address)
Merging slave-dma-fixes/fixes (6454368a804c dmaengine: dmatest: Abort test in case of mapping error)
Merging backlight-fixes/for-backlight-fixes (651022382c7f Linux 4.20-rc1)
Merging mtd-fixes/master (d5d27fd9826b mtd: rawnand: gpmi: fix MX28 bus master lockup problem)
Merging spi-nor-fixes/spi-nor/fixes (7928b2cbe55b Linux 4.16-rc1)
Merging mfd-fixes/for-mfd-fixes (48a2ca0ee399 Revert "mfd: cros_ec: Use devm_kzalloc for private data")
Merging v4l-dvb-fixes/fixes (240809ef6630 media: vim2m: only cancel work if it is for right context)
Merging reset-fixes/reset/fixes (26fce0557fa6 reset: imx7: Fix always writing bits as 0)
Merging mips-fixes/mips-fixes (2b424cfc6972 MIPS: Remove function size check in get_frame_info())
Merging at91-fixes/at91-fixes (bfeffd155283 Linux 5.0-rc1)
Merging omap-fixes/fixes (dc30e7039137 ARM: OMAP2+: Variable "reg" in function omap4_dsi_mux_pads() could be uninitialized)
Merging kvm-fixes/master (826c1362e79a x86/kvm/nVMX: don't skip emulated instruction twice when vmptr address is not backed)
Merging kvms390-fixes/master (40ebdb8e59df KVM: s390: Make huge pages unavailable in ucontrol VMs)
Merging hwmon-fixes/hwmon (2a2ec4aa0577 hwmon: (nct6775) Fix fan6 detection for NCT6793D)
Merging nvdimm-fixes/libnvdimm-fixes (11189c1089da acpi/nfit: Fix command-supported detection)
Merging btrfs-fixes/next-fixes (8834f5600cf3 Linux 5.0-rc5)
Merging vfs-fixes/fixes (fbdb44013202 copy_mount_string: Limit string length to PATH_MAX)
Merging dma-mapping-fixes/for-linus (60d8cd572f65 arm64/xen: fix xen-swiotlb cache flushing)
Merging i3c-fixes/master (f36c1f9a8dfd i3c: master: dw: fix deadlock)
Merging drivers-x86-fixes/fixes (6a730fcb9cb4 Documentation/ABI: Correct mlxreg-io KernelVersion for 5.0)
Merging samsung-krzk-fixes/fixes (bfeffd155283 Linux 5.0-rc1)
Merging pinctrl-samsung-fixes/pinctrl-fixes (651022382c7f Linux 4.20-rc1)
Merging devicetree-fixes/dt/linus (5fa98c2eda35 dt-bindings: Fix dt_binding_check target for in tree builds)
Merging scsi-fixes/fixes (93c085911ec7 scsi: cxlflash: Prevent deadlock when adapter probe fails)
Merging drm-fixes/drm-fixes (2072ce03637f Merge branch 'drm-fixes-5.0' of git://people.freedesktop.org/~agd5f/linux into drm-fixes)
Merging drm-intel-fixes/for-linux-next-fixes (d028a646e84b drm/i915: Try to sanitize bogus DPLL state left over by broken SNB BIOSen)
Merging mmc-fixes/fixes (d6f11e7d91f2 mmc: sunxi: Filter out unsupported modes declared in the device tree)
Merging rtc-fixes/rtc-fixes (bfeffd155283 Linux 5.0-rc1)
Merging gnss-fixes/gnss-linus (bfeffd155283 Linux 5.0-rc1)
Merging hyperv-fixes/hyperv-fixes (52d3b4949192 hv_netvsc: fix typos in code comments)
Merging drm-misc-fixes/for-linux-next-fixes (6297388e1edd drm/omap: dsi: Hack-fix DSI bus flags)
Merging kbuild/for-next (9b676182bf01 Merge branch 'kconfig' into for-next)
Merging compiler-attributes/compiler-attributes (b31ca3fcca36 include/linux/module.h: mark init/cleanup_module aliases as __init/exit)
$ git reset --hard HEAD^
Merging next-20190206 version of compiler-attributes
Merging leaks/leaks-next (8fe28cb58bcb Linux 4.20)
Merging dma-mapping/for-next (0a3b192c26da dma-debug: add dumping facility via debugfs)
Merging asm-generic/master (2b3c5a99d5f3 sh: generate uapi header and syscall table header files)
Merging arc/for-next (8834f5600cf3 Linux 5.0-rc5)
Merging arm/for-next (c43658cedf4d Merge branches 'fixes', 'misc' and 'smp-hotplug' into for-next)
Merging arm64/for-next/core (bc3c03ccb464 arm64: Enable the support of pseudo-NMIs)
Merging arm-perf/for-next/perf (cf2d65ec1d21 perf: xgene: Remove set but not used variable 'config')
Merging arm-soc/for-next (06f885da38ae soc: 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 (59f249fca4f0 Merge branch 'v5.1/dt64' into tmp/aml-rebuild)
Merging aspeed/for-next (e15425214990 ARM: dts: aspeed: quanta-q71l: enable uart1)
Merging at91/at91-next (3850dd7a32a0 Merge branch 'at91-dt' into at91-next)
Merging bcm2835/for-next (1ee128f4fff2 Merge branch 'bcm2835-drivers-next' into for-next)
Merging imx-mxs/for-next (376c79c46ca2 Merge branch 'imx/maintainers' into for-next)
Merging keystone/next (3c3a43c81bda Merge branch 'for_5.1/soc-drivers' into next)
Merging mediatek/for-next (ecee13a082e0 Merge branch 'v5.0-next/dts64' into for-next)
Merging mvebu/for-next (3aafb606da06 Merge branch 'mvebu/dt64' into mvebu/for-next)
Merging omap/for-next (e6e7b013aca0 Merge branch 'omap-for-v5.0/fixes-v2' into for-next)
Merging reset/reset/next (c979dbf59987 reset: imx7: Add support for i.MX8MQ IP block variant)
Merging qcom/for-next (6277cb1ccc3b Merge tag 'qcom-arm64-for-5.1' into all-for-5.1)
CONFLICT (content): Merge conflict in arch/arm/boot/dts/qcom-ipq4019.dtsi
Merging renesas/next (42fc0e2884c0 Merge branch 'arm64-dt-for-v5.1' into next)
Merging rockchip/for-next (21123b35a4e8 Merge branch 'v5.1-armsoc/dts64' into for-next)
Merging samsung/for-next (bebc6082da0a Linux 4.14)
Merging samsung-krzk/for-next (13427eabb93f Merge branch 'next/soc' into for-next)
Merging sunxi/sunxi/for-next (4b0ebb6cff0f Merge branches 'sunxi/dt64-for-5.1' and 'sunxi/config64-for-5.1' into sunxi/for-next)
Merging tegra/for-next (b93d7df4a527 Merge branch for-5.1/arm64/defconfig into for-next)
CONFLICT (content): Merge conflict in arch/arm64/configs/defconfig
Merging clk/clk-next (81d9f06c35cd Merge branch 'clk-devm-clkdev-register' into clk-next)
Merging clk-samsung/for-next (81faa30df9b6 clk: samsung: exynos5433: Add selected IMEM clocks)
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 (d1b5a330692a csky: Fixup dead loop in show_stack)
Merging h8300/h8300-next (21c7acc439b5 h8300: pci: Remove local declaration of pcibios_penalize_isa_irq)
Merging ia64/next (c51836246f97 ia64: generate uapi header and system call table files)
Merging m68k/for-next (28713169d879 m68k: Add -ffreestanding to CFLAGS)
Merging m68knommu/for-next (4ecc025e401f m68k: add ColdFire mcf5441x eDMA platform support)
Merging microblaze/next (226a893bbb1f microblaze: no need to check return value of debugfs_create functions)
Merging mips/mips-next (62c2766cf69d MIPS: Loongson32: Remove DMA & NAND devices from ls1b/board.c)
CONFLICT (content): Merge conflict in arch/mips/include/asm/pgtable.h
CONFLICT (content): Merge conflict in arch/mips/include/asm/barrier.h
Merging nds32/next (bfeffd155283 Linux 5.0-rc1)
Merging nios2/for-next (1c286267aedf nios2: update_mmu_cache preload the TLB with the new PTE)
Merging openrisc/for-next (57ce8ba0fd3a openrisc: Fix broken paths to arch/or32)
Merging parisc-hd/for-next (6e1cd0ae8867 parisc: Add assembly implementations for strlen, strcpy, strncpy and strcat)
Merging powerpc/next (63da6caeb84c powerpc: remove unnecessary unlikely())
Merging fsl/next (63d86876f324 Revert "powerpc/fsl_pci: simplify fsl_pci_dma_set_mask")
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 (801009424e05 Fix a handful of audit-related issue)
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 (7dd541a3fb34 s390: no need to check return value of debugfs_create functions)
Merging sparc-next/master (b71acb0e3721 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6)
Merging sh/for-next (ac21fc2dcb40 sh: switch to NO_BOOTMEM)
Merging uml/linux-next (940b241d9050 um: Remove obsolete reenable_XX calls)
Merging xtensa/xtensa-for-next (20d45b2c3fe9 Merge branch 'xtensa-5.0-fixes' into xtensa-for-next)
Merging fscrypt/master (f5e55e777cc9 fscrypt: return -EXDEV for incompatible rename or link into encrypted dir)
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 (7a197b3e3648 Merge branch 'for-next-next-v5.0-20190206' into for-next-20190206)
Merging ceph/master (74827ee29565 ceph: quota: cleanup license mess)
Merging cifs/for-next (7b2e4d21175a cifs: Fix NULL pointer dereference of devname)
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 (772989eab6a5 Merge ext2 cleanups and fixes.)
Merging ext4/dev (191ce17876c9 ext4: fix special inode number checks in __ext4_iget())
Merging f2fs/dev (72aa2995d2b3 f2fs: do not use mutex lock in atomic context)
Merging fuse/for-next (e057f7fc89c2 fuse: cache readdir calls if filesystem opts out of opendir)
Merging jfs/jfs-next (2e3bc6125154 fs/jfs: Switch to use new generic UUID API)
Merging nfs/linux-next (8834f5600cf3 Linux 5.0-rc5)
Merging nfs-anna/linux-next (8fc75bed96bb NFS: Fix up return value on fatal errors in nfs_page_async_flush())
Merging nfsd/nfsd-next (8820bcaa5bd7 svcrdma: Remove syslog warnings in work completion handlers)
Merging orangefs/for-next (22fc9db296fc orangefs: no need to check for service_operation returns > 0)
Merging overlayfs/overlayfs-next (2424e1c7256c overlayfs: During copy up, first copy up data and then xattrs)
Merging ubifs/linux-next (e58725d51fa8 ubifs: Handle re-linking of inodes correctly while recovery)
Merging v9fs/9p-next (3bbe8b1a4ae9 9p: mark expected switch fall-through)
Merging xfs/for-next (add46b3b0212 xfs: set buffer ops when repair probes for btree type)
Merging file-locks/locks-next (bf77ae4c98d7 locks: fix error in locks_move_blocks())
Merging vfs/for-next (b59b26d1f597 Merge branches 'work.mount', 'work.misc' and 'work.iov_iter' into for-next)
CONFLICT (content): Merge conflict in fs/Makefile
Merging printk/for-next (15ff2069cb7f printk: Add caller information to printk() output.)
Merging pci/next (5a9efb5b1691 Merge branch 'remotes/lorenzo/pci/vmd')
Merging pstore/for-next/pstore (182ca6e0ae23 pstore/ram: Replace dummy_data heap memory with stack memory)
Merging hid/for-next (06e284aafd45 Merge branch 'for-5.1/ish' into for-next)
Merging i2c/i2c/for-next (44783efdfed1 i2c: aspeed: Remove hard-coded bus timeout value setting)
Merging i3c/i3c/next (25ac3da61ba1 i3c: master: cdns: fix I2C transfers in Cadence I3C master driver)
Merging dmi/master (57361846b52b Linux 4.19-rc2)
Merging hwmon-staging/hwmon-next (d79d81923274 hwmon: (lm85) add support for LM96000 high frequencies)
Merging jc_docs/docs-next (8f7e6d134bda doc: process: GPL -> GPL-compatible)
Merging v4l-dvb/master (f0ef022c85a8 media: vim2m: allow setting the default transaction time via parameter)
CONFLICT (content): Merge conflict in drivers/media/platform/vim2m.c
Merging v4l-dvb-next/master (76097fe1aee6 media: staging/ipu3-imgu: Add MAINTAINERS entry)
CONFLICT (add/add): Merge conflict in Documentation/media/v4l-drivers/ipu3.rst
CONFLICT (add/add): Merge conflict in Documentation/media/uapi/v4l/pixfmt-meta-intel-ipu3.rst
Merging fbdev/fbdev-for-next (890d14d2d4b5 fbdev: fbmem: convert CONFIG_FB_LOGO_CENTER into a cmd line option)
Merging pm/linux-next (c46ebc17bc08 Merge branches 'pm-cpuidle' and 'pm-cpufreq' into linux-next)
Merging cpufreq-arm/cpufreq/arm/linux-next (fb9b07a0f2d1 cpufreq: tegra124: add missing of_node_put())
Merging cpupower/cpupower (bfeffd155283 Linux 5.0-rc1)
Merging opp/opp/linux-next (597457d7e054 cpufreq: qcom-hw: Register an Energy Model)
CONFLICT (content): Merge conflict in drivers/cpufreq/scmi-cpufreq.c
CONFLICT (content): Merge conflict in drivers/cpufreq/qcom-cpufreq-hw.c
Merging thermal/next (301c9a43e158 Merge branches 'for-rc' and 'thermal-intel' into next)
Merging thermal-soc/next (8834f5600cf3 Linux 5.0-rc5)
Merging ieee1394/for-next (c820518f6ca1 firewire: Remove depends on HAS_DMA in case of platform dependency)
Merging dlm/next (8526e331c56f dlm: Fix test for -ERESTARTSYS)
Merging swiotlb/linux-next (227a76b64718 swiotlb: clear io_tlb_start and io_tlb_end in swiotlb_exit)
Merging rdma/for-next (b0bad9ad514f RDMA/IWPM: Support no port mapping requirements)
Merging net-next/master (47b98039fb6e cxgb4: Update 1.22.9.0 as the latest firmware supported.)
CONFLICT (content): Merge conflict in drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
Merging bpf-next/master (dd9cef43c222 bpf: test_maps: fix possible out of bound access warning)
Merging ipsec-next/master (590ce401c207 dt-bindings: net: dsa: ksz9477: fix indentation for switch spi bindings)
Merging mlx5-next/mlx5-next (46861e3e88be net/mlx5: Set ODP SRQ support in firmware)
Merging netfilter-next/master (0604628bb03a netfilter: nf_tables: add NFTA_RULE_POSITION_ID to nla_policy)
Merging nfc-next/master (1f008cfec5d5 NFC: fdp: Fix unused variable warnings)
Merging ipvs-next/master (e2f7cc72cbf4 netfilter: conntrack: fix bogus port values for other l4 protocols)
Merging wireless-drivers-next/master (5661f29ade24 Merge tag 'wireless-drivers-next-for-davem-2019-02-06' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next)
Merging bluetooth/master (e20a2e9c42c9 Bluetooth: Fix decrementing reference count twice in releasing socket)
Merging mac80211-next/master (341203e78943 mac80211_hwsim: Support boottime in scan results)
Merging gfs2/for-next (2abbf9a4d262 gfs: no need to check return value of debugfs_create functions)
Merging mtd/mtd/next (b0dd77a79642 mtd: docg3: fix a possible memory leak of mtd->name)
Merging nand/nand/next (ab3ab7b654ae mtd: rawnand: fsmc: Disable NAND on remove())
CONFLICT (content): Merge conflict in MAINTAINERS
Merging spi-nor/spi-nor/next (a2126b0a0109 mtd: spi-nor: refine Spansion S25FL512S ID)
Merging crypto/master (8336bdf12a9e crypto: arm64/crct10dif - register PMULL variants as separate algos)
Merging drm/drm-next (2cc3b81dfa7f Merge tag 'drm-intel-next-2019-02-02' of git://anongit.freedesktop.org/drm/drm-intel into drm-next)
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_lrc.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_display.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_debugfs.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/dc_stream.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
Applying: drm: merge fix up for and extra #pragma line
Merging drm-intel/for-linux-next (6cbb55c086b4 drm/i915: Don't send hotplug in intel_dp_check_mst_status())
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_pci.c
Merging drm-tegra/drm/tegra/for-next (5da853b860e5 drm/tegra: sor: Support device tree crossbar configuration)
Merging drm-misc/for-linux-next (1eb6ea4a8202 drm/vc4: Use struct_size() in kzalloc())
Merging drm-msm/msm-next (d3db61caf45a drm/msm/dpu: remove struct encoder_kickoff_params)
Merging hdlcd/for-upstream/hdlcd (d664b851eb2b drm/arm/hdlcd: Reject atomic commits that disable only the plane)
Merging mali-dp/for-upstream/mali-dp (dcc9d76b6d83 drm/komeda: Off by one in komeda_fb_get_pixel_addr())
Merging imx-drm/imx-drm/next (e4a2457f459b drm/imx: only send commit done event when all state has been applied)
Merging etnaviv/etnaviv/next (fd4b77e8deea drm/etnaviv: don't restrict to certain architectures)
Merging kconfig/for-next (bebc6082da0a Linux 4.14)
Merging regmap/for-next (66fb181d6f82 Merge remote-tracking branch 'regmap/topic/irq' into regmap-next)
Merging sound/for-next (6ce1d63ed721 ALSA: core: Don't allow NULL device for memory allocation)
Merging sound-asoc/for-next (51271cea4281 Merge branch 'asoc-5.1' into asoc-next)
Merging modules/modules-next (93d77e7f1410 ARM: module: Fix function kallsyms on Thumb-2)
Merging input/next (0f681d09e66e Input: add new vibrator driver for various MSM SOCs)
Merging block/for-next (bdec662b033e Merge branch 'for-5.1/block' into for-next)
Merging device-mapper/for-next (fa8db4948f52 dm: don't use bio_trim() afterall)
Merging pcmcia/pcmcia-next (95691e3eddc4 pcmcia: Implement CLKRUN protocol disabling for Ricoh bridges)
Merging mmc/next (727ce19a6daa mmc: core: Indicate SD specs higher than 4.0)
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 (c52b8fd546d8 mfd: wm8400-core: Make it explicitly non-modular)
Merging backlight/for-backlight-next (cec2b18832e2 backlight: pwm_bl: Use gpiod_get_value_cansleep() to get initial state)
Merging battery/for-next (f83a6ece6997 power: supply: bq25890: show max charge current/voltage as configured)
Merging regulator/for-next (e94563211040 Merge branch 'regulator-5.1' into regulator-next)
Merging security/next-testing (d87331e4a620 Merge branch 'next-general' into next-testing)
Merging apparmor/apparmor-next (43aa09fee2f0 apparmor: Fix warning about unused function apparmor_ipv6_postroute)
Merging integrity/next-integrity (e7fde070f39b evm: Use defined constant for UUID representation)
Merging selinux/next (45189a1998e0 selinux: fix avc audit messages)
Merging tpmdd/next (5569d9b1fa51 tpm: pass an array of tpm_extend_digest structures to tpm_pcr_extend())
Merging watchdog/master (59600d045ff4 dt-bindings: watchdog: renesas-wdt: Document r8a77470 support)
Merging iommu/next (af728567eaac Merge branches 'iommu/fixes', 'arm/msm', 'arm/tegra', 'x86/vt-d', 'x86/amd' and 'core' into next)
Merging dwmw2-iommu/master (d8a5b80568a9 Linux 4.15)
Merging vfio/next (3c8d7ef89bb8 vfio: platform: reset: fix up include directives to remove ccflags-y)
Merging trivial/for-next (75a24b822d38 kfifo: fix inaccurate comment)
Merging audit/next (5f3d544f1671 audit: remove audit_context when CONFIG_ AUDIT and not AUDITSYSCALL)
Merging devicetree/for-next (42e45a9449f1 media: s5p-mfc: Fix memdev DMA configuration)
Merging mailbox/mailbox-for-next (d69e11648e48 mailbox: tegra-hsp: Use device-managed registration API)
Merging spi/for-next (6a280faf76b4 Merge branch 'spi-5.1' into spi-next)
CONFLICT (modify/delete): arch/mips/ath79/dev-spi.h deleted in HEAD and modified in spi/for-next. Version spi/for-next of arch/mips/ath79/dev-spi.h left in tree.
$ git rm -f arch/mips/ath79/dev-spi.h
Merging tip/auto-latest (3fc175d79dbc Merge branch 'x86/urgent')
Merging clockevents/clockevents/next (7cd6dca3600d clocksource/drivers/arch_timer: Workaround for Allwinner A64 timer instability)
Merging edac-amd/for-next (cbfa482f7e2b EDAC, skx_common: Add code to recognise new compound error code)
Merging irqchip/irq/irqchip-next (56841070ccc8 irqchip/gic-v3-its: Fix ITT_entry_size accessor)
Merging ftrace/for-next (3d739c1f6156 tracing: Use the return of str_has_prefix() to remove open coded numbers)
Merging rcu/rcu/next (e81e38da861d Merge LKMM and RCU commits)
Merging kvm/linux-next (bfeffd155283 Linux 5.0-rc1)
Merging kvm-arm/next (bb16c22a780e arm64: KVM: Describe data or unified caches as having 1 set and 1 way)
Merging kvm-ppc/kvm-ppc-next (ae59a7e1945b KVM: PPC: Book3S HV: Keep rc bits in shadow pgtable in sync with host)
Merging kvms390/next (b9fa6d6ee9b8 KVM: s390: fix possible null pointer dereference in pending_irqs())
Merging xen-tip/linux-next (8d2df8a2d0fa arch/arm/xen: Remove duplicate header)
Merging percpu/for-next (718f6757a29b Merge branch 'for-4.21' into for-next)
Merging workqueues/for-next (4d43d395fed1 workqueue: Try to catch flush_work() without INIT_WORK().)
Merging drivers-x86/for-next (b2ee6d2a2894 platform/x86: intel_pmc_core: Include Reserved IP for LTR)
Merging chrome-platform/for-next (67e9ac8c565a MAINTAINERS: chrome-platform: change the git tree to a chrome-platform group git tree)
Merging hsi/for-next (3a658e09a215 HSI: omap_ssi: Change to use DEFINE_SHOW_ATTRIBUTE macro)
Merging leds/for-next (0f85e8498a48 leds: trigger: timer: Add initialization from Device Tree)
Merging ipmi/for-next (2b835103f84d ipmi: Use dedicated API for copying a UUID)
Merging driver-core/driver-core-next (79a4e91d1bb2 device.h: Add __cold to dev_<level> logging functions)
Merging usb/usb-next (a2fd23b93733 usbip: Fix vep_free_request() null pointer checks on input args)
Merging usb-gadget/next (98e89b4d6d38 usb: gadget: f_fs: preserve wMaxPacketSize across usb_ep_autoconfig() call)
Merging usb-serial/usb-next (15fb84b74196 USB: serial: cp210x: add GPIO support for CP2104)
Merging usb-chipidea-next/ci-for-usb-next (9049fce897ed usb: chipidea: imx: allow to configure oc polarity on i.MX25)
Merging phy-next/next (49ee1406355e phy: qcom-qusb2: Add QUSB2 PHY support for msm8998)
Merging tty/tty-next (9c6a2583f115 serial: mps2-uart: Add parentheses around conditional in mps2_uart_shutdown)
Merging char-misc/char-misc-next (9f23379c67fa nvmem: allow to select i.MX nvmem driver for i.MX 7D)
Merging extcon/extcon-next (a9857d45edf3 extcon: ptn5150: Fix return value check in ptn5150_i2c_probe())
Merging soundwire/next (bfeffd155283 Linux 5.0-rc1)
Merging thunderbolt/next (8834f5600cf3 Linux 5.0-rc5)
Merging staging/staging-next (1dcc3ed4a774 Merge tag 'iio-for-5.1a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-next)
Merging mux/for-next (a1ad5ff63944 Merge branch 'i2c-mux/for-next' into for-next)
Merging icc/icc-next (72d282b59342 drm/msm/a6xx: Add support for an interconnect path)
Merging slave-dma/next (6f53b3d320ac Merge branch 'topic/k3dma' into next)
CONFLICT (content): Merge conflict in drivers/dma/imx-sdma.c
Merging cgroup/for-next (6b3a6a132dfc MAINTAINERS: Update cgroup entry)
Merging scsi/for-next (7ba1bedcaa1e Merge branch 'misc' into for-next)
CONFLICT (content): Merge conflict in drivers/scsi/arcmsr/arcmsr_hba.c
Merging scsi-mkp/for-next (42fb055a57ca scsi: lpfc: Update lpfc version to 12.2.0.0)
CONFLICT (modify/delete): drivers/scsi/osd/osd_initiator.c deleted in scsi-mkp/for-next and modified in HEAD. Version HEAD of drivers/scsi/osd/osd_initiator.c left in tree.
CONFLICT (content): Merge conflict in drivers/scsi/lpfc/lpfc_nvme.c
$ git rm -f drivers/scsi/osd/osd_initiator.c
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 (05a7ae3f00a3 arch: move common mmap flags to linux/mman.h)
Merging rpmsg/for-next (19f5ccc8bbc9 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
Merging gpio/for-next (5c713d9394f3 pinctrl: qcom: spmi-gpio: select IRQ_DOMAIN_HIERARCHY in Kconfig)
Merging gpio-brgl/gpio/for-next (c4b7b0d25d79 gpio: altera-a10sr: Trivial coding style fix)
Merging pinctrl/for-next (fb5ed1b8df2b Merge branch 'devel' into for-next)
Merging pinctrl-samsung/for-next (651022382c7f Linux 4.20-rc1)
Merging pwm/for-next (7ca17b207127 pwm: imx: Signedness bug in imx_pwm_get_state())
Merging userns/for-next (a692933a8769 signal: Always attempt to allocate siginfo for SIGSTOP)
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 kselftest/next (bfeffd155283 Linux 5.0-rc1)
Merging y2038/y2038 (4ad44aba07b7 y2038: add 64-bit time_t syscalls to all 32-bit architectures)
Merging livepatching/for-next (586f1a151c7b Merge branch 'for-5.1-atomic-replace' into for-next)
Merging coresight/next (c714bc38ebee coresight: Use event attributes for sink selection)
Merging rtc/rtc-next (761acdda5c2c rtc: rs5c372: r2221: fix to use the correct XSTP bit)
Merging nvdimm/libnvdimm-for-next (8a6f7591ddf5 Merge branch 'for-5.0/dax' into libnvdimm-for-next)
Merging at24/at24/for-next (3b0548784079 eeprom: at24: remove at24_platform_data)
Merging ntb/ntb-next (d9842b39e9ec ntb_hw_switchtec: Added support of >=4G memory windows)
Merging kspp/for-next/kspp (be1944712d8e Merge branch 'for-next/gcc-plugin/arm-stackprotector' into for-next/kspp)
Merging init_task/init_task (e1e871aff3de Expand INIT_STRUCT_PID and remove)
Merging cisco/for-next (84a401a27506 Merge branch 'for-x86' into for-next)
CONFLICT (content): Merge conflict in arch/x86/kernel/setup.c
Merging gnss/gnss-next (f9eb86fddaf2 dt-bindings: gnss: add lna-supply property)
Merging fsi/master (d20810530b71 fsi: fsi-scom.c: Remove duplicate header)
Merging siox/siox/next (1e4b044d2251 Linux 4.18-rc4)
Merging slimbus/for-next (81648d8bc222 slimbus: core: add missing spin_lock_init on txn_lock)
Merging nvmem/for-next (c86d78c459db nvmem: allow to select i.MX nvmem driver for i.MX 7D)
Merging xarray/xarray (2fa044e51a1f XArray: Add cyclic allocation)
Merging hyperv/hyperv-next (27207b76011f vmbus: Switch to use new generic UUID API)
Merging auxdisplay/auxdisplay (49a57857aeea Linux 5.0-rc3)
Merging kgdb-dt/kgdb/for-next (97498c96a186 kgdb/treewide: constify struct kgdb_arch arch_kgdb_ops)
Merging pidfd/for-next (a662d9f6ca22 selftests: add tests for pidfd_send_signal())
CONFLICT (content): Merge conflict in include/uapi/asm-generic/unistd.h
CONFLICT (content): Merge conflict in arch/x86/entry/syscalls/syscall_64.tbl
CONFLICT (content): Merge conflict in arch/x86/entry/syscalls/syscall_32.tbl
Merging kspp-gustavo/for-next/kspp (f993bd3e061d ASN.1: mark expected switch fall-through)
CONFLICT (content): Merge conflict in kernel/time/timer.c
CONFLICT (content): Merge conflict in kernel/time/hrtimer.c
CONFLICT (modify/delete): drivers/scsi/osd/osd_initiator.c deleted in HEAD and modified in kspp-gustavo/for-next/kspp. Version kspp-gustavo/for-next/kspp of drivers/scsi/osd/osd_initiator.c left in tree.
$ git rm -f drivers/scsi/osd/osd_initiator.c
Merging akpm-current/current (e461d719fabc zram: default to lzo-rle instead of lzo)
CONFLICT (content): Merge conflict in include/linux/sched.h
CONFLICT (content): Merge conflict in include/linux/kernfs.h
CONFLICT (content): Merge conflict in arch/powerpc/mm/pgtable-book3s64.c
$ git checkout -b akpm remotes/origin/akpm/master
Applying: scripts/atomic/check-atomics.sh: don't assume that scripts are executable
Applying: proc: calculate end pointer for /proc/*/* lookup at compile time
Applying: proc: merge fix for proc_pident_lookup() API change
Applying: unicore32: stop printing the virtual memory layout
Applying: arch/nios2/mm/fault.c: remove duplicate include
Applying: include/linux/sched/signal.h: replace `tsk' with `task'
Applying: openrisc: prefer memblock APIs returning virtual address
Applying: powerpc: use memblock functions returning virtual address
Applying: memblock: replace memblock_alloc_base(ANYWHERE) with memblock_phys_alloc
Applying: memblock: drop memblock_alloc_base_nid()
Applying: memblock: emphasize that memblock_alloc_range() returns a physical address
Applying: memblock: memblock_phys_alloc_try_nid(): don't panic
Applying: memblock: memblock_phys_alloc(): don't panic
Applying: memblock: drop __memblock_alloc_base()
Applying: memblock: drop memblock_alloc_base()
Applying: memblock: refactor internal allocation functions
Applying: memblock: fix parameter order in memblock_phys_alloc_try_nid()
Applying: memblock: make memblock_find_in_range_node() and choose_memblock_flags() static
Applying: arch: use memblock_alloc() instead of memblock_alloc_from(size, align, 0)
Applying: arch: don't memset(0) memory returned by memblock_alloc()
Applying: ia64: add checks for the return value of memblock_alloc*()
Applying: sparc: add checks for the return value of memblock_alloc*()
Applying: mm/percpu: add checks for the return value of memblock_alloc*()
Applying: init/main: add checks for the return value of memblock_alloc*()
Applying: swiotlb: add checks for the return value of memblock_alloc*()
Applying: treewide: add checks for the return value of memblock_alloc*()
Applying: mm: sparse: Use '%pa' with 'phys_addr_t' type
Applying: memblock: fix format strings for panics after memblock_alloc
Applying: mm/sparse: don't panic if the allocation in sparse_buffer_init fails
Applying: memblock: memblock_alloc_try_nid: don't panic
Applying: memblock: drop memblock_alloc_*_nopanic() variants
Applying: memblock: remove memblock_{set,clear}_region_flags
Applying: memblock: split checks whether a region should be skipped to a helper function
Applying: openvswitch: convert to kvmalloc
Applying: md: convert to kvmalloc
Applying: selinux: convert to kvmalloc
Applying: Generic radix trees
Applying: proc: commit to genradix
Applying: sctp: convert to genradix
Applying: Drop flex_arrays
Applying: include/linux/relay.h: fix percpu annotation in struct rchan
Applying: mm: make mm->pinned_vm an atomic64 counter
Applying: drivers/mic/scif: do not use mmap_sem
Applying: drivers/IB,qib: optimize mmap_sem usage
Applying: drivers/IB,hfi1: do not se mmap_sem
Applying: drivers/IB,usnic: reduce scope of mmap_sem
Applying: drivers/IB,core: reduce scope of mmap_sem
Applying: kernel/fork.c: remove duplicated include
Applying: samples/mic/mpssd/mpssd.h: remove duplicate header
Applying: drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow
Merging akpm/master (db7477c58c2f 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] 12+ messages in thread
* linux-next: Tree for Feb 7
@ 2020-02-07  0:59 Stephen Rothwell
  0 siblings, 0 replies; 12+ messages in thread
From: Stephen Rothwell @ 2020-02-07  0:59 UTC (permalink / raw)
  To: Linux Next Mailing List; +Cc: Linux Kernel Mailing List

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

Hi all,

Please do not add any v5.7 material to your linux-next included
branches until after v5.6-rc1 has been released.

Changes since 20200206:

The fuse tree gained a conflict against Linus' tree.

The vfs tree gained a conflict against the fuse tree.

Non-merge commits (relative to Linus' tree): 1982
 1765 files changed, 72555 insertions(+), 31470 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 htmldocs. And finally, a simple boot test
of the powerpc pseries_le_defconfig kernel in qemu (with and without
kvm enabled).

Below is a summary of the state of the merge.

I am currently merging 315 trees (counting Linus' and 78 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 (90568ecf5615 Merge tag 'kvm-5.6-2' of git://git.kernel.org/pub/scm/virt/kvm/kvm)
Merging fixes/master (ba954bf6cb38 evh_bytechan: fix out of bounds accesses)
Merging kbuild-current/fixes (754beeec1d90 Merge tag 'char-misc-5.6-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc)
Merging arc-current/for-curr (f45ba2bd6da0 ARCv2: fpu: preserve userspace fpu state)
Merging arm-current/fixes (6849b5eba196 ARM: 8955/1: virt: Relax arch timer version check during early boot)
Merging arm-soc-fixes/arm/fixes (6716cb162deb Merge tag 'omap-for-fixes-whenever-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/fixes)
Merging arm64-fixes/for-next/fixes (aa638cfe3e73 arm64: cpu_errata: Add Hisilicon TSV110 to spectre-v2 safe list)
Merging m68k-current/for-linus (6aabc1facdb2 m68k: Implement copy_thread_tls())
Merging powerpc-fixes/fixes (5d2e5dd5849b powerpc/mm/hash: Fix sharing context ids between kernel & userspace)
Merging s390-fixes/fixes (def9d2780727 Linux 5.5-rc7)
Merging sparc/master (11648b8339f8 sparc64: fix adjtimex regression)
Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2)
Merging net/master (263a425a482f net: systemport: Avoid RBUF stuck in Wake-on-LAN mode)
Merging bpf/master (b9e427248885 Merge branch 'bpf-xsk-fixes')
Merging ipsec/master (a444ad1432c5 Merge branch 'netdevsim-fix-several-bugs-in-netdevsim-module')
Merging netfilter/master (83d0585f91da Merge branch 'Fix-reconnection-latency-caused-by-FIN-ACK-handling-race')
Merging ipvs/master (c24b75e0f923 ipvs: move old_secure_tcp into struct netns_ipvs)
Merging wireless-drivers/master (ebe8e6116ac4 rtw88: Fix return value of rtw_wow_check_fw_status)
Merging mac80211/master (8b792f84c637 Merge branch 'mlxsw-Various-fixes')
Merging rdma-fixes/for-rc (9554de394b7e i40iw: Remove setting of VMA private data and use rdma_user_mmap_io)
Merging sound-current/for-linus (6954b323a183 Merge tag 'asoc-v5.6-3' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus)
Merging sound-asoc-fixes/for-linus (4492e51e32fb Merge branch 'asoc-5.6' into asoc-linus)
Merging regmap-fixes/for-linus (def9d2780727 Linux 5.5-rc7)
Merging regulator-fixes/for-linus (d670b40cfde8 Merge branch 'regulator-5.6' into regulator-linus)
Merging spi-fixes/for-linus (7b206f064457 Merge branch 'spi-5.6' into spi-linus)
Merging pci-current/for-linus (2e34673be0bd PCI/ATS: Use PF PASID for VFs)
Merging driver-core.current/driver-core-linus (6992ca0dd017 Merge branch 'parisc-5.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux)
Merging tty.current/tty-linus (6992ca0dd017 Merge branch 'parisc-5.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux)
Merging usb.current/usb-linus (6992ca0dd017 Merge branch 'parisc-5.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux)
Merging usb-gadget-fixes/fixes (e5b5da96da50 usb: gadget: fix wrong endpoint desc)
Merging usb-serial-fixes/usb-linus (def9d2780727 Linux 5.5-rc7)
Merging usb-chipidea-fixes/ci-for-usb-stable (16009db47c51 usb: chipidea: udc: workaround for endpoint conflict issue)
Merging phy/fixes (4f510aa10468 phy/rockchip: inno-hdmi: round clock rate down to closest 1000 Hz)
Merging staging.current/staging-linus (9e6c535c64ad Merge tag 'pci-v5.6-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci)
Merging char-misc.current/char-misc-linus (9e6c535c64ad Merge tag 'pci-v5.6-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci)
Merging soundwire-fixes/fixes (e42617b825f8 Linux 5.5-rc1)
Merging thunderbolt-fixes/fixes (d5226fa6dbae Linux 5.5)
Merging input-current/for-linus (b19efcabb587 Merge branch 'next' into for-linus)
Merging crypto-current/master (2343d1529aff crypto: Kconfig - allow tests to be disabled when manager is disabled)
Merging ide/master (94f2630b1897 Merge tag '5.6-rc-small-smb3-fix-for-stable' of git://git.samba.org/sfrench/cifs-2.6)
Merging vfio-fixes/for-linus (95f89e090618 vfio/type1: Initialize resv_msi_base)
Merging kselftest-fixes/fixes (c79f46a28239 Linux 5.5-rc5)
Merging modules-fixes/modules-linus (57baec7b1b04 scripts/nsdeps: make sure to pass all module source files to spatch)
Merging slave-dma-fixes/fixes (c79f46a28239 Linux 5.5-rc5)
Merging backlight-fixes/for-backlight-fixes (219d54332a09 Linux 5.4)
Merging mtd-fixes/mtd/fixes (def9d2780727 Linux 5.5-rc7)
Merging mfd-fixes/for-mfd-fixes (603d9299da32 mfd: mt6397: Fix probe after changing mt6397-core)
Merging v4l-dvb-fixes/fixes (8821e92879a3 Merge tag 'v5.5-rc5' into patchwork)
Merging reset-fixes/reset/fixes (089531445262 MAINTAINERS: fix style in RESET CONTROLLER FRAMEWORK)
Merging mips-fixes/mips-fixes (bbcc5672b006 MIPS: Avoid VDSO ABI breakage due to global register variable)
Merging at91-fixes/at91-fixes (54ecb8f7028c Linux 5.4-rc1)
Merging omap-fixes/fixes (b0b039515445 ARM: dts: am43x-epos-evm: set data pin directions for spi0 and spi1)
Merging kvm-fixes/master (6992ca0dd017 Merge branch 'parisc-5.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux)
Merging kvms390-fixes/master (fe33a928bfcd KVM: s390: ENOTSUPP -> EOPNOTSUPP fixups)
Merging hwmon-fixes/hwmon (7fee59f20781 hwmon: (pmbus/ltc2978) Fix PMBus polling of MFR_COMMON definitions.)
Merging nvdimm-fixes/libnvdimm-fixes (c14685547762 tools/testing/nvdimm: Fix mock support for ioremap)
Merging btrfs-fixes/next-fixes (5715b7fa8d8d Merge branch 'misc-5.5' into next-fixes)
Merging vfs-fixes/fixes (d0cb50185ae9 do_last(): fetch directory ->i_mode and ->i_uid before it's too late)
Merging dma-mapping-fixes/for-linus (9c24eaf81cc4 iommu/vt-d: Return the correct dma mask when we are bypassing the IOMMU)
Merging i3c-fixes/master (6fbc7275c7a9 Linux 5.2-rc7)
Merging drivers-x86-fixes/fixes (6992ca0dd017 Merge branch 'parisc-5.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux)
Merging samsung-krzk-fixes/fixes (a2315d3aea59 ARM: exynos_defconfig: Restore debugfs support)
Merging pinctrl-samsung-fixes/pinctrl-fixes (e42617b825f8 Linux 5.5-rc1)
Merging devicetree-fixes/dt/linus (04dbd86539fd dt-bindings: Fix paths in schema $id fields)
Merging scsi-fixes/fixes (e0a514259378 scsi: ufs: fix spelling mistake "initilized" -> "initialized")
Merging drm-fixes/drm-fixes (d5226fa6dbae Linux 5.5)
Merging amdgpu-fixes/drm-fixes (2c409ba81be2 drm/radeon: fix si_enable_smc_cac() failed issue)
Merging drm-intel-fixes/for-linux-next-fixes (d5226fa6dbae Linux 5.5)
Merging mmc-fixes/fixes (2a187d033520 mmc: sdhci: fix minimum clock rate for v3 controller)
Merging rtc-fixes/rtc-fixes (f01f4ffdfb70 rtc: cmos: Revert "rtc: Fix the AltCentury value on AMD/Hygon platform")
Merging gnss-fixes/gnss-linus (d1eef1c61974 Linux 5.5-rc2)
Merging hyperv-fixes/hyperv-fixes (af42d3466bdc Linux 5.4-rc8)
Merging soc-fsl-fixes/fix (5674a92ca4b7 soc/fsl/qe: Fix an error code in qe_pin_request())
Merging risc-v-fixes/fixes (def9d2780727 Linux 5.5-rc7)
Merging pidfd-fixes/fixes (0bef168e8859 exit: Fix Sparse errors and warnings)
Merging fpga-fixes/fixes (dec43da46f63 fpga: altera-ps-spi: Fix getting of optional confd gpio)
Merging spdx/spdx-linus (b3a608222336 Merge branch 'for-v5.6' of git://git.kernel.org:/pub/scm/linux/kernel/git/jmorris/linux-security)
Merging gpio-intel-fixes/fixes (d5226fa6dbae Linux 5.5)
Merging pinctrl-intel-fixes/fixes (d5226fa6dbae Linux 5.5)
Merging erofs-fixes/fixes (d1eef1c61974 Linux 5.5-rc2)
Merging drm-misc-fixes/for-linux-next-fixes (7e0cf7e9936c drm/panfrost: Make sure the shrinker does not reclaim referenced BOs)
Merging kspp-gustavo/for-next/kspp (3d519d6d388b sh: kgdb: Mark expected switch fall-throughs)
Merging kbuild/for-next (f566e1fbadb6 kbuild: make multiple directory targets work)
Merging compiler-attributes/compiler-attributes (54ecb8f7028c Linux 5.4-rc1)
Merging leaks/leaks-next (9e98c678c2d6 Linux 5.1-rc1)
Merging dma-mapping/for-next (75467ee48a5e dma-direct: improve DMA mask overflow reporting)
Merging asm-generic/master (060dc911501f nds32: fix build failure caused by page table folding updates)
Merging arc/for-next (def9d2780727 Linux 5.5-rc7)
Merging arm/for-next (29cd07a400ae Merge branches 'fixes' and 'misc' into for-next)
Merging arm64/for-next/core (e533dbe9dcb1 arm64: acpi: fix DAIF manipulation with pNMI)
Merging arm-perf/for-next/perf (8703317ae576 drivers/perf: hisi: update the sccl_id/ccl_id for certain HiSilicon platform)
Merging arm-soc/for-next (18ee80c0533a ARM: Document merges)
CONFLICT (content): Merge conflict in drivers/soc/tegra/fuse/tegra-apbmisc.c
Merging amlogic/for-next (1b01733a0400 Merge branch 'v5.6/defconfig' into tmp/aml-rebuild)
Merging aspeed/for-next (767774e5f8b3 ARM: dts: aspeed: tiogapass: Add gpio line names)
Merging at91/at91-next (4ba105339864 Merge branches 'at91-soc', 'at91-dt' and 'at91-defconfig' into at91-next)
Merging bcm2835/for-next (f14234184671 Merge branch 'bcm2835-maintainers-next' into for-next)
Merging imx-mxs/for-next (c65228f2fe91 Merge branch 'imx/defconfig' into for-next)
Merging keystone/next (a1766a49fc90 Merge tag 'drivers_soc_for_5.6' into next)
Merging mediatek/for-next (fdef5207b966 Merge branch 'v5.5-next/soc' into for-next)
Merging mvebu/for-next (c0d03b53ef47 Merge branch 'mvebu/dt64' into mvebu/for-next)
Merging omap/for-next (f9f5267ec296 Merge branch 'omap-for-v5.6/dt' into for-next)
Merging qcom/for-next (8b0d3352e4e9 Merge branches 'arm64-defconfig-for-5.6', 'arm64-for-5.6', 'defconfig-for-5.6', 'drivers-for-5.6' and 'dts-for-5.6' into for-next)
Merging realtek/for-next (45698e00d5a9 Merge branch 'v5.6/dt' into next)
Merging renesas/next (9e4188a77f5e Merge branch 'renesas-drivers-for-v5.6' into renesas-next)
Merging reset/reset/next (5ec504fa67af reset: intel: add unspecified HAS_IOMEM dependency)
Merging rockchip/for-next (d9279b5b52ef Merge branch 'v5.6-armsoc/dts64' into for-next)
Merging samsung-krzk/for-next (ce232ab5d7c8 Merge branch 'next/soc' into for-next)
Merging scmi/for-linux-next (f45e09d6e80b Merge remote-tracking branch 'korg_sudeep/fixes/juno' into for-linux-next)
Merging sunxi/sunxi/for-next (7493e675c584 Merge remote-tracking branches 'sunxi-korg/sunxi/clk-fixes-for-5.5', 'sunxi-korg/sunxi/fixes-for-5.5', 'sunxi-korg/sunxi/config-for-5.6', 'sunxi-korg/sunxi/config64-for-5.6', 'sunxi-korg/sunxi/clk-for-5.6' and 'sunxi-korg/sunxi/dt-for-5.6' into sunxi/for-next)
Merging tegra/for-next (108f7e5e9478 Merge branch for-5.6/clk into for-next)
Merging clk/clk-next (5df867145f8a of: clk: Make <linux/of_clk.h> self-contained)
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/clock/qcom,sdm845-videocc.yaml
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/clock/qcom,msm8998-gpucc.yaml
CONFLICT (modify/delete): Documentation/devicetree/bindings/clock/qcom,gpucc.yaml deleted in clk/clk-next and modified in HEAD. Version HEAD of Documentation/devicetree/bindings/clock/qcom,gpucc.yaml left in tree.
$ git rm -f Documentation/devicetree/bindings/clock/qcom,gpucc.yaml
Merging clk-samsung/for-next (54ecb8f7028c Linux 5.4-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 (a019f12a764d csky: Minimize defconfig to support buildroot config.fragment)
Merging h8300/h8300-next (a5de8865cb3e h8300: move definition of __kernel_size_t etc. to posix_types.h)
Merging ia64/next (240b62d381fe ia64: remove stale paravirt leftovers)
Merging m68k/for-next (6aabc1facdb2 m68k: Implement copy_thread_tls())
Merging m68knommu/for-next (8044aad70a1f m68knommu: fix memcpy() out of bounds warning in get_user())
Merging microblaze/next (6aa71ef9bcf9 microblaze: Add ID for Microblaze v11)
Merging mips/mips-next (2c4288719806 MIPS: PCI: Add detection of IOC3 on IO7, IO8, IO9 and Fuel)
Merging nds32/next (a7f96fce201c MAINTAINERS: add nds32 maintainer)
Merging nios2/for-next (051d75d3bb31 MAINTAINERS: Update Ley Foon Tan's email address)
Merging openrisc/for-next (0ecdcaa6d5e7 openrisc: Fix Kconfig indentation)
Merging parisc-hd/for-next (84669923e1ed parisc: Regenerate parisc defconfigs)
Merging powerpc/next (4c25df5640ae Merge branch 'topic/user-access-begin' into next)
Merging fsl/next (a76bea0287ce powerpc/kmcent2: add ranges to the pci bridges)
Merging soc-fsl/next (6e62bd36e9ad soc: fsl: qe: remove set but not used variable 'mm_gc')
Merging risc-v/for-next (b2389902f6fd riscv: Use flush_icache_mm for flush_icache_user_range)
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 (55d0a513a0e2 s390/pkey/zcrypt: Support EP11 AES secure keys)
Merging sh/sh-next (a193018e5290 sh: add missing EXPORT_SYMBOL() for __delay)
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 (d65197ad5249 um: Fix time-travel=inf-cpu with xor/raid6)
Merging xtensa/xtensa-for-next (362961f4063f Merge branch 'xtensa-5.6-fixes' into xtensa-for-next)
Merging fscrypt/master (edc440e3d27f fscrypt: improve format of no-key names)
Merging afs/afs-next (4fe171bb81b1 afs: Remove set but not used variable 'ret')
Merging btrfs/for-next (1f1b5766df75 Merge branch 'for-next-current-v5.5-20200202' into for-next-20200202)
Merging ceph/master (3325322f773b rbd: set the 'device' link in sysfs)
Merging cifs/for-next (4b675bae891f smb3: Add defines for new information level, FileIdInformation)
Merging configfs/for-next (e2f238f7d5a1 configfs: calculate the depth of parent item)
Merging ecryptfs/next (b4a81b87a4cf ecryptfs: fix a memory leak bug in ecryptfs_init_messaging())
Merging erofs/dev (1e4a29556794 erofs: clean up z_erofs_submit_queue())
Merging ext3/for_next (daf1cd925487 Pull macro cleanup patches.)
Merging ext4/dev (7f6225e446cc jbd2: clean __jbd2_journal_abort_hard() and __journal_abort_soft())
Merging f2fs/dev (ccaaaf6fe5a5 Merge tag 'mpx-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/daveh/x86-mpx)
Merging fsverity/fsverity (da3a3da4e6c6 fs-verity: use u64_to_user_ptr())
Merging fuse/for-next (cabdb4fa2f66 fuse: use true,false for bool variable)
CONFLICT (content): Merge conflict in Documentation/filesystems/index.rst
Merging jfs/jfs-next (802a5017ffb2 jfs: remove unused MAXL2PAGES)
Merging nfs/linux-next (d5226fa6dbae Linux 5.5)
Merging nfs-anna/linux-next (7dc2993a9e51 NFSv4.0: nfs4_do_fsinfo() should not do implicit lease renewals)
Merging nfsd/nfsd-next (06b3fc37dfd6 nfsd4: fix double free in nfsd4_do_async_copy())
Applying: Revert "sunrpc: expiry_time should be seconds not timeval"
Merging orangefs/for-next (9f198a2ac543 help_next should increase position index)
Merging overlayfs/overlayfs-next (a4ac9d45c0cd ovl: fix lseek overflow on 32bit)
Merging ubifs/linux-next (fe357dbae113 ubi: Fix an error pointer dereference in error handling code)
Merging v9fs/9p-next (79fb9216b7be 9p: Remove unneeded semicolon)
Merging xfs/for-next (cdbcf82b86ea xfs: fix xfs_buf_ioerror_alert location reporting)
Merging zonefs/for-next (c9dcfd4ccc1e zonefs: Add documentation)
Merging iomap/iomap-for-next (243145bc4336 fs: Fix page_mkwrite off-by-one errors)
Merging djw-vfs/vfs-for-next (3253d9d09337 splice: only read in as much information as there is pipe buffer space)
Merging file-locks/locks-next (98ca480a8f22 locks: print unsigned ino in /proc/locks)
Merging vfs/for-next (2b15195481e0 Merge branch 'merge.nfs-fs_parse' into for-next)
CONFLICT (content): Merge conflict in fs/jbd2/journal.c
CONFLICT (content): Merge conflict in fs/fuse/inode.c
CONFLICT (content): Merge conflict in fs/Makefile
Merging printk/for-next (e616b43fb3a3 Merge branch 'for-5.6' into for-next)
Merging pci/next (d4e9056daedc initramfs: do not show compression mode choice if INITRAMFS_SOURCE is empty)
Merging pstore/for-next/pstore (e163fdb3f7f8 pstore/ram: Regularize prz label allocation lifetime)
Merging hid/for-next (d036ff0e56a7 Merge branch 'for-5.6/logitech' into for-next)
Merging i2c/i2c/for-next (ccf7f7a51619 Revert "i2c: stm32f7: allow controller to be wakeup-source")
Merging i3c/i3c/next (3952cf8ff2f7 i3c: master: dw: reattach device on first available location of address table)
Merging dmi/master (2429c99fa13a firmware: dmi: Add dmi_memdev_handle)
Merging hwmon-staging/hwmon-next (fd8bdb23b918 hwmon: (k10temp) Display up to eight sets of CCD temperatures)
Merging jc_docs/docs-next (d1c9038ab5c1 Allow git builds of Sphinx)
Merging v4l-dvb/master (1697d9812481 media: staging/intel-ipu3: remove TODO item about acronyms)
Merging v4l-dvb-next/master (d45331b00ddb Linux 5.3-rc4)
Merging fbdev/fbdev-for-next (732146a3f1dc video: fbdev: imxfb: fix a typo in imxfb_probe())
Merging pm/linux-next (3c8785ec4b98 Merge branch 'pm-cpuidle' into linux-next)
Merging cpufreq-arm/cpufreq/arm/linux-next (a48ac1c9f294 cpufreq: brcmstb-avs: fix imbalance of cpufreq policy refcount)
Merging cpupower/cpupower (8c30fa7666ff Correction to manpage of cpupower)
Merging opp/opp/linux-next (03758d60265c opp: Replace list_kref with a local counter)
Merging thermal/thermal/linux-next (eefb85077bfe ARM: configs: Build BCM2711 thermal as module)
CONFLICT (add/add): Merge conflict in Documentation/driver-api/thermal/cpu-idle-cooling.rst
CONFLICT (add/add): Merge conflict in Documentation/devicetree/bindings/thermal/brcm,avs-ro-thermal.yaml
Merging thermal-rzhang/next (54ecb8f7028c Linux 5.4-rc1)
Merging thermal-soc/next (6c375eccded4 thermal: db8500: Rewrite to be a pure OF sensor)
Merging ieee1394/for-next (67f8e65e4fc1 firewire: net: remove set but not used variable 'guid')
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 (8889f6fa3588 RDMA/core: Make the entire API tree static)
Merging net-next/master (33b40134e5cf Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
Merging bpf-next/master (b3a608222336 Merge branch 'for-v5.6' of git://git.kernel.org:/pub/scm/linux/kernel/git/jmorris/linux-security)
Merging ipsec-next/master (9f68e3655aae Merge tag 'drm-next-2020-01-30' of git://anongit.freedesktop.org/drm/drm)
Merging mlx5-next/mlx5-next (9b695a64279e net/mlx5: Add bit to indicate support for encap/decap in sw-steering managed tables)
Merging netfilter-next/master (9f68e3655aae Merge tag 'drm-next-2020-01-30' of git://anongit.freedesktop.org/drm/drm)
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 (d54725cd11a5 netfilter: nf_tables: support for multiple devices per netdev hook)
Merging wireless-drivers-next/master (2a13513f99e7 Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git)
Merging bluetooth/master (f3d63f50c17a Bluetooth: hci_qca: Optimized code while enabling clocks for BT SOC)
Merging mac80211-next/master (30b2f0be23fb mac80211: add ieee80211_is_any_nullfunc())
Merging gfs2/for-next (a31b4ec539e9 Revert "gfs2: eliminate tr_num_revoke_rm")
Merging mtd/mtd/next (4575243c5c17 Merge tag 'nand/for-5.6' into mtd/next)
Merging nand/nand/next (d85339d9ea26 mtd: onenand: Rename omap2 driver to avoid a build warning)
Merging spi-nor/spi-nor/next (ccfb9299a0b6 mtd: spi-nor: Add support for at25sl321)
Merging crypto/master (0bc81767c5bd crypto: arm/chacha - fix build failured when kernel mode NEON is disabled)
Merging drm/drm-next (b45f1b3b585e Merge branch 'ttm-prot-fix' of git://people.freedesktop.org/~thomash/linux into drm-next)
Merging amdgpu/drm-next (a3292dbb40a4 drm/amdgpu/display: fix logic inversion in program_timing_sync())
Merging drm-intel/for-linux-next (3df29a3537ec Fix root mounting with no mount options)
Merging drm-tegra/drm/tegra/for-next (98ae41adb252 gpu: host1x: Set DMA direction only for DMA-mapped buffer objects)
Merging drm-misc/for-linux-next (e1cf35b94c5f drm/edid: fix building error)
Merging drm-msm/msm-next (5f9935f514d6 drm/msm: Fix error about comments within a comment block)
Merging mali-dp/for-upstream/mali-dp (f634c6a80287 dt/bindings: display: Add optional property node define for Mali DP500)
Merging imx-drm/imx-drm/next (4d24376370fb gpu: ipu-v3: image-convert: only sample into the next tile if necessary)
Merging etnaviv/etnaviv/next (22567d017c2c dt-bindings: etnaviv: Add #cooling-cells)
Merging regmap/for-next (ea87683909bc Merge branch 'regmap-5.6' into regmap-next)
Merging sound/for-next (6954b323a183 Merge tag 'asoc-v5.6-3' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus)
Merging sound-asoc/for-next (4492e51e32fb Merge branch 'asoc-5.6' into asoc-linus)
Merging modules/modules-next (6080d608eeff module.h: Annotate mod_kallsyms with __rcu)
Merging input/next (c5ccf2ad3d33 Input: synaptics-rmi4 - switch to reduced reporting mode)
Merging block/for-next (6c63cd46c0f7 Merge branch 'io_uring-5.6' into for-next)
Merging device-mapper/for-next (47ace7e012b9 dm: fix potential for q->make_request_fn NULL pointer)
Merging pcmcia/pcmcia-next (71705c611263 PCMCIA/i82092: remove #if 0 block)
Merging mmc/next (533a6cfe08f9 mmc: core: Default to generic_cmd6_time as timeout in __mmc_switch())
Merging md/for-next (e820d55cb99d md: fix raid10 hang issue caused by barrier)
Merging mfd/for-mfd-next (5312f321a67c mfd: syscon: Fix syscon_regmap_lookup_by_phandle_args() dummy)
Merging backlight/for-backlight-next (7af43a76695d backlight: qcom-wled: Fix unsigned comparison to zero)
Merging battery/for-next (3d32a8437c05 power: supply: ipaq_micro_battery: remove unneeded semicolon)
Merging regulator/for-next (29bf153e5fbc Merge remote-tracking branch 'regulator/topic/equal' into regulator-next)
Merging security/next-testing (10c2d111c906 security: remove EARLY_LSM_COUNT which never used)
Merging apparmor/apparmor-next (01df52d726b5 apparmor: remove duplicate check of xattrs on profile attachment.)
Merging integrity/next-integrity (d54e17b40666 Merge branch 'next-integrity.defer-measuring-keys' into next-integrity)
Merging keys/keys-next (24f779af0476 Merge branch 'keys-acl' into keys-next)
CONFLICT (content): Merge conflict in include/linux/lsm_audit.h
Merging selinux/next (98aa00345de5 selinux: fix regression introduced by move_mount(2) syscall)
Merging smack/for-next (92604e825304 smack: use GFP_NOFS while holding inode_smack::smk_lock)
Merging tomoyo/master (b3a608222336 Merge branch 'for-v5.6' of git://git.kernel.org:/pub/scm/linux/kernel/git/jmorris/linux-security)
Merging tpmdd/next (7084eddf6be9 tpm: Add tpm_version_major sysfs file)
Merging watchdog/master (057b52b4b3d5 watchdog: da9062: make restart handler atomic safe)
Merging iommu/next (e3b5ee0cfb65 Merge branches 'iommu/fixes', 'arm/smmu', 'x86/amd', 'x86/vt-d' and 'core' into next)
Merging vfio/next (7b5372ba04ca vfio: platform: fix __iomem in vfio_platform_amdxgbe.c)
Merging audit/next (cb5172d96d16 audit: Add __rcu annotation to RCU pointer)
Merging devicetree/for-next (e9a3bfe38e39 scripts/dtc: Revert "yamltree: Ensure consistent bracketing of properties with phandles")
Merging mailbox/mailbox-for-next (c6c6bc6ea9fc mailbox: imx: add support for imx v1 mu)
Merging spi/for-next (7b206f064457 Merge branch 'spi-5.6' into spi-linus)
Merging tip/auto-latest (178915ad4ab3 Merge branch 'core/urgent')
Merging clockevents/timers/drivers/next (e4c3b4213b79 clocksource/hyperv: Set TSC clocksource as default w/ InvariantTSC)
Merging edac/edac-for-next (7e5d6cf35329 EDAC/amd64: Do not warn when removing instances)
Merging irqchip/irq/irqchip-next (107945227ac5 irqchip/gic-v3-its: Reference to its_invall_cmd descriptor when building INVALL)
Merging ftrace/for-next (4a39b7764575 ftrace: Add comment to why rcu_dereference_sched() is open coded)
CONFLICT (content): Merge conflict in kernel/trace/trace.h
Merging rcu/rcu/next (59d8cc6b2e37 rcu: Forgive slow expedited grace periods at boot time)
Merging kvm/linux-next (a8be1ad01b79 KVM: vmx: delete meaningless vmx_decache_cr0_guest_bits() declaration)
Merging kvm-arm/next (51b2569402a3 KVM: arm/arm64: Fix up includes for trace.h)
Merging kvm-ppc/kvm-ppc-next (fd24a8624eb2 KVM: PPC: Book3S PR: Fix -Werror=return-type build failure)
Merging kvms390/next (b2ff728bae9b selftests: KVM: testing the local IRQs resets)
Merging xen-tip/linux-next (8557bbe5156e xen/blkback: Consistently insert one empty line between functions)
Merging percpu/for-next (9391e7a9a1e2 Merge branch 'for-5.6' into for-next)
Merging workqueues/for-next (e8ab20d9bcb3 workqueue: remove workqueue_work event class)
Merging drivers-x86/for-next (6992ca0dd017 Merge branch 'parisc-5.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux)
Merging chrome-platform/for-next (034dbec179e5 platform/chrome: cros_ec: Match implementation with headers)
Merging hsi/for-next (c1030cd45619 HSI: Remove dev_err() usage after platform_get_irq())
Merging leds/for-next (260718b3a35d leds: lm3692x: Disable chip on brightness 0)
Merging ipmi/for-next (e0354d147e58 drivers: ipmi: fix off-by-one bounds check that leads to a out-of-bounds write)
Merging driver-core/driver-core-next (90568ecf5615 Merge tag 'kvm-5.6-2' of git://git.kernel.org/pub/scm/virt/kvm/kvm)
Merging usb/usb-next (90568ecf5615 Merge tag 'kvm-5.6-2' of git://git.kernel.org/pub/scm/virt/kvm/kvm)
Merging usb-gadget/next (4baa550ecc86 usb: musb: remove dummy driver musb_am335x.c)
Merging usb-serial/usb-next (19c64e7354e5 USB: serial: cyberjack: fix spelling mistake "To" -> "Too")
Merging usb-chipidea-next/ci-for-usb-next (4d6141288c33 usb: chipidea: imx: pinctrl for HSIC is optional)
Merging phy-next/next (a5c86c557fe9 phy: mapphone-mdm6600: Fix write timeouts with shorter GPIO toggle interval)
Merging tty/tty-next (90568ecf5615 Merge tag 'kvm-5.6-2' of git://git.kernel.org/pub/scm/virt/kvm/kvm)
Merging char-misc/char-misc-next (90568ecf5615 Merge tag 'kvm-5.6-2' of git://git.kernel.org/pub/scm/virt/kvm/kvm)
Merging extcon/extcon-next (b7365587f513 extcon: Remove unneeded extern keyword from extcon.h)
Merging soundwire/next (5098cae1f79c dt-bindings: soundwire: fix example)
Merging thunderbolt/next (d5226fa6dbae Linux 5.5)
Merging staging/staging-next (90568ecf5615 Merge tag 'kvm-5.6-2' of git://git.kernel.org/pub/scm/virt/kvm/kvm)
Merging mux/for-next (f356d58c3a04 Merge branch 'i2c-mux/for-next' into for-next)
Merging icc/icc-next (30c8fa3ec61a interconnect: qcom: Add MSM8916 interconnect provider driver)
Merging slave-dma/next (bad83565eafe dmaengine: Cleanups for the slave <-> channel symlink support)
Merging cgroup/for-next (0cd9d33ace33 cgroup: init_tasks shouldn't be linked to the root cgroup)
Merging scsi/for-next (bf2f620ec1c8 Merge branch 'misc' into for-next)
Merging scsi-mkp/for-next (e0a514259378 scsi: ufs: fix spelling mistake "initilized" -> "initialized")
Merging vhost/linux-next (3ba579b619db tools/virtio: option to build an out of tree module)
CONFLICT (content): Merge conflict in drivers/block/virtio_blk.c
Merging rpmsg/for-next (5a87e60312a9 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
Merging gpio/for-next (0282c72d30d3 Merge tag 'gpio-updates-for-v5.6-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux into devel)
Merging gpio-brgl/gpio/for-next (7c01e6998ba3 gpio: wcd934x: Fix logic of wcd_gpio_get)
Merging gpio-intel/for-next (d5226fa6dbae Linux 5.5)
Merging pinctrl/for-next (122ce22cb37b pinctrl: madera: Remove extra blank line)
Merging pinctrl-intel/for-next (cd0a32371db7 pinctrl: tigerlake: Tiger Lake uses _HID enumeration)
Merging pinctrl-samsung/for-next (225a2ec19aac pinctrl: samsung: Fix missing OF and GPIOLIB dependency on S3C24xx and S3C64xx)
Merging pwm/for-next (9871abffc810 pwm: Remove set but not set variable 'pwm')
Merging userns/for-next (61a47c1ad3a4 sysctl: Remove the sysctl system call)
Merging ktest/for-next (9b5f852ae20d ktest: Make default build option oldconfig not randconfig)
Merging random/dev (4cb760b02419 s390x: Mark archrandom.h functions __must_check)
Merging kselftest/next (af4ddd607dff selftests/ftrace: fix glob selftest)
Merging y2038/y2038 (c4e71212a245 Revert "drm/etnaviv: reject timeouts with tv_nsec >= NSEC_PER_SEC")
Merging livepatching/for-next (d28b4c1b2b3d Merge branch 'for-5.6/selftests' into for-next)
Merging coresight/next (ad9882f15884 coresight: etm4x: Fix unused function warning)
Merging rtc/rtc-next (f45719240700 dt-bindings: rtc: at91rm9200: document clocks property)
Merging nvdimm/libnvdimm-for-next (46cf053efec6 Linux 5.5-rc3)
Merging at24/at24/for-next (cd5676db0574 misc: eeprom: at24: support pm_runtime control)
Merging ntb/ntb-next (1ef512b16bc8 NTB: Fix an error in get link status)
Merging kspp/for-next/kspp (c79f46a28239 Linux 5.5-rc5)
Merging cisco/for-next (9e98c678c2d6 Linux 5.1-rc1)
Merging gnss/gnss-next (d1eef1c61974 Linux 5.5-rc2)
Merging fsi/next (2c01397b71c5 fsi: aspeed: Fix OPB0 byte order register values)
Merging slimbus/for-next (526eaf5d08a2 slimbus: Use the correct style for SPDX License Identifier)
Merging nvmem/for-next (4a81ae0c43bc nvmem: add QTI SDAM driver)
Merging xarray/xarray (3a00e7c47c38 ida: remove abandoned macros)
Merging hyperv/hyperv-next (54e19d34011f hv_utils: Add the support of hibernation)
Merging auxdisplay/auxdisplay (54ecb8f7028c Linux 5.4-rc1)
Merging kgdb/kgdb/for-next (fcf2736c82ca Revert "kdb: Get rid of confusing diag msg from "rd" if current task has no regs")
Merging pidfd/for-next (8d19f1c8e193 prctl: PR_{G,S}ET_IO_FLUSHER to support controlling memory reclaim)
Merging devfreq/devfreq-next (054fef0337fe PM / devfreq: Change to DEVFREQ_GOV_UPDATE_INTERVAL event name)
Merging hmm/hmm (5292e24a6acf mm/mmu_notifiers: Use 'interval_sub' as the variable for mmu_interval_notifier)
Merging fpga/for-next (28910cee898c fpga: xilinx-pr-decoupler: Remove clk_get error message for probe defer)
Merging kunit/test (e42617b825f8 Linux 5.5-rc1)
Merging cel/cel-next (a99d8080aaf3 Linux 5.4-rc6)
Merging kasan-bitops/topic/kasan-bitops (4f4afc2c9599 docs/core-api: Remove possibly confusing sub-headings from Bit Operations)
Merging generic-ioremap/for-next (4bdc0d676a64 remove ioremap_nocache and devm_ioremap_nocache)
Merging kunit-next/kunit (35c57fc3f8ea kunit: building kunit as a module breaks allmodconfig)
Merging akpm-current/current (ec7c11f69882 aio: simplify read_events())
$ git checkout -b akpm remotes/origin/akpm/master
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 (a9a724ff8f80 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] 12+ messages in thread
* linux-next: Tree for Feb 7
@ 2022-02-07  4:40 Stephen Rothwell
  2022-02-07  4:42 ` Stephen Rothwell
  0 siblings, 1 reply; 12+ messages in thread
From: Stephen Rothwell @ 2022-02-07  4:40 UTC (permalink / raw)
  To: Linux Next Mailing List; +Cc: Linux Kernel Mailing List

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

Hi all,

Changes since 20220204:

The folio tree gained a build failure so I used the version from
next-20220204.

Non-merge commits (relative to Linus' tree): 3686
 4056 files changed, 155617 insertions(+), 54888 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,
arm64, sparc and sparc64 defconfig and htmldocs. And finally, a simple
boot test of the powerpc pseries_le_defconfig kernel in qemu (with and
without kvm enabled).

Below is a summary of the state of the merge.

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

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

^ permalink raw reply	[flat|nested] 12+ messages in thread
* linux-next: Tree for Feb 7
@ 2023-02-07  5:24 Stephen Rothwell
  0 siblings, 0 replies; 12+ messages in thread
From: Stephen Rothwell @ 2023-02-07  5:24 UTC (permalink / raw)
  To: Linux Next Mailing List; +Cc: Linux Kernel Mailing List

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

Hi all,

Changes since 20230206:

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

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

The integrity tree gained a semantic conflict against the vfs-idmapping
tree.

The mm tree gained a semantic conflict against the block tree for which
I reverted a commit.

Non-merge commits (relative to Linus' tree): 9881
 10537 files changed, 421054 insertions(+), 371208 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,
arm64, sparc and sparc64 defconfig and htmldocs. And finally, a simple
boot test of the powerpc pseries_le_defconfig kernel in qemu (with and
without kvm enabled).

Below is a summary of the state of the merge.

I am currently merging 356 trees (counting Linus' and 100 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 (d2d11f342b17 Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
Merging fixes/fixes (9c9155a3509a Merge tag 'drm-next-2022-10-14' of git://anongit.freedesktop.org/drm/drm)
Merging mm-hotfixes/mm-hotfixes-unstable (20181afff3e2 lib: parser: optimize match_NUMBER apis to use local array)
Merging kbuild-current/fixes (22e46f6480e8 kbuild: modinst: Fix build error when CONFIG_MODULE_SIG_KEY is a PKCS#11 URI)
Merging arc-current/for-curr (30a0b95b1335 Linux 6.1-rc3)
Merging arm-current/fixes (2f62847cf6ae ARM: 9287/1: Reduce __thumb2__ definition to crypto files that require it)
Merging arm64-fixes/for-next/fixes (a428eb4b99ab Partially revert "perf/arm-cmn: Optimise DTC counter accesses")
Merging arm-soc-fixes/arm/fixes (97801cfcf956 arm64: dts: mediatek: mt8195: Fix vdosys* compatible strings)
Merging davinci-current/davinci/for-current (1b929c02afd3 Linux 6.2-rc1)
Merging drivers-memory-fixes/fixes (cb8fd6f75775 memory: mvebu-devbus: Fix missing clk_disable_unprepare in mvebu_devbus_probe())
Merging tee-fixes/fixes (98268f2a2a9f Merge branch 'optee_ffa_probe_fix_for_v5.18' into fixes)
Merging m68k-current/for-linus (553b20b211c4 m68k: defconfig: Update defconfigs for v6.1-rc1)
Merging powerpc-fixes/fixes (e33416fca8a2 powerpc: Don't select ARCH_WANTS_NO_INSTR)
Merging s390-fixes/fixes (7ab41c2c08a3 s390/decompressor: specify __decompress() buf len to avoid overflow)
Merging sparc/master (2d2b17d08bfc sparc: Unbreak the build)
Merging fscrypt-current/for-current (31e1be62abde MAINTAINERS: update fscrypt git repo)
Merging fsverity-current/for-current (ef7592e466ef MAINTAINERS: update fsverity git repo, list, and patchwork)
Merging net/master (811d581194f7 net: USB: Fix wrong-direction WARNING in plusb.c)
Merging bpf/master (a6efc42a86c0 selftest: net: Improve IPV6_TCLASS/IPV6_HOPLIMIT tests apparmor compatibility)
Merging ipsec/master (6028da3f125f xfrm: fix bug with DSCP copy to v6 from v4 tunnel)
Merging netfilter/master (7fb0269720d7 Merge tag 'for-net-2022-05-23' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth)
Merging ipvs/master (64466c407a73 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf)
Merging wireless/for-next (80f8a66dede0 Revert "wifi: mac80211: fix memory leak in ieee80211_if_add()")
Merging rdma-fixes/for-rc (f9c47b2caa7f IB/hfi1: Assign npages earlier)
Merging sound-current/for-linus (7a17e8423a13 ALSA: hda/realtek: Add quirk for ASUS UM3402 using CS35L41)
Merging sound-asoc-fixes/for-linus (2e7c6652f9b8 ASoC: SOF: amd: Fix for handling spurious interrupts from DSP)
Merging regmap-fixes/for-linus (697c3892d825 regmap: apply reg_base and reg_downshift for single register ops)
Merging regulator-fixes/for-linus (4bb3d82a1820 regulator: dt-bindings: samsung,s2mps14: add lost samsung,ext-control-gpios)
Merging spi-fixes/for-linus (35bba23e6732 Merge remote-tracking branch 'spi/for-6.2' into spi-6.2)
Merging pci-current/for-linus (9c7addf8dd74 Revert "PCI/ASPM: Refactor L1 PM Substates Control Register programming")
Merging driver-core.current/driver-core-linus (2241ab53cbb5 Linux 6.2-rc5)
Merging tty.current/tty-linus (4ec5183ec486 Linux 6.2-rc7)
Merging usb.current/usb-linus (4ec5183ec486 Linux 6.2-rc7)
Merging usb-serial-fixes/usb-linus (4ec5183ec486 Linux 6.2-rc7)
Merging phy/fixes (49ebb0024bb3 phy: rockchip-typec: fix tcphy_get_mode error case)
Merging staging.current/staging-linus (2241ab53cbb5 Linux 6.2-rc5)
Merging iio-fixes/fixes-togreg (42ec40b0883c iio: light: vcnl4000: Fix WARN_ON on uninitialized lock)
Merging counter-current/counter-current (1b929c02afd3 Linux 6.2-rc1)
Merging char-misc.current/char-misc-linus (4ec5183ec486 Linux 6.2-rc7)
Merging soundwire-fixes/fixes (1b929c02afd3 Linux 6.2-rc1)
Merging thunderbolt-fixes/fixes (4ec5183ec486 Linux 6.2-rc7)
Merging input-current/for-linus (9c445d2637c9 Input: i8042 - add Clevo PCX0DX to i8042 quirk table)
Merging crypto-current/master (736f88689c69 crypto: arm64/sm4 - fix possible crash with CFI enabled)
Merging vfio-fixes/for-linus (51cdc8bc120e kvm/vfio: Fix potential deadlock on vfio group_lock)
Merging kselftest-fixes/fixes (a49fb7218ed8 selftests: amd-pstate: Don't delete source files via Makefile)
Merging modules-fixes/modules-linus (0254127ab977 module: Don't wait for GOING modules)
Merging dmaengine-fixes/fixes (2241ab53cbb5 Linux 6.2-rc5)
Merging backlight-fixes/for-backlight-fixes (88603b6dc419 Linux 6.2-rc2)
Merging mtd-fixes/mtd/fixes (c0f7ae27539f MAINTAINERS: Update email of Tudor Ambarus)
Merging mfd-fixes/for-mfd-fixes (88603b6dc419 Linux 6.2-rc2)
Merging v4l-dvb-fixes/fixes (89c08aef8f8d media: videobuf2: set q->streaming later)
Merging reset-fixes/reset/fixes (3a2390c6777e reset: uniphier-glue: Fix possible null-ptr-deref)
Merging mips-fixes/mips-fixes (88603b6dc419 Linux 6.2-rc2)
Merging at91-fixes/at91-fixes (9bfa2544dbd1 ARM: dts: at91: sam9x60: fix the ddr clock for sam9x60)
Merging omap-fixes/fixes (2a906db2824b Merge branch 'am5748-fix' into fixes)
Merging kvm-fixes/master (c2c46b10d526 KVM: selftests: Make reclaim_period_ms input always be positive)
Merging kvms390-fixes/master (0dd4cdccdab3 KVM: s390: vsie: Fix the initialization of the epoch extension (epdx) field)
Merging hwmon-fixes/hwmon (e2de0e6abd91 hwmon: (asus-ec-sensors) add missing mutex path)
Merging nvdimm-fixes/libnvdimm-fixes (c91d71363084 nvdimm: Support sizeof(struct page) > MAX_STRUCT_PAGE_SIZE)
Merging cxl-fixes/fixes (01d2cb2593b1 cxl/region: Fix null pointer dereference for resetting decoder)
Merging btrfs-fixes/next-fixes (62e590cc91d0 Merge branch 'misc-6.2' into next-fixes)
Merging vfs-fixes/fixes (9c7417b5ec44 coredump: Move dump_emit_page() to kill unused warning)
Merging dma-mapping-fixes/for-linus (3be4562584bb dma-direct: use the correct size for dma_set_encrypted())
Merging drivers-x86-fixes/fixes (eb4b55f2f26f platform/x86/intel/vsec: Add support for Meteor Lake)
Merging samsung-krzk-fixes/fixes (1b929c02afd3 Linux 6.2-rc1)
Merging pinctrl-samsung-fixes/fixes (1b929c02afd3 Linux 6.2-rc1)
Merging devicetree-fixes/dt/linus (707344c8a188 dt-bindings: interrupt-controller: arm,gic-v3: Fix typo in description of msi-controller property)
Merging dt-krzk-fixes/fixes (1b929c02afd3 Linux 6.2-rc1)
Merging scsi-fixes/fixes (15600159bcc6 scsi: Revert "scsi: core: map PQ=1, PDT=other values to SCSI_SCAN_TARGET_PRESENT")
Merging drm-fixes/drm-fixes (4ec5183ec486 Linux 6.2-rc7)
Merging drm-intel-fixes/for-linux-next-fixes (4c7b9344cadb drm/i915/hwmon: Enable PL1 power limit)
Merging mmc-fixes/fixes (2241ab53cbb5 Linux 6.2-rc5)
Merging rtc-fixes/rtc-fixes (08279468a294 rtc: sunplus: fix format string for printing resource)
Merging gnss-fixes/gnss-linus (1b929c02afd3 Linux 6.2-rc1)
Merging hyperv-fixes/hyperv-fixes (25c94b051592 Drivers: hv: vmbus: fix possible memory leak in vmbus_device_register())
Merging soc-fsl-fixes/fix (4b0986a3613c Linux 5.18)
Merging risc-v-fixes/fixes (2f394c0e7d11 riscv: disable generation of unwind tables)
Merging riscv-dt-fixes/riscv-dt-fixes (43d5f5d63699 riscv: dts: sifive: fu740: fix size of pcie 32bit memory)
Merging riscv-soc-fixes/riscv-soc-fixes (730892135b7d soc: microchip: mpfs: handle failed system service requests)
Merging fpga-fixes/fixes (1b929c02afd3 Linux 6.2-rc1)
Merging spdx/spdx-linus (5dc4c995db9e Linux 6.2-rc4)
Merging gpio-brgl-fixes/gpio/for-current (6d796c50f84c Linux 6.2-rc6)
Merging gpio-intel-fixes/fixes (1b929c02afd3 Linux 6.2-rc1)
Merging pinctrl-intel-fixes/fixes (a13bbd841bf8 pinctrl: intel: Restore the pins that used to be in Direct IRQ mode)
Merging erofs-fixes/fixes (e02ac3e7329f erofs: clean up parsing of fscache related options)
Merging kunit-fixes/kunit-fixes (254c71374a70 kunit: fix kunit_test_init_section_suites(...))
Merging ubifs-fixes/fixes (2241ab53cbb5 Linux 6.2-rc5)
Merging memblock-fixes/fixes (115d9d77bb0f mm: Always release pages to the buddy allocator in memblock_free_late().)
Merging nfsd-fixes/nfsd-fixes (4bdbba54e9b1 nfsd: don't free files unconditionally in __nfsd_file_cache_purge)
Merging irqchip-fixes/irq/irqchip-fixes (6c9f7434159b irqchip: IMX_MU_MSI should depend on ARCH_MXC)
Merging renesas-fixes/fixes (ab2866f12ca1 arm64: dts: renesas: r8a779g0: Fix HSCIF0 interrupt number)
Merging broadcom-fixes/fixes (9abf2313adc1 Linux 6.1-rc1)
Merging perf-current/perf/urgent (f883675bf652 Merge tag 'gpio-fixes-for-v6.2-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux)
Merging efi-fixes/urgent (966d47e1f27c efi: fix potential NULL deref in efi_mem_reserve_persistent)
Merging zstd-fixes/zstd-linus (0a2cbd1f53f3 lib: zstd: Fix -Wstringop-overflow warning)
Merging battery-fixes/fixes (d137900f237a power: supply: axp288_fuel_gauge: Added check for negative values)
Merging uml-fixes/fixes (bd71558d585a arch: um: Mark the stack non-executable to fix a binutils warning)
Merging asahi-soc-fixes/asahi-soc/fixes (568035b01cfb Linux 6.0-rc1)
Merging iommufd-fixes/for-rc (88603b6dc419 Linux 6.2-rc2)
Merging rust-fixes/rust-fixes (6618d69aa129 rust: print: avoid evaluating arguments in `pr_*` macros in `unsafe` blocks)
Merging drm-misc-fixes/for-linux-next-fixes (8f20660f053c drm/virtio: exbuf->fence_fd unmodified on interrupted wait)
Merging kbuild/for-next (55700b39d5bb setlocalversion: use only the correct release tag for git-describe)
Merging clang-format/clang-format (781121a7f6d1 clang-format: Fix space after for_each macros)
Merging perf/perf/core (17f248aa8664 perf script: Support Retire Latency)
Merging compiler-attributes/compiler-attributes (6cf1ab89c9e7 Compiler Attributes: Introduce __access_*() function attribute)
Merging dma-mapping/for-next (3622b86f49f8 dma-mapping: reject GFP_COMP for noncoherent allocations)
Merging asm-generic/master (32975c491ee4 uapi: Add missing _UAPI prefix to <asm-generic/types.h> include guard)
Merging arc/for-next (f2906aa86338 Linux 5.19-rc1)
Merging arm/for-next (ba07b4efc989 Merge branches 'misc' and 'fixes' into for-next)
Merging arm64/for-next/core (7294f24db4fa Merge branch 'for-next/signal' into for-next/core)
CONFLICT (content): Merge conflict in arch/arm64/Kconfig
Merging arm-perf/for-next/perf (7f49b0373976 drivers/perf: fsl_imx8_ddr_perf: Remove set-but-not-used variable)
Merging arm-soc/for-next (e0a18af2778b Merge branch 'arm/dt' into for-next)
CONFLICT (content): Merge conflict in arch/arm/mach-s3c/Makefile
Merging amlogic/for-next (330d3c9dec55 Merge branch 'v6.3/arm64-dt' into for-next)
Merging asahi-soc/asahi-soc/for-next (22991d8d5725 soc: apple: rtkit: Add register dump decoding to crashlog)
Merging aspeed/for-next (af06aa236dd7 ARM: Add wpcm450_defconfig for Nuvoton WPCM450)
Merging at91/at91-next (78712fb81548 Merge branch 'clk-microchip-fixes' into at91-next)
Merging broadcom/next (9b385edf71bd Merge branch 'devicetree-arm64/next' into next)
Merging davinci/davinci/for-next (eaafab7e8e26 MAINTAINERS: make me the maintainer of DaVinci platforms)
Merging drivers-memory/for-next (682a91c4375f Merge branch 'mem-ctrl-next' into for-next)
Merging imx-mxs/for-next (fd5368f6f08b Merge branch 'imx/defconfig' into for-next)
Merging mediatek/for-next (74ba8bb2bfb2 Merge branch 'v6.2-next/soc' into for-next)
Merging mvebu/for-next (b80b042da860 Merge branch 'mvebu/fixes' into mvebu/for-next)
Merging omap/for-next (f68a6fc58073 Merge branch 'omap-for-v6.3/cleanup' into for-next)
Merging qcom/for-next (4a67514dc7e2 Merge branches 'arm64-defconfig-for-6.3', 'arm64-for-6.3', 'clk-for-6.3', 'drivers-for-6.3' and 'dts-for-6.3' into for-next)
Merging renesas/next (8dd3dae1705b Merge branches 'renesas-arm-defconfig-for-v6.3', 'renesas-drivers-for-v6.3', 'renesas-dt-bindings-for-v6.3' and 'renesas-dts-for-v6.3' into renesas-next)
Merging reset/reset/next (1b929c02afd3 Linux 6.2-rc1)
Merging rockchip/for-next (cc2b5be472c0 Merge branch 'v6.3-armsoc/dts32' into for-next)
Merging samsung-krzk/for-next (8f33caef34d0 Merge branch 'next/drivers' into for-next)
Merging scmi/for-linux-next (6d796c50f84c Linux 6.2-rc6)
Merging stm32/stm32-next (4e74ad9f3af6 ARM: configs: multi_v7: enable NVMEM driver for STM32)
Merging sunxi/sunxi/for-next (caea0128c038 Merge branch 'sunxi/dt-for-6.3' into sunxi/for-next)
Merging tee/next (4a56b125ba20 Merge branch 'fixes' into next)
Merging tegra/for-next (de98d45290c7 Merge branch for-6.3/arm64/dt into for-next)
Merging ti/ti-next (47d72bbb6c0f arm64: dts: ti: Makefile: Rearrange entries alphabetically)
Merging xilinx/for-next (a18426505c2b Merge remote-tracking branch 'git/zynqmp/dt' into for-next)
Merging clk/clk-next (623880b50033 Merge branch 'clk-mediatek' into clk-next)
Merging clk-imx/for-next (4e197ee880c2 clk: imx6ul: add ethernet refclock mux support)
Merging clk-renesas/renesas-clk (bd176e46e9c2 clk: renesas: r8a779g0: Add CAN-FD clocks)
Merging clk-samsung/for-next (b35f27fe73d8 clk: samsung: exynosautov9: add cmu_peric1 clock support)
Merging csky/linux-next (4a3ec00957fd csky: delay: Add function alignment)
Merging loongarch/loongarch-next (5dc4c995db9e Linux 6.2-rc4)
Merging m68k/for-next (be6c50d315f9 selftests/seccomp: Add m68k support)
Merging m68knommu/for-next (75ea79d4b18b m68k: nommu: Fix misspellings of "DragonEngine")
Merging microblaze/next (1b929c02afd3 Linux 6.2-rc1)
Merging mips/mips-next (e8254a8ec901 mips: ralink: make SOC_MT7621 select PINCTRL_MT7621 and fix help section)
Merging openrisc/for-next (34a0bac084e4 MAINTAINERS: git://github -> https://github.com for openrisc)
Merging parisc-hd/for-next (3125e3b8f24c parisc: update kbuild doc. aliases for parisc64)
Merging powerpc/next (bab537805a10 powerpc: Check !irq instead of irq == NO_IRQ and remove NO_IRQ)
Merging powerpc-objtool/topic/objtool (1b929c02afd3 Linux 6.2-rc1)
Merging soc-fsl/next (4b0986a3613c Linux 5.18)
Merging risc-v/for-next (9daca9a5b9ac Merge patch series "riscv: improve boot time isa extensions handling")
CONFLICT (content): Merge conflict in arch/riscv/include/asm/hwcap.h
CONFLICT (content): Merge conflict in arch/riscv/include/asm/vdso/processor.h
CONFLICT (content): Merge conflict in arch/riscv/kernel/probes/simulate-insn.h
Merging riscv-dt/riscv-dt-for-next (d9c36d016f61 Merge patch series "Add a devicetree for the Aldec PolarFire SoC TySoM")
Merging riscv-soc/riscv-soc-for-next (f3460326e38d Merge patch series "JH7110 PMU Support")
Merging s390/for-next (e00a786462f7 Merge branch 'features' into for-next)
Merging uml/next (d5dbcfe7ee31 um: Declare fix_range_common as a static function)
Merging xtensa/xtensa-for-next (4414c1f5c7a3 xtensa: drop unused members of struct thread_struct)
Merging pidfd/for-next (2372745ea25a selftests: add tests for prctl(SET_HIDE_SELF_EXE))
Merging vfs-idmapping/for-next (9db35c4c2bc4 Merge branch 'fs.misc' into for-next)
CONFLICT (content): Merge conflict in fs/btrfs/inode.c
CONFLICT (content): Merge conflict in fs/fuse/acl.c
CONFLICT (content): Merge conflict in fs/fuse/fuse_i.h
CONFLICT (content): Merge conflict in fs/fuse/xattr.c
Merging fscrypt/for-next (5dc4c995db9e Linux 6.2-rc4)
Merging fscache/fscache-next (0885eacdc81f Merge tag 'nfsd-5.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux)
Merging afs/afs-next (a9eb558a5bea afs: Stop implementing ->writepage())
Merging btrfs/for-next (a192a142956b Merge branch 'for-next-next-v6.2-20230127' into for-next-20230127)
Merging ceph/master (a68e564adcaa ceph: blocklist the kclient when receiving corrupted snap trace)
Merging cifs/for-next (81b5a9fcdf5d cifs: don't try to use rdma offload on encrypted connections)
Merging configfs/for-next (77992f896745 configfs: remove mentions of committable items)
Merging ecryptfs/next (c1cc2db21607 ecryptfs: keystore: Fix typo 'the the' in comment)
Merging erofs/dev (55262d327799 erofs: tidy up internal.h)
Merging exfat/dev (5742d6a467d1 exfat: handle unreconized benign secondary entries)
Merging ext3/for_next (085cf7b7e2ef udf: Fix file counting in LVID)
Merging ext4/dev (1da18e38cb97 ext4: fix reserved cluster accounting in __es_remove_extent())
Merging f2fs/dev (04d7a7ae43fc f2fs: fix f2fs_show_options to show nogc_merge mount option)
CONFLICT (content): Merge conflict in fs/f2fs/namei.c
Merging fsverity/for-next (51e4e3153ebc fscrypt: support decrypting data from large folios)
Merging fuse/for-next (1cc4606d19e3 fuse: add inode/permission checks to fileattr_get/fileattr_set)
Merging gfs2/for-next (b66f723bb552 gfs2: Improve gfs2_make_fs_rw error handling)
Merging jfs/jfs-next (a60dca73a1a8 jfs: makes diUnmount/diMount in jfs_mount_rw atomic)
Merging ksmbd/ksmbd-for-next (7a17c61ee3b2 ksmbd: Fix spelling mistake "excceed" -> "exceeded")
Merging nfs/linux-next (2241ab53cbb5 Linux 6.2-rc5)
Merging nfs-anna/linux-next (7e8436728e22 nfs4: Fix kmemleak when allocate slot failed)
Merging nfsd/nfsd-next (3da20567632c nfsd: fix courtesy client with deny mode handling in nfs4_upgrade_open)
Merging ntfs3/master (57c94236401b fs/ntfs3: Refactoring of various minor issues)
Merging orangefs/for-next (31720a2b109b orangefs: Fix kmemleak in orangefs_{kernel,client}_debug_init())
Merging overlayfs/overlayfs-next (4f11ada10d0a ovl: fail on invalid uid/gid mapping at copy up)
Merging ubifs/next (0b3bc49c936c ubi: use correct names in function kernel-doc comments)
Merging v9fs/9p-next (1a4f69ef15ec 9p/client: fix data race on req->status)
Merging v9fs-ericvh/ericvh/for-next (32a145a90935 fs/9p: Fix revalidate)
CONFLICT (content): Merge conflict in fs/9p/vfs_inode.c
CONFLICT (content): Merge conflict in fs/9p/vfs_inode_dotl.c
Merging xfs/for-next (c85007e2e394 xfs: don't use BMBT btree split workers for IO completion)
Merging zonefs/for-next (43592c46375a zonefs: Cache zone group directory inodes)
CONFLICT (content): Merge conflict in fs/zonefs/super.c
Merging iomap/iomap-for-next (471859f57d42 iomap: Rename page_ops to folio_ops)
Merging djw-vfs/vfs-for-next (a79168a0c00d fs/remap_range: avoid spurious writeback on zero length request)
Merging file-locks/locks-next (c65454a94726 fs: remove locks_inode)
CONFLICT (content): Merge conflict in fs/fuse/file.c
Merging iversion/iversion-next (58a033c9a3e0 nfsd: remove fetch_iversion export operation)
CONFLICT (content): Merge conflict in fs/stat.c
Merging vfs/for-next (e9f33f8668ab Merge branches 'work.misc', 'work.namespace', 'work.alpha', 'work.minix' and 'work.sysv' into for-next)
Merging printk/for-next (89cbb0fd271f Merge branch 'for-6.3' into for-next)
Merging pci/next (78913b41945a Merge branch 'remotes/lorenzo/pci/switchtec')
Merging pstore/for-next/pstore (88603b6dc419 Linux 6.2-rc2)
Merging hid/for-next (4007c03da053 Merge branch 'for-6.3/evision' into for-next)
Merging i2c/i2c/for-next (279fe5bdd8d0 Merge branch 'i2c/for-mergewindow' into i2c/for-next)
Merging i3c/i3c/next (e826acc18bc7 i3c: transfer pid from boardinfo to device info)
Merging dmi/dmi-for-next (13a0ac816d22 firmware: dmi: Fortify entry point length checks)
Merging hwmon-staging/hwmon-next (7505dab78f58 hwmon: (aquacomputer_d5next) Add support for Aquacomputer Aquastream Ultimate)
Merging jc_docs/docs-next (747a5a95bf3e Merge branch 'docs-mw' into docs-next)
CONFLICT (content): Merge conflict in Documentation/hwmon/index.rst
Merging v4l-dvb/master (7120d6bfd6d0 media: tm6000: remove deprecated driver)
CONFLICT (content): Merge conflict in MAINTAINERS
CONFLICT (content): Merge conflict in drivers/staging/media/Kconfig
CONFLICT (content): Merge conflict in drivers/staging/media/Makefile
Merging v4l-dvb-next/master (14cd15e7a1e2 media: i2c: add imx415 cmos image sensor driver)
Merging pm/linux-next (929367dbdffe Merge branch 'pm-cpufreq-fixes' into linux-next)
Merging cpufreq-arm/cpufreq/arm/linux-next (8e6cb91f946a dt-bindings: cpufreq: cpufreq-qcom-hw: Add SM8550 compatible)
Merging cpupower/cpupower (1b929c02afd3 Linux 6.2-rc1)
Merging devfreq/devfreq-next (497e92ab8c8e PM / devfreq: Remove "select SRCU")
Merging opp/opp/linux-next (68d8ad3bd9c3 dt-bindings: opp: v2-qcom-level: Let qcom,opp-fuse-level be a 2-long array)
Merging thermal/thermal/linux-next (a2c81dc59d41 Merge back thermal control material for 6.3.)
Merging dlm/next (723b197bbdf1 fs: dlm: remove unnecessary waker_up() calls)
Merging rdma/for-next (627122280c87 RDMA/mlx5: Add work to remove temporary entries from the cache)
Merging net-next/master (c21adf256f8d Merge branch 'tuntap-socket-uid')
CONFLICT (modify/delete): Documentation/networking/device_drivers/ethernet/mellanox/mlx5.rst deleted in net-next/master and modified in HEAD.  Version HEAD of Documentation/networking/device_drivers/ethernet/mellanox/mlx5.rst left in tree.
$ git rm -f Documentation/networking/device_drivers/ethernet/mellanox/mlx5.rst
Applying: fixup for "net/mlx5: Separate mlx5 driver documentation into multiple pages"
Merging bpf-next/for-next (8306829bf845 selftests/bpf: Fix spelling mistake "detecion" -> "detection")
CONFLICT (content): Merge conflict in drivers/net/ethernet/intel/ice/ice_main.c
Merging ipsec-next/master (9f92752788d7 Merge branch 'adding-sparx5-is0-vcap-support')
Merging mlx5-next/mlx5-next (c4d508fbe54a net/mlx5: Configure IPsec steering for egress RoCEv2 traffic)
CONFLICT (content): Merge conflict in include/linux/mlx5/driver.h
Merging netfilter-next/master (677fb7525331 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
Merging ipvs-next/master (e4d0fe71f59d ipvs: avoid kfree_rcu without 2nd arg)
Merging bluetooth/master (b8ad6dcdc651 Bluetooth: btintel: Set Per Platform Antenna Gain(PPAG))
Merging wireless-next/for-next (8065c0e13f98 Merge branch 'yt8531-support')
Merging mtd/mtd/next (84549c816dc3 mtd: parsers: ofpart: add workaround for #size-cells 0)
Merging nand/nand/next (ef3e6327ff04 mtd: rawnand: sunxi: Precompute the ECC_CTL register value)
Merging spi-nor/spi-nor/next (f047382519ca Merge tag 'mtd/fixes-for-6.2-rc4' into spi-nor/next)
Merging crypto/master (c7410b425de4 hwrng: starfive - Enable compile testing)
CONFLICT (content): Merge conflict in MAINTAINERS
Merging drm/drm-next (1c0db6d84f8e Merge tag 'drm-misc-next-fixes-2023-02-02' of git://anongit.freedesktop.org/drm/drm-misc into drm-next)
CONFLICT (content): Merge conflict in Documentation/accel/introduction.rst
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gpu_error.c
Merging drm-misc/for-linux-next (d20a8f409259 accel/ivpu: Fix old dma_buf api usage)
Merging amdgpu/drm-next (69ed0c5d44d7 Revert "drm/amd/display: disable S/G display on DCN 3.1.4")
Merging drm-intel/for-linux-next (155c6b16eec2 Merge tag 'amd-drm-next-6.3-2023-01-27' of https://gitlab.freedesktop.org/agd5f/linux into drm-next)
Merging drm-tegra/for-next (b9930311641c gpu: host1x: Fix uninitialized variable use)
Merging drm-msm/msm-next (dbd7a2a941b8 PM / devfreq: Fix build issues with devfreq disabled)
Merging drm-msm-lumag/msm-next-lumag (1d233b1cb149 drm/msm/dpu: set pdpu->is_rt_pipe early in dpu_plane_sspp_atomic_update())
Merging imx-drm/imx-drm/next (927d8fd465ad drm/imx: ipuv3-plane: Remove redundant color encoding and range initialisation)
Merging etnaviv/etnaviv/next (24c26ddc349d drm/scheduler: Fix elapsed_ns kernel-doc error)
Merging fbdev/for-next (4ec5183ec486 Linux 6.2-rc7)
Merging regmap/for-next (e2f1700e954c Merge remote-tracking branch 'regmap/for-6.3' into regmap-next)
Merging sound/for-next (69218b59be20 kselftest/alsa: Run PCM tests for multiple cards in parallel)
Merging sound-asoc/for-next (b3d9b57845fc Merge remote-tracking branch 'asoc/for-6.3' into asoc-next)
CONFLICT (modify/delete): sound/soc/cirrus/ep93xx-ac97.c deleted in HEAD and modified in sound-asoc/for-next.  Version sound-asoc/for-next of sound/soc/cirrus/ep93xx-ac97.c left in tree.
CONFLICT (modify/delete): sound/soc/pxa/e740_wm9705.c deleted in HEAD and modified in sound-asoc/for-next.  Version sound-asoc/for-next of sound/soc/pxa/e740_wm9705.c left in tree.
CONFLICT (modify/delete): sound/soc/pxa/e750_wm9705.c deleted in HEAD and modified in sound-asoc/for-next.  Version sound-asoc/for-next of sound/soc/pxa/e750_wm9705.c left in tree.
CONFLICT (modify/delete): sound/soc/pxa/e800_wm9712.c deleted in HEAD and modified in sound-asoc/for-next.  Version sound-asoc/for-next of sound/soc/pxa/e800_wm9712.c left in tree.
CONFLICT (modify/delete): sound/soc/ti/davinci-vcif.c deleted in HEAD and modified in sound-asoc/for-next.  Version sound-asoc/for-next of sound/soc/ti/davinci-vcif.c left in tree.
$ git rm -f sound/soc/pxa/e740_wm9705.c sound/soc/pxa/e750_wm9705.c sound/soc/pxa/e800_wm9712.c sound/soc/cirrus/ep93xx-ac97.c sound/soc/ti/davinci-vcif.c
Merging modules/modules-next (f412eef03938 Documentation: livepatch: module-elf-format: Remove local klp_modinfo definition)
Merging input/next (04f8b4ea20c8 Input: pmic8xxx-keypad - fix a Kconfig spelling mistake & hyphenation)
CONFLICT (modify/delete): drivers/input/touchscreen/ucb1400_ts.c deleted in HEAD and modified in input/next.  Version input/next of drivers/input/touchscreen/ucb1400_ts.c left in tree.
$ git rm -f drivers/input/touchscreen/ucb1400_ts.c
Merging block/for-next (0294dd78dda4 Merge branch 'for-6.3/block' into for-next)
Applying: fixup for "ublk_drv: add mechanism for supporting unprivileged ublk device"
Merging device-mapper/for-next (e5ff99128cd9 dm: set BIO_REMAPPED flag in dm_submit_bio_remap())
Merging libata/for-next (72f2b0b21850 drivers/block: Move PARIDE protocol modules to drivers/ata/pata_parport)
Merging pcmcia/pcmcia-next (15e74c6c1ce2 pcmcia: remove AT91RM9200 Compact Flash driver)
Merging mmc/next (56f34e8ddc40 memstick: core: Imply IOSCHED_BFQ)
Merging mfd/for-mfd-next (a5f31a668da1 dt-bindings: mfd: qcom,tcsr: Add compatible for IPQ5332)
Merging backlight/for-backlight-next (718c35c8d594 backlight: ktz8866: Add support for Kinetic KTZ8866 backlight)
Merging battery/for-next (eedb923279b7 Documentation: power: rt9467: Document exported sysfs entries)
CONFLICT (content): Merge conflict in drivers/power/supply/Makefile
Merging regulator/for-next (e4b37538f6f7 Merge remote-tracking branch 'regulator/for-6.3' into regulator-next)
Merging security/next (88603b6dc419 Linux 6.2-rc2)
Merging apparmor/apparmor-next (cb60752f0c37 apparmor: fix use of strcpy in policy_unpack_test)
Merging integrity/next-integrity (4958db3245fa ima: Introduce MMAP_CHECK_REQPROT hook)
Applying: fixup for "ima: Introduce MMAP_CHECK_REQPROT hook"
Merging keys/keys-next (2d743660786e Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
Merging safesetid/safesetid-next (64b634830c91 LSM: SafeSetID: add setgroups() testing to selftest)
Merging selinux/next (88603b6dc419 Linux 6.2-rc2)
Merging smack/next (c0e48d3f7722 smackfs: Added check catlen)
Merging tomoyo/master (5fc44ba8be52 workqueue: Emit runtime message when flush_scheduled_work() is called)
Merging tpmdd/next (b0474a20b153 tpm: Add reserved memory event log)
Merging watchdog/master (d2d11f342b17 Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
Merging iommu/next (7eab5ffd59e6 Merge branches 'apple/dart', 'arm/exynos', 'arm/renesas', 'arm/smmu', 'x86/vt-d', 'x86/amd' and 'core' into next)
CONFLICT (content): Merge conflict in drivers/infiniband/hw/usnic/usnic_uiom.c
CONFLICT (content): Merge conflict in drivers/vfio/vfio_iommu_type1.c
Merging audit/next (88603b6dc419 Linux 6.2-rc2)
Merging devicetree/for-next (f9b8556d5799 dt-bindings: usb: convert fcs,fusb302.txt to yaml)
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/mmc/nvidia,tegra20-sdhci.yaml
Merging dt-krzk/for-next (825475539974 Merge branch 'next/qcom-pinctrl' into for-next)
Merging mailbox/mailbox-for-next (53c60d100427 dt-bindings: mailbox: qcom-ipcc: Add compatible for SM8550)
Merging spi/for-next (941811980df0 spi: spidev: Fix double unlock in spidev_sync())
Merging tip/master (d67c17ddc899 Merge branch into tip/master: 'x86/vdso')
CONFLICT (modify/delete): arch/arm/mach-omap2/pm24xx.c deleted in HEAD and modified in tip/master.  Version tip/master of arch/arm/mach-omap2/pm24xx.c left in tree.
$ git rm -f arch/arm/mach-omap2/pm24xx.c
Merging clockevents/timers/drivers/next (e09903cea09e clocksource/drivers/riscv: Get rid of clocksource_arch_init() callback)
Merging edac/edac-for-next (4c5be17ae445 Merge branch 'edac-drivers' into edac-for-next)
Merging irqchip/irq/irqchip-next (df2d85d0b0b5 Merge branch irq/misc-6.3 into irq/irqchip-next)
CONFLICT (content): Merge conflict in drivers/irqchip/irq-apple-aic.c
Merging ftrace/for-next (9f712417e1fc Merge remote-tracking branch 'ftrace/bootconfig/for-next' into trace/for-next)
Merging rcu/rcu/next (3c597738435c doc: Update whatisRCU.rst)
Merging kvm/next (7cb79f433e75 KVM: PPC: Fix refactoring goof in kvmppc_e500mc_init())
CONFLICT (content): Merge conflict in arch/x86/kvm/reverse_cpuid.h
Merging kvm-arm/next (eab94cb22dff Merge remote-tracking branch 'arm64/for-next/sme2' into kvmarm-master/next)
Merging kvms390/next (99b63f55dc51 KVM: s390: remove unused gisa_clear_ipm_gisc() function)
Merging kvm-x86/next (531f33c5a6ed Merge branches 'apic', 'generic', 'misc', 'mmu', 'pmu', 'selftests', 'svm' and 'vmx' into next)
CONFLICT (content): Merge conflict in arch/x86/include/asm/cpufeatures.h
Merging xen-tip/linux-next (ca0d80778e48 xen/pvcalls-back: fix permanently masked event channel)
Merging percpu/for-next (b9819165bb45 Merge branch 'for-6.2' into for-next)
Merging workqueues/for-next (c63a2e52d5e0 workqueue: Fold rebind_worker() within rebind_workers())
Merging drivers-x86/for-next (7a88de319c8e platform/x86: int3472/discrete: Get the polarity from the _DSM entry)
Merging chrome-platform/for-next (f54c013e7eef platform/chrome: cros_typec_vdm: Add Attention support)
Merging hsi/for-next (1b929c02afd3 Linux 6.2-rc1)
Merging leds/for-next (1b929c02afd3 Linux 6.2-rc1)
Merging leds-lj/for-leds-next (4aea8f30475f Documentation: leds: Correct spelling)
Merging ipmi/for-next (56298aa0468f ipmi: ipmb: Fix the MODULE_PARM_DESC associated to 'retry_time_ms')
Merging driver-core/driver-core-next (5cdc03c5cf47 devtmpfs: convert to pr_fmt)
CONFLICT (content): Merge conflict in include/linux/acpi.h
Merging usb/usb-next (25746a3fa2da drm/i915: fix up merge with usb-next branch)
Merging thunderbolt/next (06cbcbfaa651 thunderbolt: Add missing kernel-doc comment to tb_tunnel_maximum_bandwidth())
Merging usb-serial/usb-next (617c331d9107 USB: serial: option: add support for VW/Skoda "Carstick LTE")
Merging tty/tty-next (f6b2ce79b5fb Merge 6.2-rc7 into tty-next)
Merging char-misc/char-misc-next (3b65010018ec Merge tag 'icc-6.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc into char-misc-next)
CONFLICT (content): Merge conflict in MAINTAINERS
CONFLICT (content): Merge conflict in drivers/fpga/dfl.c
CONFLICT (content): Merge conflict in drivers/fpga/dfl.h
Merging accel/habanalabs-next (1c0db6d84f8e Merge tag 'drm-misc-next-fixes-2023-02-02' of git://anongit.freedesktop.org/drm/drm-misc into drm-next)
Merging coresight/next (669c4614236a coresight: tmc: Don't enable TMC when it's not ready.)
Merging fpga/for-next (ffa562d00072 fpga: bridge: return errors in the show() method of the "state" attribute)
CONFLICT (content): Merge conflict in drivers/fpga/dfl.h
Merging icc/icc-next (7bf0008a5293 Merge branch 'icc-dt' into icc-next)
Merging iio/togreg (4ae612e4af95 iio: adc: ad7291: Fix indentation error by adding extra spaces)
Merging phy-next/next (d1abd69534be phy: qcom-qmp: Introduce Kconfig symbols for discrete drivers)
Merging soundwire/next (66f95de7c13b soundwire: cadence: further simplify low-level xfer_msg_defer() callback)
Merging extcon/extcon-next (2e85d0a0201d extcon: qcom-spmi: Switch to platform_get_irq_byname_optional)
Merging gnss/gnss-next (1b929c02afd3 Linux 6.2-rc1)
Merging vfio/next (168a9c91fe0a vfio: platform: ignore missing reset if disabled at module init)
Merging staging/staging-next (7f0c12449aa9 staging: vc04_services: mmal-vchiq: fix typo in comment)
Merging counter-next/counter-next (01f714ee022e counter: fix dependency references for config MICROCHIP_TCB_CAPTURE)
Merging mux/for-next (ea327624ae52 mux: mmio: drop obsolete dependency on COMPILE_TEST)
Merging dmaengine/next (4b23603a251d dmaengine: drivers: Use devm_platform_ioremap_resource())
Merging cgroup/for-next (14fffd51f902 Merge branch 'for-6.2-fixes' into for-next)
Merging scsi/for-next (e9f87b59c685 Merge branch 'fixes' into for-next)
Merging scsi-mkp/for-next (5adca38c0b97 Merge patch series "Enable DMA clustering in the UFS driver")
Merging vhost/linux-next (0abb6759a552 vdpa: Fix a couple of spelling mistakes in some messages)
Merging rpmsg/for-next (10de8156ed71 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
Applying: remoteproc: fix for "iommu: Add a gfp parameter to iommu_map()"
Merging gpio/for-next (e73f0f0ee754 Linux 5.14-rc1)
Merging gpio-brgl/gpio/for-next (2e539b735d86 gpio: tegra186: remove unneeded loop in tegra186_gpio_init_route_mapping())
Merging gpio-intel/for-next (1b929c02afd3 Linux 6.2-rc1)
Merging pinctrl/for-next (58378dd700d4 Merge branch 'devel' into for-next)
Merging pinctrl-intel/for-next (88f8ac47bddc pinctrl: Proofreading and updating the documentation (part 2))
Merging pinctrl-renesas/renesas-pinctrl (698485cd875b pinctrl: renesas: r8a77950: Add VIN[45] pins, groups, and functions)
Merging pinctrl-samsung/for-next (1b929c02afd3 Linux 6.2-rc1)
Merging pwm/for-next (2781f8e92036 pwm: lp3943: Drop unused i2c include)
Merging userns/for-next (05bd6e0242b4 Merge of unpriv-ipc-sysctls-for-v6.2, and fix-atomic_lock_inc_below-for-v6.2 for testing in linux-next)
Merging ktest/for-next (bbf45b2ab467 ktest: Restore stty setting at first in dodie)
Merging kselftest/next (b23b16d35135 selftests/ftrace: Fix bash specific "==" operator)
Merging kunit/test (1b929c02afd3 Linux 6.2-rc1)
Merging kunit-next/kunit (766f4f2514d2 lib/hashtable_test.c: add test for the hashtable structure)
CONFLICT (content): Merge conflict in lib/kunit/test.c
Merging livepatching/for-next (b2e118419db3 Merge branch 'for-6.3/cleanup-relocations' into for-next)
Merging rtc/rtc-next (f51c8f644047 rtc: rx8010: use IRQ flags obtained from fwnode)
Merging nvdimm/libnvdimm-for-next (305a72efa791 Merge branch 'for-6.1/nvdimm' into libnvdimm-for-next)
Merging at24/at24/for-next (1b929c02afd3 Linux 6.2-rc1)
Merging ntb/ntb-next (0310a30a9395 NTB: ntb_transport: fix possible memory leak while device_register() fails)
Merging seccomp/for-next/seccomp (0fb0624b15d2 seccomp: fix kernel-doc function name warning)
Merging fsi/next (35af9fb49bc5 fsi: core: Check error number after calling ida_simple_get)
Merging slimbus/for-next (1b929c02afd3 Linux 6.2-rc1)
Merging nvmem/for-next (fa7876365ad2 nvmem: stm32: fix OPTEE dependency)
CONFLICT (content): Merge conflict in drivers/nvmem/core.c
Merging xarray/main (69cb69ea5542 ida: Remove assertions that an ID was allocated)
Merging hyperv/hyperv-next (96ec2939620c Drivers: hv: Make remove callback of hyperv driver void returned)
Merging auxdisplay/auxdisplay (ddf75a86aba2 auxdisplay: hd44780: Fix potential memory leak in hd44780_remove())
Merging kgdb/kgdb/for-next (c1cb81429df4 kdb: Fix the putarea helper function)
Merging hmm/hmm (1b929c02afd3 Linux 6.2-rc1)
Merging cfi/cfi/next (312310928417 Linux 5.18-rc1)
Merging trivial/for-next (081c8919b02b Documentation: remove trivial tree)
Merging mhi/mhi-next (3c54a3ff0a2c bus: mhi: ep: Fix off by one in mhi_ep_process_cmd_ring())
Merging memblock/for-next (2fe03412e2e1 memblock: Avoid useless checks in memblock_merge_regions().)
Merging cxl/next (bed259ea85f5 Merge branch 'for-6.3/cxl-events' into cxl/next)
Applying: fix up for "cxl: fix cxl_report_and_clear() RAS UE addr mis-assignment"
Merging zstd/zstd-next (2aa14b1ab2c4 zstd: import usptream v1.5.2)
Merging efi/next (f4412001b652 efi: arm64: Wire up BTI annotation in memory attributes table)
Merging unicode/for-next (b500d6d7243d unicode: Handle memory allocation failures in mkutf8data)
Merging slab/for-next (001aa6a1f0a0 Merge branch 'slab/for-6.3/cleanups' into slab/for-next)
Merging random/master (512dee0c00ad Merge tag 'x86-urgent-2023-01-04' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip)
Merging landlock/next (8677e555f17f selftests/landlock: Test ptrace as much as possible with Yama)
Merging rust/rust-next (892313f39ed7 rust: delete rust-project.json when running make clean)
Merging sysctl/sysctl-next (0dff89c4488f sched: Move numa_balancing sysctls to its own file)
Merging execve/for-next/execve (88603b6dc419 Linux 6.2-rc2)
Merging bitmap/bitmap-for-next (2386459394d2 lib/cpumask: update comment for cpumask_local_spread())
Merging hte/for-next (1b929c02afd3 Linux 6.2-rc1)
Merging kspp/for-next/kspp (45b3f5270e8a uaccess: Add minimum bounds check on kernel buffer size)
Merging kspp-gustavo/for-next/kspp (b942a520d9e4 bcache: Replace zero-length arrays with DECLARE_FLEX_ARRAY() helper)
Merging iommufd/for-next (bed9e516f118 Merge branch 'vfio-no-iommu' into iommufd.git for-next)
Merging mm-stable/mm-stable (9160cffd45ee mpage: convert __mpage_writepage() to use a folio more fully)
CONFLICT (content): Merge conflict in Documentation/admin-guide/cgroup-v1/memory.rst
CONFLICT (content): Merge conflict in fs/buffer.c
Merging mm-nonmm-stable/mm-nonmm-stable (21773790a772 scripts/tags.sh: fix the Kconfig tags generation when using latest ctags)
Merging mm/mm-everything (29093de189d4 Merge branch 'mm-nonmm-unstable' into mm-everything)
CONFLICT (modify/delete): drivers/gpu/drm/i810/i810_dma.c deleted in HEAD and modified in mm/mm-everything.  Version mm/mm-everything of drivers/gpu/drm/i810/i810_dma.c left in tree.
CONFLICT (content): Merge conflict in drivers/infiniband/hw/hfi1/file_ops.c
CONFLICT (modify/delete): drivers/staging/media/deprecated/meye/meye.c deleted in HEAD and modified in mm/mm-everything.  Version mm/mm-everything of drivers/staging/media/deprecated/meye/meye.c left in tree.
CONFLICT (modify/delete): drivers/staging/media/deprecated/stkwebcam/stk-webcam.c deleted in HEAD and modified in mm/mm-everything.  Version mm/mm-everything of drivers/staging/media/deprecated/stkwebcam/stk-webcam.c left in tree.
$ git rm -f drivers/gpu/drm/i810/i810_dma.c drivers/staging/media/deprecated/meye/meye.c drivers/staging/media/deprecated/stkwebcam/stk-webcam.c
Applying: udf: fix up for "fs: convert writepage_t callback to pass a folio"
Applying: accel/ivpu: fix up for "mm: introduce vma->vm_flags wrapper functions"
Applying: gfs2: fix up for "fs: convert writepage_t callback to pass a folio"
Applying: mm: fixup for "mm: implement memory-deny-write-execute as a prctl"
Applying: Revert "mm/gup: move private gup FOLL_ flags to internal.h"

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

^ permalink raw reply	[flat|nested] 12+ messages in thread
* linux-next: Tree for Feb 7
@ 2024-02-07  6:40 Stephen Rothwell
  0 siblings, 0 replies; 12+ messages in thread
From: Stephen Rothwell @ 2024-02-07  6:40 UTC (permalink / raw)
  To: Linux Next Mailing List; +Cc: Linux Kernel Mailing List

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

Hi all,

Changes since 20240206:

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

The perf tree gained a build failure so I used the version from
next-20240206.

The bcachefs tree gained a build failure so I used the version from
next-20240206.

The vfs-brauner tree gained a conflict against the nfsd tree.

The drm-misc tree still had its build failure so I used the version
from next-20240205.

The block tree lost its build failure.

The device-mapper tree gained a build failure so I used the version
from next-20240206.

The devicetree tree gained a conflict against the hwmon-staging tree.

The kvm-x86 tree gained a conflict against the tip tree.

Non-merge commits (relative to Linus' tree): 4310
 4634 files changed, 165235 insertions(+), 95461 deletions(-)

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

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

You can see which trees have been included by looking in the Next/Trees
file in the source.  There is also the merge.log file in the Next
directory.  Between each merge, the tree was built with a ppc64_defconfig
for powerpc, an allmodconfig for x86_64, a multi_v7_defconfig for arm
and a native build of tools/perf. After the final fixups (if any), I do
an x86_64 modules_install followed by builds for x86_64 allnoconfig,
powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig
and pseries_le_defconfig and i386, arm64, s390, sparc and sparc64
defconfig and htmldocs. And finally, a simple boot test of the powerpc
pseries_le_defconfig kernel in qemu (with and without kvm enabled).

Below is a summary of the state of the merge.

I am currently merging 368 trees (counting Linus' and 103 trees of bug
fix patches pending for the current merge release).

Stats about the size of the tree over time can be seen at
http://neuling.org/linux-next-size.html .

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

Thanks to Randy Dunlap for doing many randconfig builds.  And to Paul
Gortmaker for triage and bug fixes.

-- 
Cheers,
Stephen Rothwell

$ git checkout master
$ git reset --hard stable
Merging origin/master (99bd3cb0d12e Merge tag 'bcachefs-2024-02-05' of https://evilpiepirate.org/git/bcachefs)
Merging fixes/fixes (2dde18cd1d8f Linux 6.5)
Merging mm-hotfixes/mm-hotfixes-unstable (2fc82eb0f980 mm/swap_state: update zswap LRU's protection range with the folio locked)
Merging kbuild-current/fixes (41b9fb381a48 Merge tag 'net-6.8-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
Merging arc-current/for-curr (861deac3b092 Linux 6.7-rc7)
Merging arm-current/fixes (f54e8634d136 ARM: 9330/1: davinci: also select PINCTRL)
Merging arm64-fixes/for-next/fixes (c7767f5c43df arm64: vdso32: Remove unused vdso32-offsets.h)
Merging arm-soc-fixes/arm/fixes (1b5af823d703 soc/tegra: fix build failure on Tegra241)
Merging davinci-current/davinci/for-current (6613476e225e Linux 6.8-rc1)
Merging drivers-memory-fixes/fixes (6613476e225e Linux 6.8-rc1)
Merging sophgo-fixes/fixes (41bccc98fb79 Linux 6.8-rc2)
Merging tee-fixes/fixes (ceaa837f96ad Linux 6.2-rc8)
Merging m68k-current/for-linus (6b9c045b0602 m68k: defconfig: Update defconfigs for v6.7-rc1)
Merging powerpc-fixes/fixes (1c57b9f63ab3 powerpc: 85xx: mark local functions static)
Merging s390-fixes/fixes (6613476e225e Linux 6.8-rc1)
Merging fscrypt-current/for-current (4bcf6f827a79 fscrypt: check for NULL keyring in fscrypt_put_master_key_activeref())
Merging fsverity-current/for-current (a075bacde257 fsverity: don't drop pagecache at end of FS_IOC_ENABLE_VERITY)
Merging net/main (1ce2654d87e2 net: stmmac: xgmac: fix a typo of register name in DPP safety handling)
Merging bpf/master (577e4432f3ac tcp: add sanity checks to rx zerocopy)
Merging ipsec/master (983a73da1f99 xfrm: Pass UDP encapsulation in TX packet offload)
Merging netfilter/main (8059918a1377 netfilter: nft_ct: sanitize layer 3 and 4 protocol number in custom expectations)
Merging ipvs/main (8059918a1377 netfilter: nft_ct: sanitize layer 3 and 4 protocol number in custom expectations)
Merging wireless/for-next (0647903efbc8 wifi: mt76: mt7996: fix fortify warning)
Merging wpan/master (b85ea95d0864 Linux 6.7-rc1)
Merging rdma-fixes/for-rc (fdfa083549de RDMA/srpt: Support specifying the srpt_service_guid parameter)
Merging sound-current/for-linus (fddab35fd064 ALSA: hda/realtek: add IDs for Dell dual spk platform)
Merging sound-asoc-fixes/for-linus (610010737f74 ASoC: amd: yc: Add DMI quirk for Lenovo Ideapad Pro 5 16ARP8)
Merging regmap-fixes/for-linus (1a1b27115ae1 Merge remote-tracking branch 'regmap/for-6.7' into regmap-linus)
Merging regulator-fixes/for-linus (a3fa9838e814 regulator (max5970): Fix IRQ handler)
Merging spi-fixes/for-linus (c712c05e46c8 spi: imx: fix the burst length at DMA mode and CPU mode)
Merging pci-current/for-linus (6613476e225e Linux 6.8-rc1)
Merging driver-core.current/driver-core-linus (6e7ad1aebb4f driver core: fw_devlink: Improve logs for cycle detection)
Merging tty.current/tty-linus (7be50f2e8f20 serial: mxs-auart: fix tx)
Merging usb.current/usb-linus (b55fe36efc22 Merge tag 'thunderbolt-for-v6.8-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt into usb-linus)
Merging usb-serial-fixes/usb-linus (54be6c6c5ae8 Linux 6.8-rc3)
Merging phy/fixes (54be6c6c5ae8 Linux 6.8-rc3)
Merging staging.current/staging-linus (6613476e225e Linux 6.8-rc1)
Merging iio-fixes/fixes-togreg (4cb81840d8f2 iio: accel: bma400: Fix a compilation problem)
Merging counter-current/counter-current (6613476e225e Linux 6.8-rc1)
Merging char-misc.current/char-misc-linus (54be6c6c5ae8 Linux 6.8-rc3)
Merging soundwire-fixes/fixes (6613476e225e Linux 6.8-rc1)
Merging thunderbolt-fixes/fixes (ec4d82f855ce thunderbolt: Fix setting the CNS bit in ROUTER_CS_5)
Merging input-current/for-linus (4255447ad34c Input: i8042 - add Fujitsu Lifebook U728 to i8042 quirk table)
Merging crypto-current/master (24c890dd712f crypto: algif_hash - Remove bogus SGL free on zero-length error path)
Merging vfio-fixes/for-linus (4ea95c04fa6b vfio: Drop vfio_file_iommu_group() stub to fudge around a KVM wart)
Merging kselftest-fixes/fixes (b54761f6e977 kselftest/seccomp: Report each expectation we assert as a KTAP test)
Merging modules-fixes/modules-linus (f412eef03938 Documentation: livepatch: module-elf-format: Remove local klp_modinfo definition)
Merging dmaengine-fixes/fixes (54be6c6c5ae8 Linux 6.8-rc3)
Merging backlight-fixes/for-backlight-fixes (6613476e225e Linux 6.8-rc1)
Merging mtd-fixes/mtd/fixes (e6a30d0c48a1 mtd: rawnand: marvell: fix layouts)
Merging mfd-fixes/for-mfd-fixes (6613476e225e Linux 6.8-rc1)
Merging v4l-dvb-fixes/fixes (346c84e281a9 media: pwm-ir-tx: Depend on CONFIG_HIGH_RES_TIMERS)
Merging reset-fixes/reset/fixes (4a6756f56bcf reset: Fix crash when freeing non-existent optional resets)
Merging mips-fixes/mips-fixes (59be5c358501 mips: Call lose_fpu(0) before initializing fcr31 in mips_set_personality_nan)
Merging at91-fixes/at91-fixes (6613476e225e Linux 6.8-rc1)
Merging omap-fixes/fixes (9b6a51aab5f5 ARM: dts: Fix occasional boot hang for am3 usb)
Merging kvm-fixes/master (e45964771007 x86/coco: Define cc_vendor without CONFIG_ARCH_HAS_CC_PLATFORM)
Merging kvms390-fixes/master (83303a4c776c KVM: s390: fix cc for successful PQAP)
Merging hwmon-fixes/hwmon (34cf8c657cf0 hwmon: (coretemp) Enlarge per package core count limit)
Merging nvdimm-fixes/libnvdimm-fixes (33908660e814 ACPI: NFIT: Fix incorrect calculation of idt size)
Merging cxl-fixes/fixes (6be99530c92c x86/numa: Fix the sort compare func used in numa_fill_memblks())
Merging btrfs-fixes/next-fixes (c94bd41cb0b6 Merge branch 'misc-6.8' into next-fixes)
Merging vfs-fixes/fixes (dac853a94365 Revert "get rid of DCACHE_GENOCIDE")
Merging dma-mapping-fixes/for-linus (d5090484b021 swiotlb: do not try to allocate a TLB bigger than MAX_ORDER pages)
Merging drivers-x86-fixes/fixes (1abdf288b0ef platform/x86: touchscreen_dmi: Add info for the TECLAST X16 Plus tablet)
Merging samsung-krzk-fixes/fixes (eab4f56d3e75 ARM: dts: exynos4212-tab3: add samsung,invert-vclk flag to fimd)
Merging pinctrl-samsung-fixes/fixes (6613476e225e Linux 6.8-rc1)
Merging devicetree-fixes/dt/linus (17adc3f329e9 net: marvell,prestera: Fix example PCI bus addressing)
Merging dt-krzk-fixes/fixes (6613476e225e Linux 6.8-rc1)
Merging scsi-fixes/fixes (17e94b258541 scsi: ufs: core: Remove the ufshcd_release() in ufshcd_err_handling_prepare())
Merging drm-fixes/drm-fixes (d0399da9fb5f drm/sched: Re-queue run job worker when drm_sched_entity_pop_job() returns NULL)
Merging drm-intel-fixes/for-linux-next-fixes (a99682e839af Merge tag 'gvt-fixes-2024-02-05' of https://github.com/intel/gvt-linux into drm-intel-fixes)
Merging mmc-fixes/fixes (cc9432c4fb15 mmc: slot-gpio: Allow non-sleeping GPIO ro)
Merging rtc-fixes/rtc-fixes (08279468a294 rtc: sunplus: fix format string for printing resource)
Merging gnss-fixes/gnss-linus (54be6c6c5ae8 Linux 6.8-rc3)
Merging hyperv-fixes/hyperv-fixes (564eac2860bd hv_utils: Allow implicit ICTIMESYNCFLAG_SYNC)
Merging soc-fsl-fixes/fix (06c2afb862f9 Linux 6.5-rc1)
Merging risc-v-fixes/fixes (6613476e225e Linux 6.8-rc1)
Merging riscv-dt-fixes/riscv-dt-fixes (6613476e225e Linux 6.8-rc1)
Merging riscv-soc-fixes/riscv-soc-fixes (a9d022ae8c4f Merge branch 'riscv-soc-drivers-fixes' into riscv-soc-fixes)
Merging fpga-fixes/fixes (6613476e225e Linux 6.8-rc1)
Merging spdx/spdx-linus (6613476e225e Linux 6.8-rc1)
Merging gpio-brgl-fixes/gpio/for-current (41bccc98fb79 Linux 6.8-rc2)
Merging gpio-intel-fixes/fixes (6613476e225e Linux 6.8-rc1)
Merging pinctrl-intel-fixes/fixes (6613476e225e Linux 6.8-rc1)
Merging erofs-fixes/fixes (d9281660ff3f erofs: relaxed temporary buffers allocation on readahead)
Merging kunit-fixes/kunit-fixes (1a9f2c776d14 Documentation: KUnit: Update the instructions on how to test static functions)
Merging ubifs-fixes/fixes (2241ab53cbb5 Linux 6.2-rc5)
Merging memblock-fixes/fixes (6a9531c3a880 memblock: fix crash when reserved memory is not added to memory)
Merging nfsd-fixes/nfsd-fixes (5ea9a7c5fe41 nfsd: don't take fi_lock in nfsd_break_deleg_cb())
Merging renesas-fixes/fixes (9eab43facdad soc: renesas: ARCH_R9A07G043 depends on !RISCV_ISA_ZICBOM)
Merging perf-current/perf-tools (fdd0ae72b34e perf tools headers: update the asm-generic/unaligned.h copy with the kernel sources)
Merging efi-fixes/urgent (1ad55cecf22f x86/efistub: Use 1:1 file:memory mapping for PE/COFF .compat section)
Merging zstd-fixes/zstd-linus (77618db34645 zstd: Fix array-index-out-of-bounds UBSAN warning)
Merging battery-fixes/fixes (d0266d7ab161 Revert "power: supply: qcom_battmgr: Register the power supplies after PDR is up")
Merging uml-fixes/fixes (73a23d771033 um: harddog: fix modular build)
Merging iommufd-fixes/for-rc (28b9f669e10f iommufd/iova_bitmap: Consider page offset for the pages to be pinned)
Merging rust-fixes/rust-fixes (6613476e225e Linux 6.8-rc1)
Merging v9fs-fixes/fixes/next (6613476e225e Linux 6.8-rc1)
Merging w1-fixes/fixes (6613476e225e Linux 6.8-rc1)
Merging pmdomain-fixes/fixes (c41336f4d690 pmdomain: mediatek: fix race conditions with genpd)
Merging overlayfs-fixes/ovl-fixes (420332b94119 ovl: mark xwhiteouts directory with overlay.opaque='x')
Merging i2c-host-fixes/i2c/i2c-host-fixes (9189526c46f2 MAINTAINERS: Update i2c host drivers repository)
Merging drm-misc-fixes/for-linux-next-fixes (5f8408aca667 accel/ivpu: Add job status for jobs aborted by the driver)
Merging mm-stable/mm-stable (54be6c6c5ae8 Linux 6.8-rc3)
Merging mm-nonmm-stable/mm-nonmm-stable (54be6c6c5ae8 Linux 6.8-rc3)
Merging mm/mm-everything (fd01e57c7956 Merge branch 'mm-nonmm-unstable' into mm-everything)
Merging kbuild/for-next (a8fdabe1e15d kbuild: deb-pkg: call more misc debhelper commands)
Merging clang-format/clang-format (5a205c6a9f79 clang-format: Update with v6.7-rc4's `for_each` macro list)
Merging perf/perf-tools-next (e024fa6a5566 perf/pmu-events/powerpc: Update json mapfile with Power11 PVR)
$ git reset --hard HEAD^
Merging next-20240206 version of perf
Merging compiler-attributes/compiler-attributes (2993eb7a8d34 Compiler Attributes: counted_by: fixup clang URL)
Merging dma-mapping/for-next (7c65aa3cc072 dma-debug: fix kernel-doc warnings)
Merging asm-generic/master (34b2321cc648 MAINTAINERS: Add Andreas Larsson as co-maintainer for arch/sparc)
Merging arc/for-next (0bb80ecc33a8 Linux 6.6-rc1)
Merging arm/for-next (8790fade1a19 Merge branches 'misc' and 'fixes' into for-next)
Merging arm64/for-next/core (1b20d0486a60 arm64: Fix silcon-errata.rst formatting)
Merging arm-perf/for-next/perf (bb339db4d363 arm: perf: Fix ARCH=arm build with GCC)
Merging arm-soc/for-next (de4b6d6705a7 Merge branch 'soc/defconfig' into for-next)
Merging amlogic/for-next (0dd3ee311255 Linux 6.7)
Merging asahi-soc/asahi-soc/for-next (ffc253263a13 Linux 6.6)
Merging aspeed/for-next (e60f7a99d378 ARM: dts: aspeed: minerva: add sgpio line name)
Merging at91/at91-next (859f600457cc Merge branch 'clk-microchip' into at91-next)
Merging broadcom/next (412c6bd2c649 Merge branch 'soc/next' into next)
Merging davinci/davinci/for-next (6613476e225e Linux 6.8-rc1)
Merging drivers-memory/for-next (2f542c937c48 dt-bindings: memory-controllers: narrow regex for unit address to hex numbers)
Merging imx-mxs/for-next (d93b6c641bc9 Merge branch 'imx/defconfig' into for-next)
Merging mediatek/for-next (8645a7bbcb27 Merge branch 'v6.8-next/dts64' into for-next)
Merging mvebu/for-next (476887312c60 Merge branch 'mvebu/drivers' into mvebu/for-next)
Merging omap/for-next (0012c1958460 Merge branches 'sgx-for-v6.9' and 'omap-for-v6.9/soc' into for-next)
Merging qcom/for-next (cff747252a48 Merge branches 'arm32-for-6.9', 'arm64-defconfig-for-6.9', 'arm64-fixes-for-6.8', 'arm64-for-6.9', 'clk-for-6.9' and 'drivers-for-6.9' into for-next)
Merging renesas/next (91487349a9c3 Merge branch 'renesas-dts-for-v6.9' into renesas-next)
Merging reset/reset/next (c3c46acd5be9 dt-bindings: reset: hisilicon,hi3660-reset: Drop providers and consumers from example)
Merging rockchip/for-next (13c241737fc0 Merge branch 'v6.9-armsoc/dts64' into for-next)
Merging samsung-krzk/for-next (b57058d218cc Merge branch 'next/dt' into for-next)
Merging scmi/for-linux-next (99f798bdfb75 Merge tags 'scmi-fixes-6.8' and 'ffa-fixes-6.8' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next)
Merging sophgo/for-next (41bccc98fb79 Linux 6.8-rc2)
Merging stm32/stm32-next (bda732fda193 ARM: dts: stm32: fix DSI peripheral clock on stm32mp15 boards)
Merging sunxi/sunxi/for-next (38ed19495066 Merge branch 'sunxi/dt-for-6.9' into sunxi/for-next)
Merging tee/next (84ec4fd88831 Merge branch 'tee_iov_iter_for_v6.8' into next)
Merging tegra/for-next (b762ac6498e6 Merge branch for-6.9/soc into for-next)
Merging ti/ti-next (bc805e337f69 Merge branch 'ti-k3-dts-next' into ti-next)
Merging xilinx/for-next (2d81f5ef567c Merge remote-tracking branch 'git/zynqmp/dt' into for-next)
Merging clk/clk-next (efe5a1b888ab Merge branch 'clk-fixes' into clk-next)
Merging clk-imx/for-next (6613476e225e Linux 6.8-rc1)
Merging clk-renesas/renesas-clk (5aaa139b9a03 clk: renesas: r8a779h0: Add I2C clocks)
Merging csky/linux-next (2c40c1c6adab Merge tag 'usb-6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb)
Merging loongarch/loongarch-next (cca5efe77a6a LoongArch: vDSO: Disable UBSAN instrumentation)
Merging m68k/for-next (6b9c045b0602 m68k: defconfig: Update defconfigs for v6.7-rc1)
Merging m68knommu/for-next (54be6c6c5ae8 Linux 6.8-rc3)
Merging microblaze/next (6613476e225e Linux 6.8-rc1)
Merging mips/mips-next (6613476e225e Linux 6.8-rc1)
Merging openrisc/for-next (c289330331eb openrisc: Remove kernel-doc marker from ioremap comment)
Merging parisc-hd/for-next (82b143aeb169 Revert "parisc: Only list existing CPUs in cpu_possible_mask")
Merging powerpc/next (41bccc98fb79 Linux 6.8-rc2)
Merging soc-fsl/next (fb9c384625dd bus: fsl-mc: fsl-mc-allocator: Drop a write-only variable)
Merging risc-v/for-next (cb4ede926134 riscv: Avoid code duplication with generic bitops implementation)
Merging riscv-dt/riscv-dt-for-next (5669bb5a16a0 riscv: dts: microchip: add specific compatible for mpfs pdma)
Merging riscv-soc/riscv-soc-for-next (6613476e225e Linux 6.8-rc1)
Merging s390/for-next (8eb3db95a8c8 Merge branch 'features' into for-next)
Merging sh/for-next (6613476e225e Linux 6.8-rc1)
Merging uml/next (83aec96c631e um: Mark 32bit syscall helpers as clobbering memory)
Merging xtensa/xtensa-for-next (a03cd7602a09 xtensa: don't produce FDPIC output with fdpic toolchain)
Merging bcachefs/for-next (011776b8e325 time_stats: Kill TIME_STATS_HAVE_QUANTILES)
$ git reset --hard HEAD^
Merging next-20240206 version of bcachefs
Merging pidfd/for-next (a901a3568fd2 Merge tag 'iomap-6.5-merge-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux)
Merging fscrypt/for-next (d3a7bd420076 fscrypt: clear keyring before calling key_put())
Merging afs/afs-next (abcbd3bfbbfe afs: trace: Log afs_make_call(), including server address)
Merging btrfs/for-next (c76800fdde78 Merge branch 'for-next-next-v6.8-20240206' into for-next-20240206)
Merging ceph/master (ded080c86b3f rbd: don't move requests to the running list on errors)
Merging cifs/for-next (018edd04d0aa cifs: Use more fields from netfs_io_subrequest)
Merging configfs/for-next (4425c1d9b44d configfs: improve item creation performance)
Merging ecryptfs/next (a3d78fe3e1ae fs: ecryptfs: comment typo fix)
Merging erofs/dev (aa12a790d31b erofs: make erofs_{err,info}() support NULL sb parameter)
Merging exfat/dev (0991abeddefa exfat: fix zero the unwritten part for dio read)
Merging exportfs/exportfs-next (42c3732fa807 fs: Create a generic is_dot_dotdot() utility)
Merging ext3/for_next (9e9a976eaa1d Pull UDF and quota fix.)
Merging ext4/dev (ec9d669eba4c ext4: make ext4_set_iomap() recognize IOMAP_DELALLOC map type)
Merging f2fs/dev (21ec68234826 f2fs: fix to avoid potential panic during recovery)
Merging fsverity/for-next (8e43fb06e10d fsverity: remove hash page spin lock)
Merging fuse/for-next (3f29f1c336c0 fuse: disable FOPEN_PARALLEL_DIRECT_WRITES with FUSE_DIRECT_IO_ALLOW_MMAP)
Merging gfs2/for-next (6b89b6af459f Merge tag 'gfs2-v6.8-rc2-revert' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2)
Merging jfs/jfs-next (e42e29cc4423 Revert "jfs: fix shift-out-of-bounds in dbJoin")
Merging ksmbd/ksmbd-for-next (54be6c6c5ae8 Linux 6.8-rc3)
Merging nfs/linux-next (052d534373b7 Merge tag 'exfat-for-6.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat)
Merging nfs-anna/linux-next (57331a59ac0d NFSv4.1: Use the nfs_client's rpc timeouts for backchannel)
Merging nfsd/nfsd-next (deb2beb8fa2c MAINTAINERS: add Alex Aring as Reviewer for file locking code)
Merging ntfs3/master (622cd3daa8ea fs/ntfs3: Slightly simplify ntfs_inode_printk())
Merging orangefs/for-next (31720a2b109b orangefs: Fix kmemleak in orangefs_{kernel,client}_debug_init())
Merging overlayfs/overlayfs-next (d17bb4620f90 overlayfs.rst: fix ReST formatting)
Merging ubifs/next (adbf4c4954e3 ubi: block: fix memleak in ubiblock_create())
Merging v9fs/9p-next (ff49bf186757 net: 9p: avoid freeing uninit memory in p9pdu_vreadf)
Merging v9fs-ericvh/ericvh/for-next (be57855f5050 fs/9p: fix dups even in uncached mode)
Merging xfs/for-next (881f78f47255 xfs: remove conditional building of rt geometry validator functions)
Merging zonefs/for-next (8812387d0569 zonefs: set FMODE_CAN_ODIRECT instead of a dummy direct_IO method)
Merging iomap/iomap-for-next (3ac974796e5d iomap: fix short copy in iomap_write_iter())
Merging djw-vfs/vfs-for-next (ce85a1e04645 xfs: stabilize fs summary counters for online fsck)
Merging file-locks/locks-next (e0152e7481c6 Merge tag 'riscv-for-linus-6.6-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux)
Merging iversion/iversion-next (e0152e7481c6 Merge tag 'riscv-for-linus-6.6-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux)
Merging vfs-brauner/vfs.all (23b006406f6b Merge branch 'vfs.super' into vfs.all)
CONFLICT (content): Merge conflict in fs/nfsd/nfs4layouts.c
Merging vfs/for-next (052d534373b7 Merge tag 'exfat-for-6.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat)
Merging printk/for-next (6c3a34e38436 Merge branch 'for-6.8' into for-next)
Merging pci/next (1281aa073d37 Merge branch 'pci/enumeration')
Merging pstore/for-next/pstore (69f381e67d6f pstore/zone: Add a null pointer check to the psz_kmsg_read)
Merging hid/for-next (b582e8c3ccc7 Merge branch 'for-6.8/upstream-fixes' into for-next)
Merging i2c/i2c/for-next (957bd221ac7b Merge tag 'i2c-host-fixes-6.8-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux into i2c/for-current)
Merging i2c-host/i2c/i2c-host (4b5cb5c1a346 dt-bindings: i2c: renesas,rcar-i2c: Add r8a779h0 support)
Merging i3c/i3c/next (4fa0888f6f3e i3c: document hotjoin sysfs entry)
Merging hwmon-staging/hwmon-next (1f1a48cb4432 hwmon: (coretemp) Use dynamic allocated memory for core temp_data)
Merging jc_docs/docs-next (f9197538d71a Documentation: admin-guide: tainted-kernels.rst: Add missing article and comma)
Merging v4l-dvb/master (41bccc98fb79 Linux 6.8-rc2)
Merging v4l-dvb-next/master (feb8831be9d4 media: ov08x40: Reduce start streaming time)
CONFLICT (content): Merge conflict in drivers/staging/media/atomisp/pci/atomisp_cmd.c
Merging pm/linux-next (7cfffced6d0e Merge branch 'pm-sleep' into linux-next)
Merging cpufreq-arm/cpufreq/arm/linux-next (eaffb10b51bf cpufreq: mediatek-hw: Don't error out if supply is not found)
Merging cpupower/cpupower (0086ffec768b tools cpupower bench: Override CFLAGS assignments)
Merging devfreq/devfreq-next (aed5ed595960 PM / devfreq: Synchronize devfreq_monitor_[start/stop])
Merging pmdomain/next (c8634d885a77 pmdomain: imx8mp-blk-ctrl: imx8mp_blk: Add fdcc clock to hdmimix domain)
Merging opp/opp/linux-next (ace4b31b297d cpufreq: Move dev_pm_opp_{init|free}_cpufreq_table() to pm_opp.h)
Merging thermal/thermal/linux-next (5314b1543787 thermal/drivers/exynos: Use set_trips ops)
Merging dlm/next (5beebc1dda47 dlm: update format header reflect current format)
Merging rdma/for-next (aafe4cc50969 RDMA/rxe: Remove unused 'iova' parameter from rxe_mr_init_user)
Merging net-next/main (60b4dfcda647 Merge branch 'nfc-hci-save-a-few-bytes-of-memory-when-registering-a-nfc_llc-engine')
Merging bpf-next/for-next (92a871ab9fa5 libbpf: Use OPTS_SET() macro in bpf_xdp_query())
Merging ipsec-next/master (ab1e1a38de24 xfrm6_tunnel: Use KMEM_CACHE instead of kmem_cache_create)
Merging mlx5-next/mlx5-next (d727d27db536 RDMA/mlx5: Expose register c0 for RDMA device)
Merging netfilter-next/main (5264ab612e28 selftests/net: calibrate txtimestamp)
Merging ipvs-next/main (5264ab612e28 selftests/net: calibrate txtimestamp)
Merging bluetooth/master (a93e9d51834e Bluetooth: qca: Fix triggering coredump implementation)
Merging wireless-next/for-next (94dd7ce1885e wifi: rtl8xxxu: update rate mask per sta)
Merging wpan-next/master (2373699560a7 mac802154: Avoid new associations while disassociating)
Merging wpan-staging/staging (2373699560a7 mac802154: Avoid new associations while disassociating)
Merging mtd/mtd/next (18af7e357033 mtd: flashchip: explicitly include <linux/wait.h>)
Merging nand/nand/next (4bd14b2fd8a8 mtd: spinand: esmt: Extend IDs to 5 bytes)
Merging spi-nor/spi-nor/next (3c0e1dfa703c MAINTAINERS: change my mail to the kernel.org one)
Merging crypto/master (9a14b311f2f7 crypto: ahash - unexport crypto_hash_alg_has_setkey())
Merging drm/drm-next (f8e4806e0dfa Merge tag 'drm-misc-next-2024-01-11' of git://anongit.freedesktop.org/drm/drm-misc into drm-next)
Merging drm-ci/topic/drm-ci (ad6bfe1b66a5 drm: ci: docs: fix build warning - add missing escape)
Merging drm-exynos/for-linux-next (f8e4806e0dfa Merge tag 'drm-misc-next-2024-01-11' of git://anongit.freedesktop.org/drm/drm-misc into drm-next)
Merging drm-misc/for-linux-next (1f36d634670d drm/bridge: imx: add bridge wrapper driver for i.MX8MP DWC HDMI)
CONFLICT (content): Merge conflict in drivers/gpu/drm/bridge/samsung-dsim.c
Applying: drm/ttm: initialise places
$ git reset --hard HEAD^
Merging next-20240205 version of drm-misc
Merging amdgpu/drm-next (9217b91c6458 drm/amdgpu: Reset IH OVERFLOW_CLEAR bit)
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/dc.h
Merging drm-intel/for-linux-next (074146f45783 drm/i915: Annotate more of the BIOS fb takeover failure paths)
Merging drm-tegra/for-next (2429b3c529da drm/tegra: Avoid potential 32-bit integer overflow)
Merging drm-msm/msm-next (d4ca26ac4be0 drm/msm/dp: call dp_display_get_next_bridge() during probe)
Merging drm-msm-lumag/msm-next-lumag (d4ca26ac4be0 drm/msm/dp: call dp_display_get_next_bridge() during probe)
Merging etnaviv/etnaviv/next (c9959996a8fc drm/etnaviv: add sensitive state for PE_RT_ADDR_4_PIPE(3, 0|1) address)
Merging fbdev/for-next (72fee6b0a3a4 fbdev: Restrict FB_SH_MOBILE_LCDC to SuperH)
Merging regmap/for-next (371a2e3c9789 Merge remote-tracking branch 'regmap/for-6.9' into regmap-next)
Merging sound/for-next (498e963ec7f0 ALSA: hda/realtek: Remove two HP Laptops using CS35L41)
Merging ieee1394/for-next (8dff232f6b2d firewire: core: fix build failure due to the caller of fw_csr_string())
Merging sound-asoc/for-next (2d742f069c1c Merge remote-tracking branch 'asoc/for-6.9' into asoc-next)
Merging modules/modules-next (157285397f6a lib/test_kmod: fix kernel-doc warnings)
Merging input/next (d03f030115fe Input: gameport - make gameport_bus const)
Merging block/for-next (69c95a16fe48 Merge branch 'for-6.9/block' into for-next)
CONFLICT (content): Merge conflict in block/blk.h
Merging device-mapper/for-next (076f0dbc1ae2 dm vdo: move encoding constants to encodings.h)
$ git reset --hard HEAD^
Merging next-20240206 version of device-mapper
Merging libata/for-next (7f7f2b7624d4 dt-bindings: ata: atmel: remove at91 compact flash documentation)
Merging pcmcia/pcmcia-next (4f733de8b78a pcmcia: tcic: remove unneeded "&" in call to setup_timer())
Merging mmc/next (40d83f40c44b mmc: Merge branch fixes into next)
Merging mfd/for-mfd-next (1e0ea9e75ff3 mfd: wm831x: Remove redundant forever while loop)
Merging backlight/for-backlight-next (3b75d271e161 backlight: hx8357: Fix potential NULL pointer dereference)
Merging battery/for-next (aa08a0d10f5e power: supply: axp20x_usb_power: enable usb_type reporting)
Merging regulator/for-next (8f2344ff71f6 Merge remote-tracking branch 'regulator/for-6.9' into regulator-next)
Merging security/next (54be6c6c5ae8 Linux 6.8-rc3)
Merging apparmor/apparmor-next (8ead196be219 apparmor: Fix memory leak in unpack_profile())
Merging integrity/next-integrity (1ed4b5631002 Revert "KEYS: encrypted: Add check for strsep")
Merging selinux/next (7c655bee5cd8 selinux: only filter copy-up xattrs following initialization)
Merging smack/next (f0816d4332c3 ramfs: Initialize security of in-memory inodes)
Merging tomoyo/master (0bb80ecc33a8 Linux 6.6-rc1)
Merging tpmdd/next (cebb9ce9b939 tpm/tpm_ftpm_tee: fix all kernel-doc warnings)
Merging watchdog/master (41bccc98fb79 Linux 6.8-rc2)
Merging iommu/next (d2d00e15808c powerpc: iommu: Bring back table group release_ownership() call)
Merging audit/next (aa13b709084a audit: use KMEM_CACHE() instead of kmem_cache_create())
Merging devicetree/for-next (574849054d97 of: property: use unsigned int return on of_graph_get_endpoint_count())
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/trivial-devices.yaml
Merging dt-krzk/for-next (8c82b4eef297 ARM: dts: sti: minor whitespace cleanup around '=')
Merging mailbox/for-next (cd795fb0c352 mailbox: mtk-cmdq: Add CMDQ driver support for mt8188)
Merging spi/for-next (80fa6a033ac8 Merge remote-tracking branch 'spi/for-6.9' into spi-next)
Merging tip/master (6d461dc4863f Merge branch into tip/master: 'x86/sev')
Merging clockevents/timers/drivers/next (0076a37a426b dt-bindings: timer: renesas,tmu: Document input capture interrupt)
Merging edac/edac-for-next (2f412b51fb42 Merge ras/edac-amd-atl into for-next)
Merging ftrace/for-next (4af12c95cbe8 Merge probes/for-next)
Merging rcu/rcu/next (3909f6fb5167 rcu-tasks: Maintain real-time response in rcu_tasks_postscan())
Merging kvm/next (e45964771007 x86/coco: Define cc_vendor without CONFIG_ARCH_HAS_CC_PLATFORM)
Merging kvm-arm/next (93c28484d2a0 Merge branch kvm-arm64/kerneldoc into kvmarm/next)
Merging kvms390/next (10f7b1dcdfe0 KVM: s390: cpu model: Use proper define for facility mask size)
Merging kvm-ppc/topic/ppc-kvm (41bccc98fb79 Linux 6.8-rc2)
Merging kvm-riscv/riscv_kvm_next (4d0e8f9a361b KVM: riscv: selftests: Add Zfa extension to get-reg-list test)
Merging kvm-x86/next (873eef46b33c Merge branches 'asyncpf', 'asyncpf_abi', 'fixes', 'generic', 'misc', 'mmu', 'pmu', 'selftests' and 'svm')
CONFLICT (content): Merge conflict in arch/x86/kvm/svm/sev.c
Merging xen-tip/linux-next (2d2db7d40254 xen/gntdev: Fix the abuse of underlying struct page in DMA-buf import)
Merging percpu/for-next (2d9ad81ef935 Merge branch 'for-6.8-fixes' into for-next)
Merging workqueues/for-next (40911d4457f2 Merge branch 'for-6.8-fixes' into for-6.9)
Merging drivers-x86/for-next (682c259a8496 platform/x86/intel/ifs: Remove unnecessary initialization of 'ret')
Merging chrome-platform/for-next (6613476e225e Linux 6.8-rc1)
Merging chrome-platform-firmware/for-firmware-next (e3c5df138169 firmware: coreboot: make coreboot_bus_type const)
Merging hsi/for-next (a0e35a173a86 hsi: hsi_core: make hsi_bus_type const)
Merging leds-lj/for-leds-next (54602f38551e leds: Make flash and multicolor dependencies unconditional)
Merging ipmi/for-next (296455ade1fd Merge tag 'char-misc-6.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc)
Merging driver-core/driver-core-next (f297a3844aa0 driver core: component: fix spellos)
Merging usb/usb-next (ed5551279c91 Merge 6.8-rc3 into usb-next)
Merging thunderbolt/next (dec6a613574c thunderbolt: Remove usage of the deprecated ida_simple_xx() API)
Merging usb-serial/usb-next (54be6c6c5ae8 Linux 6.8-rc3)
Merging tty/tty-next (52b56990d214 Revert "tty: serial: amba-pl011: Remove QDF2xxx workarounds")
Merging char-misc/char-misc-next (e21817acb23e Merge 6.8-rc3 into char-misc-next)
Merging accel/habanalabs-next (dddb2e526a36 accel/habanalabs: use kcalloc() instead of kzalloc())
Merging coresight/next (41bccc98fb79 Linux 6.8-rc2)
Merging fastrpc/for-next (6613476e225e Linux 6.8-rc1)
Merging fpga/for-next (ff49b00e9621 fpga: dfl: make dfl_bus_type const)
Merging icc/icc-next (8b6da6178c6a Merge branch 'icc-fixes' into icc-next)
Merging iio/togreg (a0295c1bd4a7 iio: frequency: admfm2000: New driver)
Merging phy-next/next (25ee21fc97db phy: qcom: sgmii-eth: move PCS registers to separate header)
CONFLICT (content): Merge conflict in drivers/phy/qualcomm/phy-qcom-qmp-usb.c
Merging soundwire/next (0707496ff4e4 soundwire: stream: add missing const to Documentation)
Merging extcon/extcon-next (7803680964c0 extcon: qcom-spmi-misc: don't use kernel-doc marker for comment)
Merging gnss/gnss-next (54be6c6c5ae8 Linux 6.8-rc3)
Merging vfio/next (78f70c02bdbc vfio/virtio: fix virtio-pci dependency)
Merging w1/for-next (8650843ca42a w1: make w1_bus_type const)
Merging spmi/spmi-next (b85ea95d0864 Linux 6.7-rc1)
Merging staging/staging-next (ce54e9342124 staging: Remove board staging code)
Merging counter-next/counter-next (0b3bbd8f9baf counter: linux/counter.h: fix Excess kernel-doc description warning)
Merging mux/for-next (44c026a73be8 Linux 6.4-rc3)
Merging dmaengine/next (93bdff7bb83a dmaengine: ti: k3-psil-j721s2: Add entry for CSI2RX)
Merging cgroup/for-next (8d4c171f451d docs: cgroup-v1: add missing code-block tags)
Merging scsi/for-next (59828c7b5975 Merge branch 'misc' into for-next)
Merging scsi-mkp/for-next (4ad946536537 scsi: target: tcm_loop: Make tcm_loop_lld_bus const)
Merging vhost/linux-next (f16d65124380 vdpa/mlx5: Add mkey leak detection)
Merging rpmsg/for-next (929654e8f1ad Merge branches 'rpmsg-next' and 'rproc-next' into for-next)
Merging gpio/for-next (0bb80ecc33a8 Linux 6.6-rc1)
Merging gpio-brgl/gpio/for-next (a875746f603b gpio: gpiolib: make gpio_bus_type const)
CONFLICT (content): Merge conflict in Documentation/userspace-api/index.rst
Merging gpio-intel/for-next (6613476e225e Linux 6.8-rc1)
Merging pinctrl/for-next (47eed1127d2a dt-bindings: pinctrl: amlogic: narrow regex for unit address to hex numbers)
Merging pinctrl-intel/for-next (6613476e225e Linux 6.8-rc1)
Merging pinctrl-renesas/renesas-pinctrl (fea58424e252 pinctrl: renesas: pinctrl-rzg2l: Add the missing port pins P19 to P28)
Merging pinctrl-samsung/for-next (6613476e225e Linux 6.8-rc1)
Merging pwm/pwm/for-next (67781b5742b5 pwm: bcm2835: Drop write-only member of driver private data)
Merging ktest/for-next (7dc8e24f0e09 ktest: Restore stty setting at first in dodie)
Merging kselftest/next (6a71770442b5 selftests: livepatch: Test livepatching a heavily called syscall)
Merging kunit/test (6613476e225e Linux 6.8-rc1)
Merging kunit-next/kunit (76021a887a50 kunit: Mark filter* params as rw)
Merging livepatching/for-next (602bf1830798 Merge branch 'for-6.7' into for-next)
Merging rtc/rtc-next (14688f1a91e1 rtc: nuvoton: Compatible with NCT3015Y-R and NCT3018Y-R)
Merging nvdimm/libnvdimm-for-next (a085a5eb6594 acpi/nfit: Use sysfs_emit() for all attributes)
Merging at24/at24/for-next (6613476e225e Linux 6.8-rc1)
Merging ntb/ntb-next (9341b37ec17a ntb_perf: Fix printk format)
Merging seccomp/for-next/seccomp (b068d070cb99 selftests/seccomp: Pin benchmark to single CPU)
Merging fsi/next (c5eeb63edac9 fsi: Fix panic on scom file read)
Merging slimbus/for-next (04b945e4cf81 slimbus: qcom-ngd-ctrl: Make QMI message rules const)
Merging nvmem/for-next (a0cfd5e99782 dt-bindings: nvmem: Convert xlnx,zynqmp-nvmem.txt to yaml)
Merging xarray/main (2a15de80dd0f idr: fix param name in idr_alloc_cyclic() doc)
Merging hyperv/hyperv-next (ce9ecca0238b Linux 6.6-rc2)
Merging auxdisplay/auxdisplay (c52391fafcef auxdisplay: img-ascii-lcd: Use device_get_match_data())
Merging kgdb/kgdb/for-next (4f41d30cd6dc kdb: Fix a potential buffer overflow in kdb_local())
Merging hmm/hmm (6613476e225e Linux 6.8-rc1)
Merging cfi/cfi/next (06c2afb862f9 Linux 6.5-rc1)
Merging mhi/mhi-next (ceeb64f41fe6 bus: mhi: host: Add tracing support)
Merging memblock/for-next (2159bd4e9057 memblock: Return NUMA_NO_NODE instead of -1 to improve code readability)
Merging cxl/next (73bf93edeeea cxl/core: use sysfs_emit() for attr's _show())
Merging zstd/zstd-next (3f832dfb8a8e zstd: fix g_debuglevel export warning)
Merging efi/next (4afa688d7141 efi: memmap: fix kernel-doc warnings)
Merging unicode/for-next (367122c529f3 libfs: Attempt exact-match comparison first during casefolded lookup)
Merging slab/slab/for-next (7d2ec24bd8a5 Merge branch 'slab/for-6.9/optimize-get-freelist' into slab/for-next)
Merging random/master (615d30064886 Merge tag 'trace-v6.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace)
Merging landlock/next (305aea29fd67 landlock: Document IOCTL support)
Merging rust/rust-next (f090f0d0eea9 rust: sync: update integer types in CondVar)
CONFLICT (content): Merge conflict in Documentation/process/changes.rst
Merging sysctl/sysctl-next (6613476e225e Linux 6.8-rc1)
Merging execve/for-next/execve (15fd1dc3dadb fs: binfmt_elf_efpic: don't use missing interpreter's properties)
Merging bitmap/bitmap-for-next (071ad962baf5 bitmap: Step down as a reviewer)
CONFLICT (content): Merge conflict in drivers/tty/serial/sc16is7xx.c
Merging hte/for-next (b85ea95d0864 Linux 6.7-rc1)
Merging kspp/for-next/kspp (94829c7196fb ubsan: Reintroduce signed overflow sanitizer)
Merging kspp-gustavo/for-next/kspp (6613476e225e Linux 6.8-rc1)
Merging nolibc/nolibc (6613476e225e Linux 6.8-rc1)
Merging tsm/tsm-next (f4738f56d1dc virt: tdx-guest: Add Quote generation support using TSM_REPORTS)
Merging iommufd/for-next (6613476e225e Linux 6.8-rc1)
Merging header_cleanup/header_cleanup (5f4c01f1e3c7 spinlock: Fix failing build for PREEMPT_RT)
Applying: fix up for "mm/swap: fix race condition in direct swapin path"

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

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

end of thread, other threads:[~2024-02-07  6:40 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-02-07  6:09 linux-next: Tree for Feb 7 Stephen Rothwell
2012-02-07 18:09 ` linux-next: Tree for Feb 7 (sound/soc) Randy Dunlap
2013-02-07  6:37 linux-next: Tree for Feb 7 Stephen Rothwell
2014-02-07  2:59 Stephen Rothwell
2017-02-07  5:50 Stephen Rothwell
2018-02-07  4:12 Stephen Rothwell
2019-02-07  7:22 Stephen Rothwell
2020-02-07  0:59 Stephen Rothwell
2022-02-07  4:40 Stephen Rothwell
2022-02-07  4:42 ` Stephen Rothwell
2023-02-07  5:24 Stephen Rothwell
2024-02-07  6:40 Stephen Rothwell

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).