Skip to content

3.18.9-stable review

Greg Kroah-Hartman kvm linux-metag linux-mips lkml stable xen-devel 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest139 of 151 patches 7 repliesIn review

139 of 151 patches are in this archive. The cover letter announces 151.

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/151Bluetooth: ath3k: workaround the compatibility issue with xHCI controllerdrivers/bluetooth/ath3k.c+8 -00 replies
2/151Bluetooth: ath3k: Add support of AR3012 bluetooth 13d3:3423 devicedrivers/bluetooth/ath3k.c drivers/bluetooth/btusb.c+3 -00 replies
3/151Bluetooth: Fix valid Identity Address checknet/bluetooth/smp.c+5 -10 replies
4/151Bluetooth: btusb: Add Broadcom patchram support for ASUSTek devicesdrivers/bluetooth/btusb.c+2 -10 replies
5/151Bluetooth: btusb: Add support for Dynex/Insignia USB donglesdrivers/bluetooth/btusb.c+3 -00 replies
6/151Bluetooth: btusb: Add support for Lite-On (04ca) Broadcom based, BCM43142drivers/bluetooth/btusb.c+4 -00 replies
7/151random: Fix fast_mix() functiondrivers/char/random.c+4 -40 replies
8/151xfs: ensure buffer types are set correctlyfs/xfs/xfs_buf_item.c+4 -00 replies
9/151xfs: inode unlink does not set AGI buffer typefs/xfs/xfs_inode.c+2 -00 replies
10/151xfs: set buf types when converting extent formatsfs/xfs/libxfs/xfs_bmap.c fs/xfs/libxfs/xfs_symlink_remote.c+7 -10 replies
11/151xfs: set superblock buffer type correctlyfs/xfs/xfs_trans.c+1 -00 replies
12/151fsnotify: fix handling of renames in auditinclude/linux/fsnotify.h+4 -20 replies
13/151iwlwifi: pcie: disable the SCD_BASE_ADDR when we resume from WoWLANdrivers/net/wireless/iwlwifi/pcie/tx.c+6 -10 replies
14/151iwlwifi: mvm: validate tid and sta_id in ba_notifdrivers/net/wireless/iwlwifi/mvm/tx.c+5 -00 replies
15/151iwlwifi: mvm: fix failure path when power_update fails in add_interfacedrivers/net/wireless/iwlwifi/mvm/mac80211.c+1 -10 replies
16/151iwlwifi: mvm: always use mac color zerodrivers/net/wireless/iwlwifi/mvm/mac80211.c+0 -30 replies
17/151HID: i2c-hid: Limit reads to wMaxInputLength bytes for input eventsdrivers/hid/i2c-hid/i2c-hid.c+4 -10 replies
18/151PCI: Generate uppercase hex for modalias var in ueventdrivers/pci/pci-driver.c+1 -10 replies
20/151ASoC: rt5670: Set use_single_rw flag for regmapsound/soc/codecs/rt5670.c+1 -00 replies
21/151ASoC: mioa701_wm9713: Fix speaker eventsound/soc/pxa/mioa701_wm9713.c+1 -10 replies
22/151ASoC: davinci: fix DM365_EVM codec selectionsound/soc/davinci/Kconfig+1 -20 replies
23/151rtlwifi: rtl8192ee: Fix adhoc faildrivers/net/wireless/rtlwifi/rtl8192ee/fw.c drivers/net/wireless/rtlwifi/rtl8192ee/hw.c+1 -310 replies
24/151rtlwifi: rtl8192ee: Fix TX hang due to failure to update TX write pointdrivers/net/wireless/rtlwifi/rtl8192ee/trx.c+1 -20 replies
25/151rtlwifi: rtl8192ee: Fix parsing of received packetdrivers/net/wireless/rtlwifi/rtl8192ee/trx.c drivers/net/wireless/rtlwifi/rtl8192ee/trx.h+6 -00 replies
26/151rtlwifi: rtl8192ee: Fix DMA stallsdrivers/net/wireless/rtlwifi/rtl8192ee/hw.c drivers/net/wireless/rtlwifi/rtl8192ee/reg.h+142 -00 replies
27/151rtlwifi: rtl8192ee: Fix problems with calculating free space in FIFOdrivers/net/wireless/rtlwifi/pci.h drivers/net/wireless/rtlwifi/rtl8192ee/trx.c+8 -80 replies
28/151rtlwifi: Remove logging statement that is no longer neededdrivers/net/wireless/rtlwifi/pci.c+1 -40 replies
29/151cpufreq: Set cpufreq_cpu_data to NULL before putting kobjectdrivers/cpufreq/cpufreq.c+3 -30 replies
31/151cpufreq: s3c: remove incorrect __init annotationsdrivers/cpufreq/s3c2416-cpufreq.c drivers/cpufreq/s3c24xx-cpufreq.c+3 -30 replies
32/151cpufreq: s3c: remove last use of resume_clocks callbackdrivers/cpufreq/s3c24xx-cpufreq.c+0 -80 replies
33/151xen/manage: Fix USB interaction issues when resumingdrivers/xen/manage.c+7 -10 replies
34/151xen-scsiback: mark pvscsi frontend request consumed only after last readdrivers/xen/xen-scsiback.c+6 -80 replies
35/151ACPI / LPSS: Always disable I2C host controllersdrivers/acpi/acpi_lpss.c+4 -00 replies
36/151ACPI / LPSS: Deassert resets for SPI host controllers on Braswelldrivers/acpi/acpi_lpss.c+15 -40 replies
37/151lmedm04: Increase Interupt due time to 200 msecdrivers/media/usb/dvb-usb-v2/lmedm04.c+4 -30 replies
38/151lmedm04: Fix usb_submit_urb BOGUS urb xfer, pipe 1 != type 3 in interrupt urbdrivers/media/usb/dvb-usb-v2/lmedm04.c+7 -00 replies
39/151si2168: define symbol rate limitsdrivers/media/dvb-frontends/si2168.c+2 -00 replies
40/151ALSA: off by one bug in snd_riptide_joystick_probe()sound/pci/riptide/riptide.c+19 -80 replies
41/151ALSA: hda - Set up GPIO for Toshiba Satellite S50Dsound/pci/hda/patch_sigmatel.c+20 -00 replies
42/151ALSA: hda - enable mute led quirk for one more hp machine.sound/pci/hda/patch_realtek.c+1 -00 replies
43/151ALSA: hdspm - Constrain periods to 2 on older cardssound/pci/rme9652/hdspm.c+6 -00 replies
44/151power_supply: 88pm860x: Fix leaked power supply on probe faildrivers/power/88pm860x_charger.c+1 -00 replies
45/151power: bq24190: Fix ignored supplicantsdrivers/power/bq24190_charger.c+1 -10 replies
46/151power: gpio-charger: balance enable/disable_irq_wake callsdrivers/power/gpio-charger.c+2 -20 replies
47/151megaraid_sas: endianness related bug fixes and code optimizationdrivers/scsi/megaraid/megaraid_sas_base.c drivers/scsi/megaraid/megaraid_sas_fp.c drivers/scsi/megaraid/megaraid_sas_fusion.c +1 more+24 -300 replies
48/151megaraid_sas: fix the problem of non-existing VD exposed to hostdrivers/scsi/megaraid/megaraid_sas_fp.c drivers/scsi/megaraid/megaraid_sas_fusion.c+15 -20 replies
49/151megaraid_sas: disable interrupt_mask before enabling hardware interruptsdrivers/scsi/megaraid/megaraid_sas_fusion.c+2 -10 replies
51/151timberdale: do not select TIMB_DMAdrivers/media/platform/Kconfig+2 -40 replies
59/151mmc: sdhci-pxav3: fix unbalanced clock issues during probedrivers/mmc/host/sdhci-pxav3.c+4 -30 replies
60/151mmc: sdhci-pxav3: fix setting of pdata->clk_delay_cyclesdrivers/mmc/host/sdhci-pxav3.c+2 -20 replies
61/151mmc: sdhci-pxav3: Fix SDR50 and DDR50 capabilities for the Armada 38x flavordrivers/mmc/host/sdhci-pxav3.c+17 -00 replies
62/151mmc: sdhci-pxav3: Fix Armada 38x controllers caps according to erratum ERR-7878951drivers/mmc/host/sdhci-pxav3.c+23 -50 replies
63/151proc/pagemap: walk page tables under pte lockfs/proc/task_mmu.c+9 -50 replies
64/151nfs: dont call blocking operations while !TASK_RUNNINGfs/nfs/callback.c+5 -30 replies
65/151NFS: struct nfs_commit_info.lock must always point to inode->i_lockfs/nfs/direct.c include/linux/nfs_xdr.h+2 -20 replies
66/151KVM: MIPS: Disable HTW while in guestarch/mips/kvm/mips.c+13 -00 replies
67/151KVM: MIPS: Dont leak FPU/DSP to guestarch/mips/kvm/locore.S arch/mips/kvm/mips.c+4 -40 replies
68/151MIPS: Alchemy: Fix cpu clock calculationarch/mips/alchemy/common/clock.c+2 -00 replies
69/151MIPS: kernel: cps-vec: Replace "addi" with "addiu"arch/mips/kernel/cps-vec.S+8 -80 replies
70/151MIPS: asm: asmmacro: Replace "add" instructions with "addu"arch/mips/include/asm/asmmacro.h+2 -20 replies
71/151MIPS: asm: pgtable: Add c0 hazards on HTW start/stop sequencesarch/mips/include/asm/pgtable.h+6 -40 replies
72/151MIPS: asm: pgtable: Prevent HTW race when updating PTEsarch/mips/include/asm/pgtable.h+4 -100 replies
73/151MIPS: Export FP functions used by lose_fpu(1) for KVMarch/mips/kernel/mips_ksyms.c+6 -00 replies
74/151MIPS: Export MSA functions used by lose_fpu(1) for KVMarch/mips/kernel/mips_ksyms.c+4 -00 replies
75/151mm/hugetlb: pmd_huge() returns true for non-present hugepagearch/x86/mm/gup.c arch/x86/mm/hugetlbpage.c mm/hugetlb.c+10 -20 replies
76/151tracing: Fix unmapping loop in tracing_mark_writekernel/trace/trace.c+1 -10 replies
77/151blk-mq: fix double-free in error pathblock/blk-mq-tag.c+1 -00 replies
78/151ARM: 8284/1: sa1100: clear RCSR_SMR on resumearch/arm/mach-sa1100/pm.c+1 -00 replies
79/151ARM: DRA7: hwmod: Fix boot crash with DEBUG_LL enabled on UART3arch/arm/mach-omap2/omap_hwmod_7xx_data.c+1 -10 replies
80/151ARM: dts: tegra20: fix GR3D, DSI unit and reg base addressesarch/arm/boot/dts/tegra20.dtsi+4 -40 replies
81/151ARM: dts: am335x-bone*: usb0 is hardwired for peripheralarch/arm/boot/dts/am335x-bone-common.dtsi+1 -00 replies
82/151ARM: dts: BCM63xx: fix L2 cache propertiesarch/arm/boot/dts/bcm63138.dtsi+3 -20 replies
83/151tpm_tis: verify interrupt during initdrivers/char/tpm/tpm_tis.c+62 -140 replies
84/151TPM: Add new TPMs to the tail of the list to prevent inadvertent change of devdrivers/char/tpm/tpm-interface.c+1 -10 replies
85/151char: tpm: Add missing error check for devm_kzallocdrivers/char/tpm/tpm_i2c_atmel.c drivers/char/tpm/tpm_i2c_nuvoton.c+9 -00 replies
86/151tpm: Fix NULL return in tpm_ibmvtpm_get_desired_dmadrivers/char/tpm/tpm_ibmvtpm.c+8 -00 replies
87/151tpm/tpm_i2c_stm_st33: Fix potential bug in tpm_stm_i2c_senddrivers/char/tpm/tpm_i2c_stm_st33.c+1 -10 replies
88/151Added Little Endian support to vtpm moduledrivers/char/tpm/tpm_ibmvtpm.c+12 -80 replies
89/151nfs41: .init_read and .init_write can be called with valid pg_lsegfs/nfs/pnfs.c+20 -210 replies
91/151NFSv4: Ensure we reference the inode for return-on-close in delegreturnfs/nfs/internal.h fs/nfs/nfs4proc.c fs/nfs/super.c+36 -90 replies
92/151NFSv4.1: Fix a kfree() of uninitialised pointers in decode_cb_sequence_argsfs/nfs/callback_xdr.c+3 -10 replies
93/151sg: fix unkillable I/O wait deadlock with scsi-mqdrivers/scsi/sg.c+14 -30 replies
94/151sg: fix EWOULDBLOCK errors with scsi-mqdrivers/scsi/sg.c+16 -10 replies
95/151iscsi-target: Drop problematic active_ts_list usagedrivers/target/iscsi/iscsi_target_tq.c+5 -230 replies
96/151cfq-iosched: handle failure of cfq group allocationblock/cfq-iosched.c+6 -10 replies
97/151cfq-iosched: fix incorrect filing of rt async cfqqblock/cfq-iosched.c+7 -20 replies
98/151cipso: dont use IPCB() to locate the CIPSO IP optioninclude/net/cipso_ipv4.h net/ipv4/cipso_ipv4.c net/netlabel/netlabel_kapi.c+56 -350 replies
99/151ring-buffer: Do not wake up a splice waiter when page is not fullkernel/trace/ring_buffer.c+35 -50 replies
100/151smack: fix possible use after frees in task_security() callerssecurity/smack/smack.h security/smack/smack_lsm.c+23 -110 replies
101/151axonram: Fix bug in direct_accessarch/powerpc/sysdev/axonram.c+1 -10 replies
102/151tty: Prevent untrappable signals from malicious programdrivers/tty/pty.c+3 -00 replies
103/151tty/serial: at91: fix error handling in atmel_serial_probe()drivers/tty/serial/atmel_serial.c+3 -10 replies
104/151mei: mask interrupt set bit on clean reset bitdrivers/misc/mei/hw-me.c+1 -10 replies
105/151mei: me: release hw from reset only during the reset flowdrivers/misc/mei/hw-me.c+1 -20 replies
106/151USB: cp210x: add ID for RUGGEDCOM USB Serial Consoledrivers/usb/serial/cp210x.c+1 -00 replies
107/151USB: fix use-after-free bug in usb_hcd_unlink_urb()drivers/usb/core/hcd.c+8 -80 replies
108/151usb: core: buffer: smallest buffer should start at ARCH_DMA_MINALIGNdrivers/usb/core/buffer.c drivers/usb/core/usb.c include/linux/usb/hcd.h+19 -90 replies
109/151USB: dont cancel queued resets when unbinding driversdrivers/usb/core/driver.c drivers/usb/core/hub.c drivers/usb/core/message.c +1 more+12 -580 replies
110/151USB: add flag for HCDs that cant receive wakeup requests (isp1760-hcd)drivers/usb/core/driver.c drivers/usb/host/isp1760-hcd.c include/linux/usb/hcd.h+17 -00 replies
111/151vt: provide notifications on selection changesdrivers/tty/vt/vt.c+3 -10 replies
112/151ARM: pxa: add regulator_has_full_constraints to corgi board filearch/arm/mach-pxa/corgi.c+3 -00 replies
113/151ARM: pxa: add regulator_has_full_constraints to poodle board filearch/arm/mach-pxa/poodle.c+2 -00 replies
114/151ARM: vexpress: use ARM_CPU_SUSPEND if neededarch/arm/mach-vexpress/Kconfig+1 -00 replies
115/151ARM: mvebu: build armada375-smp code conditionallyarch/arm/mach-mvebu/system-controller.c+1 -10 replies
116/151kdb: fix incorrect counts in KDB summary command outputkernel/debug/kdb/kdb_main.c+1 -10 replies
117/151ntp: Fixup adjtimex freq validation on 32-bit systemskernel/time/ntp.c+7 -30 replies
118/151serial: fsl_lpuart: delete timer on shutdowndrivers/tty/serial/fsl_lpuart.c+4 -30 replies
119/151serial: fsl_lpuart: avoid new transfer while DMA is runningdrivers/tty/serial/fsl_lpuart.c+5 -40 replies
120/151ARC: fix page address calculation if PAGE_OFFSET != LINUX_LINK_BASEarch/arc/include/asm/pgtable.h+2 -10 replies
121/151MIPS: HTW: Prevent accidental HTW start due to nested htw_{start, stop}arch/mips/include/asm/cpu-info.h arch/mips/include/asm/mmu_context.h arch/mips/include/asm/pgtable.h +1 more+32 -80 replies
122/151udf: Remove repeated loads blocksizefs/udf/inode.c+8 -110 replies
123/151udf: Check length of extended attributes and allocation descriptorsfs/udf/inode.c+9 -00 replies
124/151KVM: x86: update masterclock values on TSC writesarch/x86/kvm/x86.c+10 -90 replies
125/151KVM: s390: forward hrtimer if guest ckc not pending yetarch/s390/kvm/interrupt.c+12 -20 replies
126/151KVM: s390: base hrtimer on a monotonic clockarch/s390/kvm/kvm-s390.c+1 -10 replies
127/151KVM: s390: floating irqs: fix user triggerable endless looparch/s390/kvm/interrupt.c+2 -00 replies
128/151KVM: s390: avoid memory leaks if __inject_vm() failsarch/s390/kvm/interrupt.c+5 -10 replies
129/151x86/xen: Treat SCI interrupt as normal GSI interruptarch/x86/kernel/acpi/boot.c arch/x86/pci/xen.c+11 -574 replies
130/151hx4700: regulator: declare full constraintsarch/arm/mach-pxa/hx4700.c+2 -00 replies
131/151arm64: compat Fix siginfo_t -> compat_siginfo_t conversion on big endianarch/arm64/kernel/signal32.c+2 -30 replies
132/151gpiolib: of: allow of_gpiochip_find_and_xlate to find more than one chip per nodedrivers/gpio/gpiolib-of.c+5 -40 replies
133/151gpio: tps65912: fix wrong container_of argumentsdrivers/gpio/gpio-tps65912.c+10 -40 replies
134/151xfs: Fix quota type in quota structures when reusing quota filefs/xfs/xfs_qm.c+5 -00 replies
135/151metag: Fix KSTK_EIP() and KSTK_ESP() macrosarch/metag/include/asm/processor.h+2 -20 replies
136/151clocksource: mtk: Fix race conditions in probe codedrivers/clocksource/mtk_timer.c+5 -40 replies
137/151perf tools: Fix probing for PERF_FLAG_FD_CLOEXEC flagtools/perf/util/cloexec.c+15 -30 replies
138/151md/raid5: Fix livelock when array is both resyncing and degraded.drivers/md/raid5.c+2 -10 replies
140/151sb_edac: Fix detection on SNB machinesdrivers/edac/sb_edac.c+6 -30 replies
141/151EDAC, amd64_edac: Prevent OOPS with >16 memory controllersdrivers/edac/amd64_edac.c+8 -20 replies
142/151jffs2: fix handling of corrupted summary lengthfs/jffs2/scan.c+5 -00 replies
143/151samsung-laptop: Add use_native_backlight quirk, and enable it on some modelsdrivers/platform/x86/samsung-laptop.c+17 -30 replies
144/151libceph: fix double __remove_osd() problemnet/ceph/osd_client.c+18 -80 replies
145/151btrfs: set proper message level for skinny metadatafs/btrfs/disk-io.c+1 -10 replies
146/151btrfs: fix leak of path in btrfs_find_itemfs/btrfs/ctree.c fs/btrfs/disk-io.c fs/btrfs/tree-log.c+22 -150 replies
147/151Btrfs: fix fsync data loss after adding hard link to inodefs/btrfs/tree-log.c+73 -90 replies
148/151blk-throttle: check stats_cpu before reading it from sysfsblock/blk-throttle.c+3 -00 replies
149/151x86/efi: Avoid triple faults during EFI mixed mode callsarch/x86/boot/compressed/Makefile arch/x86/boot/compressed/efi_stub_64.S arch/x86/boot/compressed/efi_thunk_64.S +2 more+301 -2030 replies
150/151x86, mm/ASLR: Fix stack randomization on 64-bit systemsarch/x86/mm/mmap.c fs/binfmt_elf.c+6 -50 replies
151/151x86: pmc-atom: Assign debugfs node as soon as possiblearch/x86/kernel/pmc_atom.c+3 -10 replies

