Messages in this thread | | | Date | Sat, 26 Mar 2016 16:35:34 -0700 | Subject | Linux 4.6-rc1 | From | Linus Torvalds <> |
| |
So I'm closing the merge window a day early, partly because I have some upcoming travel, but partly because this has actually been one of the bigger merge windows in a while, and if somebody was planning on trying to sneak in any last-minute features, I really don't want to hear about it any more.
On the whole, despite the size of the merge window, this was mostly pretty pain-free. There were fairly few conflicts, and the ARM tree that traditionally has had the most of them was really one of the easiest experiences ever. Good job.
Of course, to offset that, we did have some unusual filesystem issues, with both f2fs and Ceph pulls being scolded for messing up their trees, in both cases to try to make it easier for the merge, but in both cases I really *really* want people to just worry about their own code, not make changes to accommodate what happened outside their trees.
But those were mainly about git maintenance issues, not the code itself..
And while on the filesystem side, it might be worth noting that we also have a new filesystem this time: orangefs. It's actually been pending for a longish while, with the original pull request coming in last August or so, but it got delayed this long due to input from Al that I think ended up making everybody much happier. The pull request itself came in pretty late in the merge window, but I'm happy to have it finally merged - the orangefs maintainers have been very responsive to the issues that got brought up.
But as usual, the *bulk* of the changes - by far - are just all the miscellaneous driver updates. So despite the filesystem work, drivers account for about 2/3 of the bulk of the changes. It's all over: staging drivers, networking, drm, rdma, usb, media, sound - you name it.
Outside of drivers, the biggest remaining changes are as usual the architecture updates: ARM devicetree updates being a big chunk, but there's other arm (and arm64) updates, together with x86, powerpc, s390, xtensa, and some m68k.
The rest is generic networking, filesystem updates (in addition to the already mentioned orangefs, f2fs and ceph stuff, there's also xfs, btrfs, ocfs2, ext4, and generic vfs updates). And core kernel work, as well as doc updates and tooling updates.
So quite a bit of work all over. The shortlog being much too large to post, I'm just appending my usual "merge log", which shows who I pulled from along with a very short description. As always, the full credits are to be found in the git tree.
Let's hope that a reasonably painfree merge window ends up translating to an even more painfree calming down period, despite this being a fairly big release.
Please?
Linus
---
Al Viro (1): vfs updates
Alex Williamson (1): VFIO updates
Alexandre Belloni (2): RTC updates more RTC updates
Andrew Morton (4): first patch-bomb second patch-bomb third patch-bomb fourth patch-bomb
Arnd Bergmann (10): ARM SoC non-urgent fixes ARM SoC cleanups ARM SoC platform updates ARM SoC 64-bit changes ARM DT updates ARM 64-bit DT updates ARM SoC defconfig updates ARM SoC driver updates more ARM DT changes asm-generic updates
Bjorn Andersson (1): remoteproc updates
Bjorn Helgaas (2): PCI updates PCI fixes
Bob Peterson (1): GFS2 updates
Borislav Petkov (1): EDAC updates
Brian Norris (1): MTD updates
Bruce Fields (2): nfsd updates more nfsd updates
Catalin Marinas (2): arm64 updates second set of arm64 updates
Chris Mason (1): btrfs updates
Chris Zankel (1): Xtensa updates
Christoph Hellwig (1): configfs updates
Corey Minyard (1): IPMI updates
Dan Williams (1): libnvdimm updates
Darren Hart (1): x86 platform driver updates
Dave Airlie (2): drm updates drm fixes
Dave Chinner (1): xfs updates
David Miller (2): networking updates networking bugfixes
David Teigland (1): dlm updates
David Vrabel (1): xen updates
Dmitry Torokhov (2): input updates more input updates
Doug Ledford (2): rdma updates more rdma updates
Geert Uytterhoeven (1): m68k updates
Greg KH (7): driver core updates char/misc updates tty/serial updates USB updates staging driver updates USB fixes staging driver fixes
Greg Ungerer (1): m68knommu updates
Guenter Roeck (2): hwmon updates more hwmon updates
Hans-Christian Egtvedt (1): AVR32 updates
Helge Deller (1): parisc updates
Herbert Xu (2): crypto update crypto fixes
Ingo Molnar (24): ram resource handling changes locking changes dma_*_writecombine rename read-only kernel memory updates perf updates RAS updates scheduler updates NOHZ updates x86 asm updates x86 boot updates x86 build update x86 fpu updates x86 microcode updates x86 mm updates x86 core platform updates x86 timer update RCU updates 'objtool' stack frame validation EFI updates x86 protection key support locking fixes scheduler fixes x86 fixes perf fixes
Jacek Anaszewski (1): LED updates
Jaegeuk Kim (1): f2fs updates
James Bottomley (2): SCSI updates more SCSI updates
James Morris (1): security layer updates
Jan Kara (1): UDF and quota updates
Jassi Brar (2): mailbox updates more mailbox updates
Jens Axboe (3): core block updates block driver updates block fixes
Jiri Kosina (3): HID updates trivial tree updates livepatching update
Joerg Roedel (1): IOMMU updates
Jon Mason (1): NTB bug fixes
Konrad Rzeszutek Wilk (1): iscsi_ibft update
Lee Jones (1): MFD updates
Linus Walleij (2): pin control updates GPIO updates
Mark Brown (3): spi updates regmap updates regulator updates
Martin Schwidefsky (1): s390 updates
Mauro Carvalho Chehab (1): media updates
Michael Ellerman (1): powerpc updates
Michael Tsirkin (1): virtio/vhost updates
Michal Marek (3): kbuild updates kconfig updates kbuild misc updates
Mike Marshall (1): orangefs filesystem
Mike Snitzer (1): device mapper updates
Miklos Szeredi (2): fuse update overlayfs updates
Nicholas Bellinger (2): SCSI target updates more SCSI target updates
Paolo Bonzini (2): KVM updates more KVM updates
Paul Moore (1): audit updates
Rafael Wysocki (3): power management and ACPI updates more power management and ACPI updates power management fixlet
Rich Felker (1): arch/sh updates
Richard Weinberger (1): UBI/UBIFS updates
Rob Herring (1): DeviceTree updates
Russell King (1): ARM updates
Sage Weil (1): Ceph updates
Sebastian Reichel (2): power supply and reset changes HSI updates
Shaohua Li (1): MD updates
Shuah Khan (1): Kselftest updates
Stefan Richter (2): firewire updates firewire leftover
Stephen Boyd (1): clk updates
Steven Rostedt (1): tracing updates
Takashi Iwai (2): sound updates sound fixes
Ted Ts'o (1): ext4 updates
Tejun Heo (4): workqueue updates libata updates cgroup updates cgroup namespace support
Thierry Reding (1): pwm updates
Thomas Gleixner (5): timer updates irq updates cpu hotplug updates irq fixes timer fix
Tomi Valkeinen (1): fbdev updates
Tony Luck (2): pstore update ia64 update
Trond Myklebust (1): NFS client updates
Ulf Hansson (1): MMC updates
Vineet Gupta (1): ARC architecture updates
Vinod Koul (1): dmaengine updates
Will Deacon (1): arm[64] perf updates
Wim Van Sebroeck (1): watchdog updates
Wolfram Sang (1): i2c updates
Yoshinori Sato (1): h8300 updates
Zhang Rui (1): thermal updates
| |