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

Commit 54e5c4de authored by David S. Miller's avatar David S. Miller
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 



Conflicts:
	drivers/net/bonding/bond_alb.c
	drivers/net/ethernet/altera/altera_msgdma.c
	drivers/net/ethernet/altera/altera_sgdma.c
	net/ipv6/xfrm6_output.c

Several cases of overlapping changes.

The xfrm6_output.c has a bug fix which overlaps the renaming
of skb->local_df to skb->ignore_df.

In the Altera TSE driver cases, the register access cleanups
in net-next overlapped with bug fixes done in net.

Similarly a bug fix to send ALB packets in the bonding driver using
the right source address overlaps with cleanups in net-next.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents be65de71 1ee1ceaf

Documentation/ABI/testing/sysfs-bus-pci

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ Description: 


What:		/sys/bus/pci/devices/.../vpd

Date:		February 2008

Contact:	Ben Hutchings <bhutchings@solarflare.com>

Contact:	Ben Hutchings <bwh@kernel.org>

Description:

		A file named vpd in a device directory will be a

		binary file containing the Vital Product Data for the

Documentation/DocBook/media/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -195,7 +195,7 @@ DVB_DOCUMENTED = \ 
#



install_media_images = \

	$(Q)cp $(OBJIMGFILES) $(MEDIA_SRC_DIR)/v4l/*.svg $(MEDIA_OBJ_DIR)/media_api

	$(Q)-cp $(OBJIMGFILES) $(MEDIA_SRC_DIR)/v4l/*.svg $(MEDIA_OBJ_DIR)/media_api



$(MEDIA_OBJ_DIR)/%: $(MEDIA_SRC_DIR)/%.b64

	$(Q)base64 -d $< >$@

Documentation/devicetree/bindings/clock/at91-clock.txt

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ Required properties for PMC node: 
- interrupt-controller : tell that the PMC is an interrupt controller.

- #interrupt-cells : must be set to 1. The first cell encodes the interrupt id,

	and reflect the bit position in the PMC_ER/DR/SR registers.

	You can use the dt macros defined in dt-bindings/clk/at91.h.

	You can use the dt macros defined in dt-bindings/clock/at91.h.

	0 (AT91_PMC_MOSCS) -> main oscillator ready

	1 (AT91_PMC_LOCKA) -> PLL A ready

	2 (AT91_PMC_LOCKB) -> PLL B ready

Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ Example 
		clock-output-names =

			"tpu0", "mmcif1", "sdhi3", "sdhi2",

			 "sdhi1", "sdhi0", "mmcif0";

		renesas,clock-indices = <

		clock-indices = <

			R8A7790_CLK_TPU0 R8A7790_CLK_MMCIF1 R8A7790_CLK_SDHI3

			R8A7790_CLK_SDHI2 R8A7790_CLK_SDHI1 R8A7790_CLK_SDHI0

			R8A7790_CLK_MMCIF0

Documentation/devicetree/bindings/dma/ti-edma.txt

+2 −2
Original line number Diff line number Diff line
@@ -29,6 +29,6 @@ edma: edma@49000000 { 
	dma-channels = <64>;

	ti,edma-regions = <4>;

	ti,edma-slots = <256>;

	ti,edma-xbar-event-map = <1 12

	ti,edma-xbar-event-map = /bits/ 16 <1 12

					    2 13>;

};