Reviews trailers per patch

43 of 139 patches have a Reviewed-by or Acked-by.

PatchJan KaraBrian FosterJohannes BergBenjamin TissoiresGreg Kroah-HartmanViresh KumarTaihsiang HoMartin K. PetersenCyrill GorcunovNaoya HoriguchiKirill A. ShutemovBruno RandolfStephen BoydFelipe BalbiAlexandre CourbotMichael MullinJason GunthorpeAshley LaiPeng TaoDouglas GilbertTejun HeoVivek GoyalHidehiro KawaiCasey SchauflerMathieu DesnoyersNicolas FerreJoe LawrenceAlan SternOlivier SobrieNicolas PitreMark BrownLiviu DudauGeorge JosephCornelia HuckDominik DingelSander EikelenboomBamvor Jian ZhangRobert JarzmikTyler HallDave ChinnerDavid AhernJes SorensenAristeu RozanskiAndy LutomirskiMauro Carvalho ChehabSage WeilAlex ElderBorislav Petkov
1/151
2/151
3/151
4/151
5/151
6/151
7/151
8/151T-b R-b
9/151T-b R-b
10/151T-b R-b
11/151T-b R-b
12/151
13/151R-b
14/151
15/151R-b
16/151R-b
17/151R-b
18/151A-b
20/151
21/151
22/151
23/151
24/151
25/151
26/151
27/151
28/151
29/151
31/151A-b
32/151A-b
33/151
34/151
35/151
36/151
37/151
38/151
39/151
40/151
41/151
42/151T-b
43/151
44/151
45/151
46/151
47/151R-b
48/151R-b
49/151R-b
51/151
59/151
60/151
61/151
62/151
63/151R-b A-b A-b
64/151
65/151
66/151
67/151
68/151T-b
69/151
70/151
71/151
72/151
73/151
74/151
75/151
76/151R-b
77/151
78/151
79/151R-b A-b
80/151R-b
81/151R-b A-b
82/151
83/151T-b R-b
84/151R-b
85/151R-b
86/151
87/151R-b
88/151R-b
89/151
91/151R-b
92/151
93/151A-b T-b
94/151A-b T-b
95/151
96/151A-b A-b
97/151T-b
98/151T-b
99/151
100/151
101/151R-b R-b
102/151
103/151A-b
104/151
105/151
106/151
107/151T-b
108/151A-b
109/151T-b
110/151T-b
111/151
112/151A-b
113/151A-b
114/151A-b A-b
115/151
116/151
117/151T-b
118/151
119/151
120/151
121/151
122/151
123/151
124/151
125/151A-b
126/151A-b
127/151R-b R-b
128/151R-b
129/151T-b
130/151
131/151T-b
132/151A-b T-b T-b
133/151
134/151R-b
135/151
136/151
137/151Based-on-patch-by A-b
138/151Bisected-by T-b
140/151A-b A-b A-b
141/151
142/151
143/151
144/151R-b R-b
145/151
146/151
147/151
148/151
149/151T-b
150/151
151/151

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 48 reviewers.

