summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2020-03-15Linux 5.6-rc6v5.6-rc6Linus Torvalds1-1/+1
2020-03-15Merge tag 'irq-urgent-2020-03-15' of git://git.kernel.org/pub/scm/linux/kerne...Linus Torvalds2-1/+31
2020-03-15Merge tag 'locking-urgent-2020-03-15' of git://git.kernel.org/pub/scm/linux/k...Linus Torvalds4-45/+67
2020-03-15Merge tag 'x86-urgent-2020-03-15' of git://git.kernel.org/pub/scm/linux/kerne...Linus Torvalds2-6/+26
2020-03-15Merge tag 'perf-urgent-2020-03-15' of git://git.kernel.org/pub/scm/linux/kern...Linus Torvalds30-134/+139
2020-03-15Merge tag 'timers-urgent-2020-03-15' of git://git.kernel.org/pub/scm/linux/ke...Linus Torvalds1-0/+2
2020-03-15Merge tag 'ras-urgent-2020-03-15' of git://git.kernel.org/pub/scm/linux/kerne...Linus Torvalds2-6/+12
2020-03-15Merge tag 'efi-urgent-2020-03-15' of git://git.kernel.org/pub/scm/linux/kerne...Linus Torvalds1-9/+23
2020-03-15Merge tag 'iommu-fixes-v5.6-rc5' of git://git.kernel.org/pub/scm/linux/kernel...Linus Torvalds8-49/+94
2020-03-15Merge tag 'irqchip-fixes-5.6-2' of git://git.kernel.org/pub/scm/linux/kernel/...Thomas Gleixner2-1/+31
2020-03-14Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/g...Linus Torvalds14-56/+102
2020-03-14Merge tag 'arc-5.6-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/vgup...Linus Torvalds9-26/+19
2020-03-14Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvmLinus Torvalds9-13/+48
2020-03-14iommu/vt-d: Populate debugfs if IOMMUs are detectedMegha Dey2-2/+13
2020-03-14Merge tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/...Linus Torvalds5-28/+9
2020-03-14Merge branch 'kvm-null-pointer-fix' into kvm-masterPaolo Bonzini1-2/+3
2020-03-14KVM: nVMX: avoid NULL pointer dereference with incorrect EVMCS GPAsVitaly Kuznetsov1-2/+3
2020-03-14Merge tag 'kvm-s390-master-5.6-1' of git://git.kernel.org/pub/scm/linux/kerne...Paolo Bonzini1-1/+17
2020-03-14irqchip/gic-v3: Workaround Cavium erratum 38539 when reading GICD_TYPER2Marc Zyngier2-1/+31
2020-03-14KVM: x86: Initializing all kvm_lapic_irq fields in ioapic_write_indirectNitesh Narayan Lal1-2/+5
2020-03-14KVM: VMX: Condition ENCLS-exiting enabling on CPU support for SGX1Sean Christopherson1-2/+14
2020-03-14iommu/amd: Fix IOMMU AVIC not properly update the is_run bit in IRTESuravee Suthikulpanit1-2/+2
2020-03-14iommu/vt-d: Ignore devices with out-of-spec domain numberDaniel Drake1-0/+8
2020-03-14iommu/vt-d: Fix the wrong printing in RHSA parsingZhenzhong Duan1-1/+1
2020-03-13Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/...Linus Torvalds3-8/+17
2020-03-13Merge tag 'nfs-for-5.6-3' of git://git.linux-nfs.org/projects/anna/linux-nfsLinus Torvalds5-2/+13
2020-03-13Merge tag 'fuse-fixes-5.6-rc6' of git://git.kernel.org/pub/scm/linux/kernel/g...Linus Torvalds2-3/+5
2020-03-13Merge tag 'ovl-fixes-5.6-rc6' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds5-4/+23
2020-03-13Merge tag 'pm-5.6-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafae...Linus Torvalds4-3/+5
2020-03-13Merge tag 'io_uring-5.6-2020-03-13' of git://git.kernel.dk/linux-blockLinus Torvalds1-16/+13
2020-03-13Merge tag 'block-5.6-2020-03-13' of git://git.kernel.dk/linux-blockLinus Torvalds7-25/+253
2020-03-13Merge tag 'mmc-v5.6-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/u...Linus Torvalds6-5/+20
2020-03-13afs: Use kfree_rcu() instead of casting kfree() to rcu_callback_tJann Horn2-2/+2
2020-03-13Merge tag 'at24-fixes-for-v5.6-rc6' of git://git.kernel.org/pub/scm/linux/ker...Wolfram Sang1-1/+2
2020-03-13ovl: fix lockdep warning for async writeMiklos Szeredi1-0/+6
2020-03-13ovl: fix some xino configurationsAmir Goldstein2-1/+9
2020-03-13x86/vector: Remove warning on managed interrupt migrationPeter Xu1-6/+8
2020-03-13i2c: acpi: put device when verifying client failsWolfram Sang1-1/+9
2020-03-13iommu/vt-d: Fix debugfs register readsMegha Dey2-15/+27
2020-03-13iommu/vt-d: quirk_ioat_snb_local_iommu: replace WARN_TAINT with pr_warn + add...Hans de Goede1-3/+4
2020-03-13iommu/vt-d: dmar_parse_one_rmrr: replace WARN_TAINT with pr_warn + add_taintHans de Goede1-2/+4
2020-03-13iommu/vt-d: dmar: replace WARN_TAINT with pr_warn + add_taintHans de Goede1-5/+6
2020-03-12Merge tag 'drm-fixes-2020-03-13' of git://anongit.freedesktop.org/drm/drmLinus Torvalds27-133/+405
2020-03-13Merge tag 'topic/mst-bw-check-fixes-for-airlied-2020-03-12-2' of git://anongi...Dave Airlie2-60/+128
2020-03-13Merge tag 'drm-intel-fixes-2020-03-12' of git://anongit.freedesktop.org/drm/d...Dave Airlie9-29/+66
2020-03-13Merge tag 'amd-drm-fixes-5.6-2020-03-11' of git://people.freedesktop.org/~agd...Dave Airlie5-15/+158
2020-03-12Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/netLinus Torvalds110-370/+993
2020-03-12drm/dp_mst: Rewrite and fix bandwidth limit checksLyude Paul1-26/+93
2020-03-12drm/dp_mst: Reprobe path resources in CSN handlerLyude Paul1-23/+25
2020-03-12drm/dp_mst: Use full_pbn instead of available_pbn for bandwidth checksLyude Paul2-10/+9
2020-03-12drm/dp_mst: Rename drm_dp_mst_is_dp_mst_end_device() to be less redundantLyude Paul1-5/+5
2020-03-12Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfsLinus Torvalds4-5/+9
2020-03-12net: systemport: fix index check to avoid an array out of bounds accessColin Ian King1-1/+1
2020-03-12tc-testing: add ETS scheduler to tdc build configurationDavide Caratti1-0/+1
2020-03-12net: phy: fix MDIO bus PM PHY resumingHeiner Kallweit2-1/+7
2020-03-12cifs_atomic_open(): fix double-put on late allocation failureAl Viro3-4/+8
2020-03-12gfs2_atomic_open(): fix O_EXCL|O_CREAT handling on cold dcacheAl Viro1-1/+1
2020-03-12Merge branch 'hns3-fixes'David S. Miller5-5/+45
2020-03-12net: hns3: clear port base VLAN when unload PFJian Shen1-0/+23
2020-03-12net: hns3: fix RMW issue for VLAN filter switchJian Shen1-4/+15
2020-03-12net: hns3: fix VF VLAN table entries inconsistent issueJian Shen4-0/+6
2020-03-12net: hns3: fix "tc qdisc del" failed issueYonglong Liu1-1/+1
2020-03-12taprio: Fix sending packets without dequeueing themVinicius Costa Gomes1-3/+9
2020-03-12Merge tag 'for-linus-5.6-2' of git://github.com/cminyard/linux-ipmiLinus Torvalds1-2/+2
2020-03-12Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert...Linus Torvalds3-5/+13
2020-03-12ovl: fix lock in ovl_llseek()Amir Goldstein2-3/+8
2020-03-12block: Fix partition support for host aware zoned block devicesShin'ichiro Kawasaki2-12/+37
2020-03-12blk-mq: insert flush request to the front of dispatch queueMing Lei1-0/+22
2020-03-12s390/dasd: fix data corruption for thin provisioned devicesStefan Haberland3-12/+193
2020-03-12perf/amd/uncore: Replace manual sampling check with CAP_NO_INTERRUPT flagKim Phillips1-10/+7
2020-03-12mmc: core: Respect MMC_CAP_NEED_RSP_BUSY for eMMC sleep commandUlf Hansson1-2/+5
2020-03-12misc: eeprom: at24: fix regulator underflowMichael Auchter1-1/+2
2020-03-12net: mvmdio: avoid error message for optional IRQChris Packham1-3/+3
2020-03-12net: dsa: mv88e6xxx: Add missing mask of ATU occupancy registerAndrew Lunn1-0/+2
2020-03-11net: memcg: fix lockdep splat in inet_csk_accept()Eric Dumazet1-7/+7
2020-03-11Merge branch 's390-qeth-fixes'David S. Miller4-64/+119
2020-03-11s390/qeth: implement smarter resizing of the RX buffer poolJulian Wiedmann4-19/+56
2020-03-11s390/qeth: refactor buffer pool codeJulian Wiedmann1-32/+51
2020-03-11s390/qeth: use page pointers to manage RX buffer poolJulian Wiedmann2-19/+18
2020-03-11seg6: fix SRv6 L2 tunnels to use IANA-assigned protocol numberPaolo Lungaroni3-2/+4
2020-03-11net: dsa: Don't instantiate phylink for CPU/DSA ports unless neededAndrew Lunn1-3/+9
2020-03-11net/packet: tpacket_rcv: do not increment ring index on dropWillem de Bruijn1-6/+7
2020-03-11sxgbe: Fix off by one in samsung driver strncpy size argDominik Czarnota1-1/+1
2020-03-11net: caif: Add lockdep expression to RCU traversal primitiveAmol Grover1-1/+2
2020-03-11MAINTAINERS: remove Sathya Perla as Emulex NIC maintainerJakub Kicinski1-1/+0
2020-03-11net: fec: validate the new settings in fec_enet_set_coalesce()Jakub Kicinski1-3/+3
2020-03-11ipmi_si: Avoid spurious errors for optional IRQsTakashi Iwai1-2/+2
2020-03-12Merge tag 'exynos-drm-fixes-for-v5.6-rc5-v2' of git://git.kernel.org/pub/scm/...Dave Airlie11-29/+53
2020-03-11drm/i915: Defer semaphore priority bumping to a workqueueChris Wilson2-5/+19
2020-03-11drm/i915/gt: Close race between cacheline_retire and freeChris Wilson1-2/+6
2020-03-11drm/i915/execlists: Enable timeslice on partial virtual engine dequeueChris Wilson1-11/+18
2020-03-11drm/i915: be more solid in checking the alignmentMatthew Auld2-1/+7
2020-03-11drm/i915/gvt: Fix dma-buf display blur issue on CFLTina Zhang1-1/+2
2020-03-11drm/i915: Return early for await_start on same timelineChris Wilson1-2/+2
2020-03-11drm/i915: Actually emit the await_startChris Wilson1-1/+1
2020-03-11dpaa_eth: Remove unnecessary boolean expression in dpaa_get_headroomNathan Chancellor1-3/+1
2020-03-11Merge tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscryptLinus Torvalds1-0/+9
2020-03-11Merge tag 'mac80211-for-net-2020-03-11' of git://git.kernel.org/pub/scm/linux...David S. Miller2-1/+7
2020-03-11ARC: define __ALIGN_STR and __ALIGN symbols for ARCEugeniy Paltsev1-0/+2
2020-03-11ARC: show_regs: reduce lines of outputVineet Gupta1-15/+12
2020-03-11Merge tag 'for-linus-2020-03-10' of git://git.kernel.org/pub/scm/linux/kernel...Linus Torvalds1-0/+10
2020-03-11Merge tag 'trace-v5.6-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/r...Linus Torvalds1-0/+2
2020-03-11Merge tag 'mips_fixes_5.6.1' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds3-18/+31
2020-03-11Merge tag 'pinctrl-v5.6-2' of git://git.kernel.org/pub/scm/linux/kernel/git/l...Linus Torvalds7-9/+20
2020-03-11driver code: clarify and fix platform device DMA mask allocationChristoph Hellwig2-20/+7
2020-03-11mmc: sdhci-tegra: Fix busy detection by enabling MMC_CAP_NEED_RSP_BUSYUlf Hansson1-0/+3
2020-03-11mmc: sdhci-omap: Fix busy detection by enabling MMC_CAP_NEED_RSP_BUSYUlf Hansson1-0/+3
2020-03-11mmc: core: Respect MMC_CAP_NEED_RSP_BUSY for erase/trim/discardUlf Hansson1-1/+4
2020-03-11mmc: core: Allow host controllers to require R1B for CMD6Ulf Hansson2-2/+5
2020-03-11x86/ioremap: Map EFI runtime services data as encrypted for SEVTom Lendacky1-0/+18
2020-03-11ftrace: Return the first found result in lookup_rec()Artem Savkov1-0/+2
2020-03-11mac80211: Do not send mesh HWMP PREQ if HWMP is disabledNicolas Cavallari1-1/+2
2020-03-11nl80211: add missing attribute validation for channel switchJakub Kicinski1-0/+1
2020-03-11nl80211: add missing attribute validation for beacon report scanningJakub Kicinski1-0/+2
2020-03-11nl80211: add missing attribute validation for critical protocol indicationJakub Kicinski1-0/+2
2020-03-11KVM: s390: Also reset registers in sync regs for initial cpu resetChristian Borntraeger1-1/+17
2020-03-10scsi: ipr: Fix softlockup when rescanning devices in petitbootWen Xiong2-1/+3
2020-03-10Merge branch 's390-qeth-fixes'David S. Miller3-6/+11
2020-03-10s390/qeth: cancel RX reclaim work earlierJulian Wiedmann3-1/+2
2020-03-10s390/qeth: handle error when backing RX bufferJulian Wiedmann1-4/+9
2020-03-10s390/qeth: don't reset default_out_queueJulian Wiedmann1-1/+0
2020-03-10scsi: ufs: Fix possible unclocked access to auto hibern8 timer registerCan Guo1-7/+14
2020-03-10Merge branch 'MACSec-bugfixes-related-to-MAC-address-change'David S. Miller1-5/+19
2020-03-10net: macsec: invoke mdo_upd_secy callback when mac address changedDmitry Bogdanov1-0/+13
2020-03-10net: macsec: update SCI upon MAC address change.Dmitry Bogdanov1-5/+6
2020-03-10ibmvnic: Do not process device remove during device resetJuliet Kim2-3/+27
2020-03-10net/smc: cancel event worker during device removalKarsten Graul1-0/+1
2020-03-10ipv6/addrconf: call ipv6_mc_up() for non-Ethernet interfaceHangbin Liu1-0/+4
2020-03-10Merge tag 'clang-format-for-linus-v5.6-rc6' of git://github.com/ojeda/linuxLinus Torvalds1-4/+21
2020-03-10net: memcg: late association of sock to memcgShakeel Butt3-15/+24
2020-03-10cgroup: memcg: net: do not associate sock with unrelated cgroupShakeel Butt2-0/+8
2020-03-10Merge tag 'auxdisplay-for-linus-v5.6-rc6' of git://github.com/ojeda/linuxLinus Torvalds3-12/+10
2020-03-10MAINTAINERS: update cxgb4vf maintainer to VishalJakub Kicinski1-1/+1
2020-03-10Merge branch 'for-5.6-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds3-14/+29
2020-03-10Merge branch 'for-5.6-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2-6/+24
2020-03-10drm/amdgpu/powerplay: nv1x, renior copy dcn clock settings of watermark to sm...Hersen Wu3-13/+21
2020-03-10blk-iocost: fix incorrect vtime comparison in iocg_is_idle()Tejun Heo1-1/+1
2020-03-10workqueue: don't use wq_select_unbound_cpu() for bound worksHillf Danton1-6/+8
2020-03-10i2c: gpio: suppress error on probe deferHamish Martin1-1/+1
2020-03-10macintosh: windfarm: fix MODINFO regressionWolfram Sang6-1/+50
2020-03-10i2c: designware-pci: Fix BUG_ON during device removalJarkko Nikula1-0/+1
2020-03-10iommu/vt-d: Silence RCU-list debugging warningsQian Cai2-3/+6
2020-03-10iommu/vt-d: Fix RCU-list bugs in intel_iommu_init()Qian Cai1-1/+4
2020-03-10i2c: i801: Do not add ICH_RES_IO_SMI for the iTCO_wdt deviceMika Westerberg1-33/+12
2020-03-10watchdog: iTCO_wdt: Make ICH_RES_IO_SMI optionalMika Westerberg1-12/+16
2020-03-10watchdog: iTCO_wdt: Export vendorsupportMika Westerberg2-7/+11
2020-03-10Merge tag 'gvt-fixes-2020-03-10' of https://github.com/intel/gvt-linux into d...Jani Nikula2-6/+11
2020-03-10Merge tag 'linux-cpupower-5.6-rc6' of git://git.kernel.org/pub/scm/linux/kern...Rafael J. Wysocki4-3/+5
2020-03-10drm/exynos: Fix cleanup of IOMMU related objectsMarek Szyprowski11-29/+53
2020-03-09Merge tag 'batadv-net-for-davem-20200306' of git://git.open-mesh.org/linux-mergeDavid S. Miller1-0/+4
2020-03-09net: mscc: ocelot: properly account for VLAN header length when setting MRUVladimir Oltean2-12/+18
2020-03-09ipvlan: do not use cond_resched_rcu() in ipvlan_process_multicast()Eric Dumazet1-1/+1
2020-03-09cgroup, netclassid: periodically release file_lock on classid updatingDmitry Yakunin1-10/+37
2020-03-09macvlan: add cond_resched() during multicast processingMahesh Bandewar1-0/+2
2020-03-09ipvlan: add cond_resched_rcu() while processing muticast backlogMahesh Bandewar1-0/+1
2020-03-09ipvlan: don't deref eth hdr before checking it's setMahesh Bandewar1-8/+10
2020-03-09sfc: detach from cb_page in efx_copy_channel()Edward Cree1-0/+1
2020-03-09Merge tag 'ktest-v5.6' of git://git.kernel.org/pub/scm/linux/kernel/git/roste...Linus Torvalds2-19/+19
2020-03-09Merge tag 'mmc-v5.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/ulf...Linus Torvalds2-1/+18
2020-03-09Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhostLinus Torvalds3-8/+15
2020-03-09pid: make ENOMEM return value more obviousChristian Brauner1-0/+8
2020-03-09futex: Unbreak futex hashingThomas Gleixner1-2/+2
2020-03-09drm/amdgpu: correct ROM_INDEX/DATA offset for VEGA20Hawking Zhang1-2/+23
2020-03-09ktest: Fix typos in ktest.plMasanari Iida1-6/+6
2020-03-09ktest: Add timeout for ssh sync testingSteven Rostedt (VMware)1-1/+1
2020-03-09ktest: Make default build option oldconfig not randconfigSteven Rostedt (VMware)2-2/+2
2020-03-09ktest: Fix some typos in sample.confMasanari Iida1-10/+10
2020-03-09drm/amd/display: update soc bb for nv14Martin Leung1-0/+114
2020-03-09linux-next: DOC: RDS: Fix a typo in rds.txtMasanari Iida1-1/+1
2020-03-09pinctrl: qcom: Assign irq_eoi conditionallyLinus Walleij1-2/+1
2020-03-09pinctrl: falcon: fix syntax errorMathias Kresin1-1/+1
2020-03-09pinctrl: qcom: ssbi-gpio: Fix fwspec parsing bugLinus Walleij1-1/+1
2020-03-09MAINTAINERS: Correct MIPS patchwork URLThomas Bogendoerfer1-1/+1
2020-03-08inet_diag: return classid for all socket typesDmitry Yakunin5-40/+40
2020-03-08net: stmmac: dwmac1000: Disable ACS if enhanced descs are not usedRemi Pommarel1-1/+2
2020-03-08gre: fix uninit-value in __iptunnel_pull_headerEric Dumazet1-2/+10
2020-03-08ipvlan: do not add hardware address of master to its unicast filter listJiri Wiesner1-4/+1
2020-03-08io_uring: ensure RCU callback ordering with rcu_barrier()Jens Axboe1-16/+13
2020-03-08Linux 5.6-rc5v5.6-rc5Linus Torvalds1-1/+1
2020-03-08Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc...Linus Torvalds43-91/+416
2020-03-08Merge tag 'edac_urgent-2020-03-08' of git://git.kernel.org/pub/scm/linux/kern...Linus Torvalds1-15/+7
2020-03-08Merge tag 'char-misc-5.6-rc5' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds5-8/+31
2020-03-08Merge tag 'driver-core-5.6-rc5' of git://git.kernel.org/pub/scm/linux/kernel/...Linus Torvalds5-30/+44
2020-03-08Merge tag 'tty-5.6-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/greg...Linus Torvalds8-29/+90
2020-03-08Merge tag 'usb-5.6-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/greg...Linus Torvalds12-117/+163
2020-03-08pid: Fix error return value in some casesCorey Minyard1-0/+2
2020-03-08virtio_balloon: Adjust label in virtballoon_probeNathan Chancellor1-1/+1
2020-03-08virtio-blk: improve virtqueue error to BLK_STSHalil Pasic1-2/+7
2020-03-08virtio-blk: fix hw_queue stopped on arbitrary errorHalil Pasic1-3/+5
2020-03-08virtio_ring: Fix mem leak with vring_new_virtqueue()Suman Anna1-2/+2
2020-03-08efi: Add a sanity check to efivar_store_raw()Vladis Dronov1-0/+3
2020-03-08efi: Fix a race and a buffer overflow while reading efivars via sysfsVladis Dronov1-9/+20
2020-03-07fscrypt: don't evict dirty inodes after removing keyEric Biggers1-0/+9
2020-03-07Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdmaLinus Torvalds15-59/+95
2020-03-07Merge tag 'io_uring-5.6-2020-03-07' of git://git.kernel.dk/linux-blockLinus Torvalds3-47/+38
2020-03-07Merge tag 'block-5.6-2020-03-07' of git://git.kernel.dk/linux-blockLinus Torvalds6-41/+11
2020-03-07Merge tag 'media/v5.6-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mch...Linus Torvalds5-36/+22
2020-03-07io_uring: fix lockup with timeoutsPavel Begunkov1-0/+1
2020-03-07Merge tag 's390-5.6-5' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/...Linus Torvalds2-2/+8
2020-03-07Merge tag 'powerpc-5.6-4' of git://git.kernel.org/pub/scm/linux/kernel/git/po...Linus Torvalds4-6/+18