Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 47a09af6 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

Merge tag 'v3.18-rc4' into patchwork 

Needed due to some important regression fixes at RC core.

* commit 'v3.18-rc4': (587 commits)
  Linux 3.18-rc4
  ARM: dts: zynq: Enable PL clocks for Parallella
  tiny: rename ENABLE_DEV_COREDUMP to ALLOW_DEV_COREDUMP
  tiny: reverse logic for DISABLE_DEV_COREDUMP
  i2c: core: Dispose OF IRQ mapping at client removal time
  i2c: at91: don't account as iowait
  i2c: remove FSF address
  USB: Update default usb-storage delay_use value in kernel-parameters.txt
  sysfs: driver core: Fix glue dir race condition by gdp_mutex
  MIPS: Fix build with binutils 2.24.51+
  xfs: track bulkstat progress by agino
  xfs: bulkstat error handling is broken
  xfs: bulkstat main loop logic is a mess
  xfs: bulkstat chunk-formatter has issues
  xfs: bulkstat chunk formatting cursor is broken
  xfs: bulkstat btree walk doesn't terminate
  mm: Fix comment before truncate_setsize()
  USB: cdc-acm: add quirk for control-line state requests
  tty: Fix pty master poll() after slave closes v2
  MIPS: R3000: Fix debug output for Virtual page number
  ...

Conflicts:
	drivers/media/rc/rc-main.c
parents a2354737 206c5f60

Documentation/ABI/testing/sysfs-ibft

+1 −1
Original line number Diff line number Diff line
@@ -20,4 +20,4 @@ Date: November 2007 
Contact:	Konrad Rzeszutek <ketuzsezr@darnok.org>

Description:	The /sys/firmware/ibft/ethernetX directory will contain

		files that expose the iSCSI Boot Firmware Table NIC data.

		This can this can the IP address, MAC, and gateway of the NIC.
 
		Usually this contains the IP address, MAC, and gateway of the NIC.

Documentation/DocBook/media/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ GENFILES := $(addprefix $(MEDIA_OBJ_DIR)/, $(MEDIA_TEMP)) 
PHONY += cleanmediadocs



cleanmediadocs:

	-@rm `find $(MEDIA_OBJ_DIR) -type l` $(GENFILES) $(OBJIMGFILES) 2>/dev/null

	-@rm -f `find $(MEDIA_OBJ_DIR) -type l` $(GENFILES) $(OBJIMGFILES) 2>/dev/null



$(obj)/media_api.xml: $(GENFILES) FORCE

Documentation/HOWTO

+0 −1
Original line number Diff line number Diff line
@@ -324,7 +324,6 @@ tree, they need to be integration-tested. For this purpose, a special 
testing repository exists into which virtually all subsystem trees are

pulled on an almost daily basis:

	http://git.kernel.org/?p=linux/kernel/git/next/linux-next.git

	http://linux.f-seidel.de/linux-next/pmwiki/



This way, the -next kernel gives a summary outlook onto what will be

expected to go into the mainline kernel at the next merge period.

Documentation/SubmittingPatches

+4 −6
Original line number Diff line number Diff line
@@ -483,12 +483,10 @@ have been included in the discussion 


14) Using Reported-by:, Tested-by:, Reviewed-by:, Suggested-by: and Fixes:



If this patch fixes a problem reported by somebody else, consider adding a

Reported-by: tag to credit the reporter for their contribution.  Please

note that this tag should not be added without the reporter's permission,

especially if the problem was not reported in a public forum.  That said,

if we diligently credit our bug reporters, they will, hopefully, be

inspired to help us again in the future.

The Reported-by tag gives credit to people who find bugs and report them and it

hopefully inspires them to help us again in the future.  Please note that if

the bug was reported in private, then ask for permission first before using the

Reported-by tag.



A Tested-by: tag indicates that the patch has been successfully tested (in

some environment) by the person named.  This tag informs maintainers that

Documentation/development-process/2.Process

+0 −4
Original line number Diff line number Diff line
@@ -289,10 +289,6 @@ lists when they are assembled; they can be downloaded from: 


	http://www.kernel.org/pub/linux/kernel/next/



Some information about linux-next has been gathered at:



	http://linux.f-seidel.de/linux-next/pmwiki/



Linux-next has become an integral part of the kernel development process;

all patches merged during a given merge window should really have found

their way into linux-next some time before the merge window opens.