Read the v1 thread

Cover letter [PATCH 3.18 000/151] 3.18.9-stable review

This is the start of the stable review cycle for the 3.18.9 release. There are 151 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.

Responses should be made by Fri Mar 6 05:53:55 UTC 2015. Anything received after that time might be too late.

The whole patch series can be found in one patch at:

	kernel.org/pub/linux/kernel/v3.0/stable-review/patch-3.18.9-rc1.gz

and the diffstat can be found below.

thanks,

greg k-h

-------------
Pseudo-Shortlog of commits:

Greg Kroah-Hartman <[email protected]>

    Linux 3.18.9-rc1

Andy Shevchenko <[email protected]>
x86: pmc-atom: Assign debugfs node as soon as possible

Hector Marco-Gisbert <[email protected]>
x86, mm/ASLR: Fix stack randomization on 64-bit systems

Matt Fleming <[email protected]>
x86/efi: Avoid triple faults during EFI mixed mode calls

Thadeu Lima de Souza Cascardo <[email protected]>
blk-throttle: check stats_cpu before reading it from sysfs

Filipe Manana <[email protected]>
Btrfs: fix fsync data loss after adding hard link to inode

David Sterba <[email protected]>
btrfs: fix leak of path in btrfs_find_item

David Sterba <[email protected]>
btrfs: set proper message level for skinny metadata

