#
c596961d |
| 14-Jun-2017 |
Al Viro <viro@zeniv.linux.org.uk> |
ufs: fix s_size/s_dsize users
For UFS2 we need 64bit variants; we even store them in uspi, but use 32bit ones instead. One wrinkle is in handling of reserved space - recalculating it every time had
ufs: fix s_size/s_dsize users
For UFS2 we need 64bit variants; we even store them in uspi, but use 32bit ones instead. One wrinkle is in handling of reserved space - recalculating it every time had been stupid all along, but now it would become really ugly. Just calculate it once...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
show more ...
|
#
fffd70f5 |
| 14-Jun-2017 |
Al Viro <viro@zeniv.linux.org.uk> |
ufs: make ufs_freespace() return signed
as it is, checking that its return value is <= 0 is useless and that's how it's being used.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
|
#
5b45fe6b |
| 14-Jun-2017 |
Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> |
Merge tag 'v4.12-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into fbdev-for-next
Linux 4.12-rc5
|
#
10b90ee2 |
| 14-Jun-2017 |
Ingo Molnar <mingo@kernel.org> |
Merge tag 'v4.12-rc5' into ras/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
|
#
3f365cf3 |
| 13-Jun-2017 |
Ingo Molnar <mingo@kernel.org> |
Merge branch 'sched/urgent' into x86/mm, to pick up dependent fix
Andy will need the following scheduler fix for the PCID series:
252d2a4117bc: sched/core: Idle_task_exit() shouldn't use switch_m
Merge branch 'sched/urgent' into x86/mm, to pick up dependent fix
Andy will need the following scheduler fix for the PCID series:
252d2a4117bc: sched/core: Idle_task_exit() shouldn't use switch_mm_irqs_off()
So do a cross-merge.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
show more ...
|
#
8f66439e |
| 12-Jun-2017 |
Jens Axboe <axboe@kernel.dk> |
Merge tag 'v4.12-rc5' into for-4.13/block
We've already got a few conflicts and upcoming work depends on some of the changes that have gone into mainline as regression fixes for this series.
Pull i
Merge tag 'v4.12-rc5' into for-4.13/block
We've already got a few conflicts and upcoming work depends on some of the changes that have gone into mainline as regression fixes for this series.
Pull in 4.12-rc5 to resolve these conflicts and make it easier on down stream trees to continue working on 4.13 changes.
Signed-off-by: Jens Axboe <axboe@kernel.dk>
show more ...
|
#
81606aea |
| 12-Jun-2017 |
Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
Merge 4.12-rc5 into usb-next
We want the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
#
7bf1e44f |
| 12-Jun-2017 |
Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
Merge 4.12-rc5 into staging-next
We want the IIO fixes and other staging driver fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
#
069a0f32 |
| 12-Jun-2017 |
Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
Merge 4.12-rc5 into char-misc-next
We want the char/misc driver fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
#
95c4629d |
| 10-Jun-2017 |
David S. Miller <davem@davemloft.net> |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
|
#
5faab9e0 |
| 10-Jun-2017 |
Linus Torvalds <torvalds@linux-foundation.org> |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull UFS fixes from Al Viro: "This is just the obvious backport fodder; I'm pretty sure that there will be more
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull UFS fixes from Al Viro: "This is just the obvious backport fodder; I'm pretty sure that there will be more - definitely so wrt performance and quite possibly correctness as well"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: ufs: we need to sync inode before freeing it excessive checks in ufs_write_failed() and ufs_evict_inode() ufs_getfrag_block(): we only grab ->truncate_mutex on block creation path ufs_extend_tail(): fix the braino in calling conventions of ufs_new_fragments() ufs: set correct ->s_maxsize ufs: restore maintaining ->i_blocks fix ufs_isblockset() ufs: restore proper tail allocation
show more ...
|
#
414cf718 |
| 08-Jun-2017 |
Al Viro <viro@zeniv.linux.org.uk> |
fix ufs_isblockset()
Cc: stable@vger.kernel.org Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
|
Revision tags: v4.10.17, v4.10.16, v4.10.15, v4.10.14, v4.10.13, v4.10.12, v4.10.11, v4.10.10, v4.10.9, v4.10.8, v4.10.7, v4.10.6, v4.10.5, v4.10.4, v4.10.3, v4.10.2, v4.10.1, v4.10, v4.9, openbmc-4.4-20161121-1, v4.4.33, v4.4.32, v4.4.31, v4.4.30, v4.4.29, v4.4.28, v4.4.27, v4.7.10, openbmc-4.4-20161021-1, v4.7.9, v4.4.26, v4.7.8, v4.4.25, v4.4.24, v4.7.7, v4.8, v4.4.23, v4.7.6, v4.7.5, v4.4.22, v4.4.21, v4.7.4, v4.7.3, v4.4.20, v4.7.2, v4.4.19, openbmc-4.4-20160819-1, v4.7.1, v4.4.18, v4.4.17, openbmc-4.4-20160804-1, v4.4.16, v4.7, openbmc-4.4-20160722-1, openbmc-20160722-1 |
|
#
8c57a5e7 |
| 19-Jul-2016 |
Dmitry Torokhov <dmitry.torokhov@gmail.com> |
Merge branch 'for-linus' into next
Sync up to bring in wacom_w8001 changes to avoid merge conflicts later.
|
Revision tags: openbmc-20160713-1, v4.4.15, v4.6.4 |
|
#
946e0f6f |
| 08-Jul-2016 |
Ingo Molnar <mingo@kernel.org> |
Merge tag 'v4.7-rc6' into x86/mm, to merge fixes before applying new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
|
Revision tags: v4.6.3, v4.4.14 |
|
#
6ea24cf7 |
| 18-Jun-2016 |
Dmitry Torokhov <dmitry.torokhov@gmail.com> |
Merge branch 'cec-defines' into for-linus
Let's bring in HDMI CEC defines to ease merging CEC support in the next merge window.
|
Revision tags: v4.6.2, v4.4.13, openbmc-20160606-1, v4.6.1, v4.4.12, openbmc-20160521-1 |
|
#
5632a9fb |
| 19-May-2016 |
Russell King <rmk+kernel@armlinux.org.uk> |
Merge branches 'amba', 'devel-stable', 'kexec-for-next' and 'misc' into for-linus
|
Revision tags: v4.4.11, openbmc-20160518-1 |
|
#
27fd38c5 |
| 17-May-2016 |
Jiri Kosina <jkosina@suse.cz> |
Merge branches 'for-4.6/upstream-fixes', 'for-4.7/asus', 'for-4.7/hidraw' and 'for-4.7/thingm' into for-linus
|
Revision tags: v4.6, v4.4.10, openbmc-20160511-1 |
|
#
e4d35be5 |
| 10-May-2016 |
Al Viro <viro@zeniv.linux.org.uk> |
Merge branch 'ovl-fixes' into for-linus
|
#
2e00fde5 |
| 10-May-2016 |
Takashi Iwai <tiwai@suse.de> |
Merge branch 'for-linus' into for-next
|
#
bae6692c |
| 10-May-2016 |
Luca Coelho <luciano.coelho@intel.com> |
Merge tag 'mac80211-next-for-davem-2016-04-13' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next into master
To synchronize with Kalle, here's just a big change that affects all d
Merge tag 'mac80211-next-for-davem-2016-04-13' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next into master
To synchronize with Kalle, here's just a big change that affects all drivers - removing the duplicated enum ieee80211_band and replacing it by enum nl80211_band. On top of that, just a small documentation update.
show more ...
|
#
6c0b43df |
| 09-May-2016 |
Joerg Roedel <jroedel@suse.de> |
Merge branches 'arm/io-pgtable', 'arm/rockchip', 'arm/omap', 'x86/vt-d', 'ppc/pamu', 'core' and 'x86/amd' into next
|
#
698f6700 |
| 09-May-2016 |
Tejun Heo <tj@kernel.org> |
Merge branch '4.7/scsi-queue' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi into for-4.7-zac
Pulling in the dependencies for further ZAC changes.
Signed-off-by: Tejun Heo <tj@kernel.org>
|
Revision tags: openbmc-20160505-1 |
|
#
e8c8ce54 |
| 05-May-2016 |
Ingo Molnar <mingo@kernel.org> |
Merge tag 'v4.6-rc6' into locking/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
|
#
f3391a16 |
| 05-May-2016 |
Ingo Molnar <mingo@kernel.org> |
Merge tag 'v4.6-rc6' into x86/cpu, to refresh the tree
Signed-off-by: Ingo Molnar <mingo@kernel.org>
|
Revision tags: v4.4.9 |
|
#
3d277b17 |
| 04-May-2016 |
Mark Brown <broonie@kernel.org> |
Merge tag 'v4.6-rc5' into spi-rockchip
Linux 4.6-rc5
|