From mboxrd@z Thu Jan 1 00:00:00 1970 From: Arend van Spriel Subject: Re: linux-next: manual merge of the driver-core tree with the net-next tree Date: Mon, 1 Dec 2014 08:34:05 +0100 Message-ID: <547C19ED.10201@broadcom.com> References: <20141201181933.6dfaad66@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset="windows-1252" Content-Transfer-Encoding: 7bit Cc: , , "Felix Fietkau" , Ben Greear To: Stephen Rothwell , Greg KH , "John W. Linville" , David Miller , Return-path: In-Reply-To: <20141201181933.6dfaad66@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org List-Id: netdev.vger.kernel.org On 01-12-14 08:19, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the driver-core tree got a conflict in > drivers/net/wireless/ath/ath9k/debug.c between commits 70e535ed0029 > ("ath9k: clean up debugfs print of reset causes"), 7b8aaead958e > ("ath9k: restart hardware after noise floor calibration failure") and > 325e18817668 ("ath9k: fix misc debugfs when not using chan context") > from the net-next tree and commit 631bee257bd5 ("ath: use seq_file api > for ath9k debugfs files") from the driver-core tree. > > I fixed it up (see below) and can carry the fix as necessary (no action > is required). > > Greg, I am not sure why those 2 commits are even in your tree. Do they > depend on something else in your tree? They do. The three commits below are related: d32394f ath: ath9k: use debugfs_create_devm_seqfile() helper for seq_file entrie 631bee2 ath: use seq_file api for ath9k debugfs files 98210b7 debugfs: add helper function to create device related seq_file The ath patches were made to provide example of using the new helper function and get some idea about code savings. Greg and John discussed who would take them. I noticed other ath changes in net-next so I kinda expected this email ;-) Regards, Arend