Ilya Dryomov <[email protected]>
libceph: fix double __remove_osd() problem

Hans de Goede <[email protected]>
samsung-laptop: Add use_native_backlight quirk, and enable it on some models

Chen Jie <[email protected]>
jffs2: fix handling of corrupted summary length

Daniel J Blueman <[email protected]>
EDAC, amd64_edac: Prevent OOPS with >16 memory controllers

Borislav Petkov <[email protected]>
sb_edac: Fix detection on SNB machines

Tomáš Hodek <[email protected]>
md/raid1: fix read balance when a drive is write-mostly.

NeilBrown <[email protected]>
md/raid5: Fix livelock when array is both resyncing and degraded.

Adrian Hunter <[email protected]>
perf tools: Fix probing for PERF_FLAG_FD_CLOEXEC flag

Matthias Brugger <[email protected]>
clocksource: mtk: Fix race conditions in probe code

James Hogan <[email protected]>
metag: Fix KSTK_EIP() and KSTK_ESP() macros

Jan Kara <[email protected]>
xfs: Fix quota type in quota structures when reusing quota file

Nicolas Saenz Julienne <[email protected]>
gpio: tps65912: fix wrong container_of arguments

Hans Holmberg <[email protected]>
gpiolib: of: allow of_gpiochip_find_and_xlate to find more than one chip per node

