Skip to main content

Browse the archive

Revision c4b5fd3fb2058b650447372472ad24e2a989f9f6 authored by Linus Torvalds on 09 July 2015, 20:35:39 UTC, committed by Linus Torvalds on 09 July 2015, 20:35:39 UTC 
Merge branch 'hpfs-patches' (patches from Mikulas Patocka)
 
Merge hpfs updates from Mikulas Patocka.

Mainly fstrim support, with some minor other cleanups.

These were actually sent during the merge window, but I wanted to wait
for the FSTRIM compat handling cleanup before applying them.  Mikulas
sent that earlier today.

* emailed patches from Mikulas Patocka <mikulas@twibright.com>:
  hpfs: hpfs_error: Remove static buffer, use vsprintf extension %pV instead
  hpfs: kstrdup() out of memory handling
  hpfs: Remove unessary cast
  hpfs: add fstrim support
2 parent s 4c0a9f7 + a28e4b2
Raw File
CodeOfConflict 
Code of Conflict
----------------

The Linux kernel development effort is a very personal process compared
to "traditional" ways of developing software.  Your code and ideas
behind it will be carefully reviewed, often resulting in critique and
criticism.  The review will almost always require improvements to the
code before it can be included in the kernel.  Know that this happens
because everyone involved wants to see the best possible solution for
the overall success of Linux.  This development process has been proven
to create the most robust operating system kernel ever, and we do not
want to do anything to cause the quality of submission and eventual
result to ever decrease.

If however, anyone feels personally abused, threatened, or otherwise
uncomfortable due to this process, that is not acceptable.  If so,
please contact the Linux Foundation's Technical Advisory Board at
<tab@lists.linux-foundation.org>, or the individual members, and they
will work to resolve the issue to the best of their ability.  For more
information on who is on the Technical Advisory Board and what their
role is, please see:
	http://www.linuxfoundation.org/programs/advisory-councils/tab

As a reviewer of code, please strive to keep things civil and focused on
the technical issues involved.  We are all humans, and frustrations can
be high on both sides of the process.  Try to keep in mind the immortal
words of Bill and Ted, "Be excellent to each other."
back to top