Catalin Marinas <[email protected]>

    arm64: compat Fix siginfo_t -> compat_siginfo_t conversion on big endian

Martin Vajnar <[email protected]>
hx4700: regulator: declare full constraints

Jiang Liu <[email protected]>
x86/xen: Treat SCI interrupt as normal GSI interrupt

David Hildenbrand <[email protected]>
KVM: s390: avoid memory leaks if __inject_vm() fails

David Hildenbrand <[email protected]>
KVM: s390: floating irqs: fix user triggerable endless loop

David Hildenbrand <[email protected]>
KVM: s390: base hrtimer on a monotonic clock

David Hildenbrand <[email protected]>
KVM: s390: forward hrtimer if guest ckc not pending yet

Marcelo Tosatti <[email protected]>
KVM: x86: update masterclock values on TSC writes

Jan Kara <[email protected]>
udf: Check length of extended attributes and allocation descriptors

Jan Kara <[email protected]>
udf: Remove repeated loads blocksize

Markos Chandras <[email protected]>

    MIPS: HTW: Prevent accidental HTW start due to nested htw_{start, stop}

Alexey Brodkin <[email protected]>

    ARC: fix page address calculation if PAGE_OFFSET != LINUX_LINK_BASE

Stefan Agner <[email protected]>
serial: fsl_lpuart: avoid new transfer while DMA is running

Stefan Agner <[email protected]>
serial: fsl_lpuart: delete timer on shutdown

John Stultz <[email protected]>
ntp: Fixup adjtimex freq validation on 32-bit systems

Jay Lan <[email protected]>
kdb: fix incorrect counts in KDB summary command output

Arnd Bergmann <[email protected]>
ARM: mvebu: build armada375-smp code conditionally

Arnd Bergmann <[email protected]>
ARM: vexpress: use ARM_CPU_SUSPEND if needed

Dmitry Eremin-Solenikov <[email protected]>
ARM: pxa: add regulator_has_full_constraints to poodle board file

Dmitry Eremin-Solenikov <[email protected]>
ARM: pxa: add regulator_has_full_constraints to corgi board file

Nicolas Pitre <[email protected]>
vt: provide notifications on selection changes

Alan Stern <[email protected]>
USB: add flag for HCDs that can't receive wakeup requests (isp1760-hcd)

Alan Stern <[email protected]>
USB: don't cancel queued resets when unbinding drivers

Sebastian Andrzej Siewior <[email protected]>
usb: core: buffer: smallest buffer should start at ARCH_DMA_MINALIGN

Alan Stern <[email protected]>
USB: fix use-after-free bug in usb_hcd_unlink_urb()

Lennart Sorensen <[email protected]>

    USB: cp210x: add ID for RUGGEDCOM USB Serial Console

Alexander Usyskin <[email protected]>
mei: me: release hw from reset only during the reset flow

Alexander Usyskin <[email protected]>
mei: mask interrupt set bit on clean reset bit

Cyrille Pitchen <[email protected]>
tty/serial: at91: fix error handling in atmel_serial_probe()

Peter Hurley <[email protected]>
tty: Prevent untrappable signals from malicious program

Matthew Wilcox <[email protected]>
axonram: Fix bug in direct_access

Andrey Ryabinin <[email protected]>
smack: fix possible use after frees in task_security() callers

Steven Rostedt (Red Hat) <[email protected]>
ring-buffer: Do not wake up a splice waiter when page is not full

Paul Moore <[email protected]>
cipso: don't use IPCB() to locate the CIPSO IP option

Jeff Moyer <[email protected]>
cfq-iosched: fix incorrect filing of rt async cfqq

Konstantin Khlebnikov <[email protected]>
cfq-iosched: handle failure of cfq group allocation

Nicholas Bellinger <[email protected]>
iscsi-target: Drop problematic active_ts_list usage

Tony Battersby <[email protected]>
sg: fix EWOULDBLOCK errors with scsi-mq

Tony Battersby <[email protected]>
sg: fix unkillable I/O wait deadlock with scsi-mq

Trond Myklebust <[email protected]>
NFSv4.1: Fix a kfree() of uninitialised pointers in decode_cb_sequence_args

Trond Myklebust <[email protected]>
NFSv4: Ensure we reference the inode for return-on-close in delegreturn

Trond Myklebust <[email protected]>
SUNRPC: NULL utsname dereference on NFS umount during namespace cleanup

Peng Tao <[email protected]>
nfs41: .init_read and .init_write can be called with valid pg_lseg

honclo <[email protected]>
Added Little Endian support to vtpm module

Christophe Ricard <[email protected]>
tpm/tpm_i2c_stm_st33: Fix potential bug in tpm_stm_i2c_send

Hon Ching (Vicky) Lo <[email protected]>
tpm: Fix NULL return in tpm_ibmvtpm_get_desired_dma

Kiran Padwal <[email protected]>
char: tpm: Add missing error check for devm_kzalloc

David Howells <[email protected]>
TPM: Add new TPMs to the tail of the list to prevent inadvertent change of dev

Scot Doyle <[email protected]>
tpm_tis: verify interrupt during init

Florian Fainelli <[email protected]>
ARM: dts: BCM63xx: fix L2 cache properties

Robert Nelson <[email protected]>
ARM: dts: am335x-bone*: usb0 is hardwired for peripheral

Dmitry Osipenko <[email protected]>
ARM: dts: tegra20: fix GR3D, DSI unit and reg base addresses

Lokesh Vutla <[email protected]>
ARM: DRA7: hwmod: Fix boot crash with DEBUG_LL enabled on UART3

Dmitry Eremin-Solenikov <[email protected]>

    ARM: 8284/1: sa1100: clear RCSR_SMR on resume

Tony Battersby <[email protected]>
blk-mq: fix double-free in error path

Vikram Mulukutla <[email protected]>
tracing: Fix unmapping loop in tracing_mark_write

Naoya Horiguchi <[email protected]>
mm/hugetlb: pmd_huge() returns true for non-present hugepage

James Hogan <[email protected]>
MIPS: Export MSA functions used by lose_fpu(1) for KVM

James Hogan <[email protected]>
MIPS: Export FP functions used by lose_fpu(1) for KVM

Markos Chandras <[email protected]>
MIPS: asm: pgtable: Prevent HTW race when updating PTEs

Markos Chandras <[email protected]>
MIPS: asm: pgtable: Add c0 hazards on HTW start/stop sequences

Markos Chandras <[email protected]>
MIPS: asm: asmmacro: Replace "add" instructions with "addu"

Markos Chandras <[email protected]>
MIPS: kernel: cps-vec: Replace "addi" with "addiu"

Manuel Lauss <[email protected]>
MIPS: Alchemy: Fix cpu clock calculation

James Hogan <[email protected]>
KVM: MIPS: Don't leak FPU/DSP to guest

James Hogan <[email protected]>
KVM: MIPS: Disable HTW while in guest

Trond Myklebust <[email protected]>

    NFS: struct nfs_commit_info.lock must always point to inode->i_lock

Jeff Layton <[email protected]>
nfs: don't call blocking operations while !TASK_RUNNING

Konstantin Khlebnikov <[email protected]>
proc/pagemap: walk page tables under pte lock

Marcin Wojtas <[email protected]>
mmc: sdhci-pxav3: Fix Armada 38x controller's caps according to erratum ERR-7878951

Gregory CLEMENT <[email protected]>
mmc: sdhci-pxav3: Fix SDR50 and DDR50 capabilities for the Armada 38x flavor

Jisheng Zhang <[email protected]>

    mmc: sdhci-pxav3: fix setting of pdata->clk_delay_cycles

Jisheng Zhang <[email protected]>
mmc: sdhci-pxav3: fix unbalanced clock issues during probe

Russell King <[email protected]>
em28xx-audio: fix missing newlines, again

Russell King <[email protected]>
em28xx-dvb: fix missing newlines

Russell King <[email protected]>
em28xx-video: fix missing newlines

Russell King <[email protected]>
em28xx-core: fix missing newlines

Russell King <[email protected]>
em28xx-audio: fix missing newlines

Russell King <[email protected]>
em28xx-input: fix missing newlines

Russell King <[email protected]>
em28xx: ensure "closing" messages terminate with a newline

Arnd Bergmann <[email protected]>
timberdale: do not select TIMB_DMA

James Hogan <[email protected]>
rc-main: Re-apply filter for no-op protocol change

[email protected] <[email protected]>
megaraid_sas: disable interrupt_mask before enabling hardware interrupts

[email protected] <[email protected]>
megaraid_sas: fix the problem of non-existing VD exposed to host

[email protected] <[email protected]>
megaraid_sas: endianness related bug fixes and code optimization

Dmitry Eremin-Solenikov <[email protected]>
power: gpio-charger: balance enable/disable_irq_wake calls

Krzysztof Kozlowski <[email protected]>
power: bq24190: Fix ignored supplicants

Krzysztof Kozlowski <[email protected]>

    power_supply: 88pm860x: Fix leaked power supply on probe fail

Adrian Knoth <[email protected]>
ALSA: hdspm - Constrain periods to 2 on older cards

Hui Wang <[email protected]>
ALSA: hda - enable mute led quirk for one more hp machine.

Takashi Iwai <[email protected]>
ALSA: hda - Set up GPIO for Toshiba Satellite S50D

Dan Carpenter <[email protected]>
ALSA: off by one bug in snd_riptide_joystick_probe()

Antti Palosaari <[email protected]>
si2168: define symbol rate limits

Malcolm Priestley <[email protected]>

    lmedm04: Fix usb_submit_urb BOGUS urb xfer, pipe 1 != type 3 in interrupt urb

Malcolm Priestley <[email protected]>
lmedm04: Increase Interupt due time to 200 msec

Mika Westerberg <[email protected]>
ACPI / LPSS: Deassert resets for SPI host controllers on Braswell

Mika Westerberg <[email protected]>
ACPI / LPSS: Always disable I2C host controllers

Juergen Gross <[email protected]>
xen-scsiback: mark pvscsi frontend request consumed only after last read

Ross Lagerwall <[email protected]>
xen/manage: Fix USB interaction issues when resuming

Arnd Bergmann <[email protected]>
cpufreq: s3c: remove last use of resume_clocks callback

Arnd Bergmann <[email protected]>
cpufreq: s3c: remove incorrect __init annotations

Mikulas Patocka <[email protected]>
cpufreq: speedstep-smi: enable interrupts when waiting

Viresh Kumar <[email protected]>
cpufreq: Set cpufreq_cpu_data to NULL before putting kobject

Larry Finger <[email protected]>
rtlwifi: Remove logging statement that is no longer needed

Larry Finger <[email protected]>
rtlwifi: rtl8192ee: Fix problems with calculating free space in FIFO

Troy Tan <[email protected]>
rtlwifi: rtl8192ee: Fix DMA stalls

Troy Tan <[email protected]>
rtlwifi: rtl8192ee: Fix parsing of received packet

Troy Tan <[email protected]>
rtlwifi: rtl8192ee: Fix TX hang due to failure to update TX write point

Troy Tan <[email protected]>
rtlwifi: rtl8192ee: Fix adhoc fail

Arnd Bergmann <[email protected]>
ASoC: davinci: fix DM365_EVM codec selection

Lars-Peter Clausen <[email protected]>

    ASoC: mioa701_wm9713: Fix speaker event

Bard Liao <[email protected]>
ASoC: rt5670: Set use_single_rw flag for regmap

Michel Dänzer <[email protected]>
PCI: Fix infinite loop with ROM image of size 0

Ricardo Ribalda Delgado <[email protected]>
PCI: Generate uppercase hex for modalias var in uevent

Seth Forshee <[email protected]>
HID: i2c-hid: Limit reads to wMaxInputLength bytes for input events

Luciano Coelho <[email protected]>
iwlwifi: mvm: always use mac color zero

Luciano Coelho <[email protected]>
iwlwifi: mvm: fix failure path when power_update fails in add_interface

Eyal Shapira <[email protected]>
iwlwifi: mvm: validate tid and sta_id in ba_notif

Emmanuel Grumbach <[email protected]>
iwlwifi: pcie: disable the SCD_BASE_ADDR when we resume from WoWLAN

Jan Kara <[email protected]>
fsnotify: fix handling of renames in audit

Dave Chinner <[email protected]>
xfs: set superblock buffer type correctly

Dave Chinner <[email protected]>
xfs: set buf types when converting extent formats

Dave Chinner <[email protected]>
xfs: inode unlink does not set AGI buffer type

Dave Chinner <[email protected]>
xfs: ensure buffer types are set correctly

George Spelvin <[email protected]>
random: Fix fast_mix() function

Matej Dubovy <[email protected]>
Bluetooth: btusb: Add support for Lite-On (04ca) Broadcom based, BCM43142

Marcel Holtmann <[email protected]>
Bluetooth: btusb: Add support for Dynex/Insignia USB dongles

Rick Dunn <[email protected]>
Bluetooth: btusb: Add Broadcom patchram support for ASUSTek devices

Johan Hedberg <[email protected]>
Bluetooth: Fix valid Identity Address check

Dmitry Tunin <[email protected]>
Bluetooth: ath3k: Add support of AR3012 bluetooth 13d3:3423 device

Adam Lee <[email protected]>
Bluetooth: ath3k: workaround the compatibility issue with xHCI controller

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

Diffstat:

 Makefile                                     |   4 +-
 arch/arc/include/asm/pgtable.h               |   3 +-
 arch/arm/boot/dts/am335x-bone-common.dtsi    |   1 +
 arch/arm/boot/dts/bcm63138.dtsi              |   5 +-
 arch/arm/boot/dts/tegra20.dtsi               |   8 +-
 arch/arm/mach-mvebu/system-controller.c      |   2 +-
 arch/arm/mach-omap2/omap_hwmod_7xx_data.c    |   2 +-
 arch/arm/mach-pxa/corgi.c                    |   3 +
 arch/arm/mach-pxa/hx4700.c                   |   2 +
 arch/arm/mach-pxa/poodle.c                   |   2 +
 arch/arm/mach-sa1100/pm.c                    |   1 +
 arch/arm/mach-vexpress/Kconfig               |   1 +
 arch/arm64/kernel/signal32.c                 |   5 +-
 arch/metag/include/asm/processor.h           |   4 +-
 arch/mips/alchemy/common/clock.c             |   2 +
 arch/mips/include/asm/asmmacro.h             |   4 +-
 arch/mips/include/asm/cpu-info.h             |   5 +
 arch/mips/include/asm/mmu_context.h          |   7 +-
 arch/mips/include/asm/pgtable.h              |  42 +++---
 arch/mips/kernel/cps-vec.S                   |  16 +--
 arch/mips/kernel/cpu-probe.c                 |   4 +-
 arch/mips/kernel/mips_ksyms.c                |  10 ++
 arch/mips/kvm/locore.S                       |   2 +-
 arch/mips/kvm/mips.c                         |  19 ++-
 arch/powerpc/sysdev/axonram.c                |   2 +-
 arch/s390/kvm/interrupt.c                    |  22 ++-
 arch/s390/kvm/kvm-s390.c                     |   2 +-
 arch/x86/boot/compressed/Makefile            |   1 +
 arch/x86/boot/compressed/efi_stub_64.S       |  25 ----
 arch/x86/boot/compressed/efi_thunk_64.S      | 196 +++++++++++++++++++++++++++
 arch/x86/kernel/acpi/boot.c                  |  23 ++--
 arch/x86/kernel/pmc_atom.c                   |   4 +-
 arch/x86/kvm/x86.c                           |  19 +--
 arch/x86/mm/gup.c                            |   2 +-
 arch/x86/mm/hugetlbpage.c                    |   8 +-
 arch/x86/mm/mmap.c                           |   6 +-
 arch/x86/pci/xen.c                           |  47 -------
 arch/x86/platform/efi/efi_stub_64.S          | 161 ----------------------
 arch/x86/platform/efi/efi_thunk_64.S         | 121 ++++++++++++++---
 block/blk-mq-tag.c                           |   1 +
 block/blk-throttle.c                         |   3 +
 block/cfq-iosched.c                          |  16 ++-
 drivers/acpi/acpi_lpss.c                     |  19 ++-
 drivers/bluetooth/ath3k.c                    |  10 ++
 drivers/bluetooth/btusb.c                    |  11 +-
 drivers/char/random.c                        |   8 +-
 drivers/char/tpm/tpm-interface.c             |   2 +-
 drivers/char/tpm/tpm_i2c_atmel.c             |   4 +
 drivers/char/tpm/tpm_i2c_nuvoton.c           |   5 +
 drivers/char/tpm/tpm_i2c_stm_st33.c          |   2 +-
 drivers/char/tpm/tpm_ibmvtpm.c               |  28 ++--
 drivers/char/tpm/tpm_tis.c                   |  76 +++++++++--
 drivers/clocksource/mtk_timer.c              |   9 +-
 drivers/cpufreq/cpufreq.c                    |   6 +-
 drivers/cpufreq/s3c2416-cpufreq.c            |   4 +-
 drivers/cpufreq/s3c24xx-cpufreq.c            |  10 +-
 drivers/cpufreq/speedstep-lib.c              |   3 +
 drivers/cpufreq/speedstep-smi.c              |  12 ++
 drivers/edac/amd64_edac.c                    |  10 +-
 drivers/edac/sb_edac.c                       |   9 +-
 drivers/gpio/gpio-tps65912.c                 |  14 +-
 drivers/gpio/gpiolib-of.c                    |   9 +-
 drivers/hid/i2c-hid/i2c-hid.c                |   5 +-
 drivers/md/raid1.c                           |   5 +-
 drivers/md/raid5.c                           |   3 +-
 drivers/media/dvb-frontends/si2168.c         |   2 +
 drivers/media/platform/Kconfig               |   6 +-
 drivers/media/rc/rc-main.c                   |  14 +-
 drivers/media/usb/dvb-usb-v2/lmedm04.c       |  14 +-
 drivers/media/usb/em28xx/em28xx-audio.c      |   8 +-
 drivers/media/usb/em28xx/em28xx-core.c       |   4 +-
 drivers/media/usb/em28xx/em28xx-dvb.c        |  14 +-
 drivers/media/usb/em28xx/em28xx-input.c      |   6 +-
 drivers/media/usb/em28xx/em28xx-video.c      |   6 +-
 drivers/misc/mei/hw-me.c                     |   5 +-
 drivers/mmc/host/sdhci-pxav3.c               |  52 +++++--
 drivers/net/wireless/iwlwifi/mvm/mac80211.c  |   5 +-
 drivers/net/wireless/iwlwifi/mvm/tx.c        |   5 +
 drivers/net/wireless/iwlwifi/pcie/tx.c       |   7 +-
 drivers/net/wireless/rtlwifi/pci.c           |   5 +-
 drivers/net/wireless/rtlwifi/pci.h           |   7 +
 drivers/net/wireless/rtlwifi/rtl8192ee/fw.c  |   6 +-
 drivers/net/wireless/rtlwifi/rtl8192ee/hw.c  | 166 +++++++++++++++++++----
 drivers/net/wireless/rtlwifi/rtl8192ee/reg.h |   2 +
 drivers/net/wireless/rtlwifi/rtl8192ee/trx.c |  16 +--
 drivers/net/wireless/rtlwifi/rtl8192ee/trx.h |   2 +
 drivers/pci/pci-driver.c                     |   2 +-
 drivers/pci/rom.c                            |   7 +-
 drivers/platform/x86/samsung-laptop.c        |  20 ++-
 drivers/power/88pm860x_charger.c             |   1 +
 drivers/power/bq24190_charger.c              |   2 +-
 drivers/power/gpio-charger.c                 |   4 +-
 drivers/scsi/megaraid/megaraid_sas_base.c    |  24 ++--
 drivers/scsi/megaraid/megaraid_sas_fp.c      |  17 ++-
 drivers/scsi/megaraid/megaraid_sas_fusion.c  |  24 +++-
 drivers/scsi/megaraid/megaraid_sas_fusion.h  |   9 +-
 drivers/scsi/sg.c                            |  34 ++++-
 drivers/target/iscsi/iscsi_target_tq.c       |  28 +---
 drivers/tty/pty.c                            |   3 +
 drivers/tty/serial/atmel_serial.c            |   4 +-
 drivers/tty/serial/fsl_lpuart.c              |  16 ++-
 drivers/tty/vt/vt.c                          |   4 +-
 drivers/usb/core/buffer.c                    |  26 ++--
 drivers/usb/core/driver.c                    |  29 ++--
 drivers/usb/core/hcd.c                       |  16 +--
 drivers/usb/core/hub.c                       |  25 ++--
 drivers/usb/core/message.c                   |  23 +---
 drivers/usb/core/usb.c                       |   1 +
 drivers/usb/host/isp1760-hcd.c               |   3 +
 drivers/usb/serial/cp210x.c                  |   1 +
 drivers/xen/manage.c                         |   8 +-
 drivers/xen/xen-scsiback.c                   |  14 +-
 fs/binfmt_elf.c                              |   5 +-
 fs/btrfs/ctree.c                             |  17 +--
 fs/btrfs/disk-io.c                           |  11 +-
 fs/btrfs/tree-log.c                          |  93 +++++++++++--
 fs/jffs2/scan.c                              |   5 +
 fs/lockd/mon.c                               |  13 +-
 fs/nfs/callback.c                            |   8 +-
 fs/nfs/callback_xdr.c                        |   4 +-
 fs/nfs/direct.c                              |   2 +-
 fs/nfs/internal.h                            |  22 ++-
 fs/nfs/nfs4proc.c                            |  14 +-
 fs/nfs/pnfs.c                                |  41 +++---
 fs/nfs/super.c                               |   9 +-
 fs/proc/task_mmu.c                           |  14 +-
 fs/udf/inode.c                               |  28 ++--
 fs/xfs/libxfs/xfs_bmap.c                     |   6 +-
 fs/xfs/libxfs/xfs_symlink_remote.c           |   2 +
 fs/xfs/xfs_buf_item.c                        |   4 +
 fs/xfs/xfs_inode.c                           |   2 +
 fs/xfs/xfs_qm.c                              |   5 +
 fs/xfs/xfs_trans.c                           |   1 +
 include/linux/fsnotify.h                     |   6 +-
 include/linux/nfs_xdr.h                      |   2 +-
 include/linux/sunrpc/clnt.h                  |   3 +-
 include/linux/usb.h                          |   5 -
 include/linux/usb/hcd.h                      |   3 +
 include/net/cipso_ipv4.h                     |  25 ++--
 kernel/debug/kdb/kdb_main.c                  |   2 +-
 kernel/time/ntp.c                            |  10 +-
 kernel/trace/ring_buffer.c                   |  40 +++++-
 kernel/trace/trace.c                         |   2 +-
 mm/hugetlb.c                                 |   2 +
 net/bluetooth/smp.c                          |   6 +-
 net/ceph/osd_client.c                        |  26 ++--
 net/ipv4/cipso_ipv4.c                        |  51 ++++---
 net/netlabel/netlabel_kapi.c                 |  15 +-
 net/sunrpc/clnt.c                            |  12 +-
 net/sunrpc/rpcb_clnt.c                       |   8 +-
 security/smack/smack.h                       |  10 ++
 security/smack/smack_lsm.c                   |  24 ++--
 sound/pci/hda/patch_realtek.c                |   1 +
 sound/pci/hda/patch_sigmatel.c               |  20 +++
 sound/pci/riptide/riptide.c                  |  27 ++--
 sound/pci/rme9652/hdspm.c                    |   6 +
 sound/soc/codecs/rt5670.c                    |   1 +
 sound/soc/davinci/Kconfig                    |   3 +-
 sound/soc/pxa/mioa701_wm9713.c               |   2 +-
 tools/perf/util/cloexec.c                    |  18 ++-
 160 files changed, 1581 insertions(+), 829 deletions(-)